外协订单管理列表查询、外协转厂内审批车间订单状态修改

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderRunMapper.xml

@@ -133,7 +133,7 @@
             AND mwor.run_type = #{query.runType}
         </if>
         <if test="query.orderCode != null and query.orderCode != ''">
-            AND mwor.wo_code LIKE CONCAT('%', CONCAT(#{query.orderCode}, '%'))
+            AND two.wo_code LIKE CONCAT('%', CONCAT(#{query.orderCode}, '%'))
         </if>
         <if test="query.partCode != null and query.partCode != ''">
             AND tyo.part_code LIKE CONCAT('%', CONCAT(#{query.partCode}, '%'))

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java

@@ -11,10 +11,8 @@ import net.sourceforge.barbecue.BarcodeFactory;
 import net.sourceforge.barbecue.BarcodeImageHandler;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.ibatis.executor.BatchResult;
-import org.springblade.common.exception.BusinessException;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
@@ -25,7 +23,6 @@ import org.springblade.desk.basic.mapper.TeamSetMapper;
 import org.springblade.desk.basic.pojo.entity.Oem;
 import org.springblade.desk.basic.pojo.entity.OemCraftAbilityEntity;
 import org.springblade.desk.basic.pojo.entity.TeamSet;
-import org.springblade.desk.basic.pojo.entity.WorkCenter;
 import org.springblade.desk.dashboard.mapper.BsProcessSetMapper;
 import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity;
 import org.springblade.desk.oem.pojo.request.*;
@@ -490,6 +487,8 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                     int days = ProcessCycleEnum.BC_TYPE_CYCLE_HEAT.getValue();
                     Date date = DateUtil.plusDays(wo.getSendDownTime(), days);
                     wo.setPlanEndDate(DateUtil.format(date, DateUtil.PATTERN_DATETIME));
+                    // 车间订单状态修改为【未下达】
+                    wo.setRunStatus(WorkOrder.RUN_STATUS_NORMAL);
 
                     //更改订单调度员和计划员
 //                    TeamSet makeTeam = teamSetMapper.selectById(wo.getTsId());