Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

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

@@ -31,7 +31,9 @@ import org.springblade.desk.oem.pojo.vo.OemApprovalVO;
 import org.springblade.desk.oem.pojo.vo.OemOrderVO;
 import org.springblade.desk.order.mapper.YieldOrderMapper;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
+import org.springblade.desk.order.pojo.entity.YieldOrderCraft;
 import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
+import org.springblade.desk.order.service.IYieldOrderCraftService;
 import org.springblade.desk.produce.mapper.*;
 import org.springblade.desk.produce.pojo.entity.*;
 import org.springblade.desk.produce.pojo.enums.ProcessCycleEnum;
@@ -94,6 +96,8 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
 
     private IPdaLoadService pdaLoadService;
 
+    private IYieldOrderCraftService yieldOrderCraftService;
+
     private final IErpDataOemClient erpDataOemClient;
 
     @Resource
@@ -102,6 +106,12 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
         this.plateAroundService = plateAroundService;
     }
 
+    @Resource
+    @Lazy
+    private void setYieldOrderCraftService(IYieldOrderCraftService yieldOrderCraftService) {
+        this.yieldOrderCraftService = yieldOrderCraftService;
+    }
+
     @Resource
     @Lazy
     private void setPdaLoadService(IPdaLoadService pdaLoadService) {
@@ -260,8 +270,9 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                         //判断工序是否存在外协商，如果存在不进行二次分派
                         WorkPlan workPlan = workPlanMapper.selectById(wprList.get(0).getWpId());
                         if (workPlan.getOcId() == null || workPlan.getOcId() < 1 ) {
-                            //todo 自动分派后续补充
-//                            pjAutomaticDispatchService.runAutomaticDispatch(wpList, yo, Boolean.FALSE, null);
+                            //自动分派
+                            List<YieldOrderCraft> yieldOrderCrafts = yieldOrderCraftService.listByYoId(yo.getId());
+                            yieldOrderCraftService.automaticDispatch(yieldOrderCrafts, yo, Boolean.FALSE, null);
                         }
                     }
                     int days = 5;
@@ -345,8 +356,9 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                     //调用转厂内自动分派处理
                     if (teamSet == null) {
                         //调用转外协自动分派处理
-                        //todo 自动分派后续补充
-//                        pjAutomaticDispatchService.runAutomaticDispatch(wpList, yo, Boolean.TRUE, null);
+                        //自动分派
+                        List<YieldOrderCraft> yieldOrderCrafts = yieldOrderCraftService.listByYoId(yo.getId());
+                        yieldOrderCraftService.automaticDispatch(yieldOrderCrafts, yo, Boolean.TRUE, null);
                         //周新昊 20241015 增加调用下方方法
                         //处理包装工序 并且工艺能力包含 包装 并且加工单位为空的
                         //手持移动端数据查询接口