自动匹配路线过滤工厂

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -624,7 +624,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                             .in(ApsBlankOrderDo::getId, blankIds)
                             .eq(ApsBlankOrderDo::getProductstatus, "30")//待开工
                     );
-                    if (!apsBlankOrderDoList.isEmpty()){
+                    if (!apsBlankOrderDoList.isEmpty()) {
                         List<String> needCancelBlankIdList = apsBlankOrderDoList.stream().map(ApsBlankOrderDo::getId).collect(Collectors.toList());
                         //撤回发布
                         apsBlankOrderService.publishCancel(needCancelBlankIdList);
@@ -1066,7 +1066,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
             //更新生产状态为“待发布”（20）
             List<ApsBlankOrderVo> toupstatus = apsBlankOrders.stream().filter(v ->
-                            blankids.contains(v.getId()) && (StringUtils.isBlank(v.getIfcp()) || "N".equals(v.getIfcp())))
+                    blankids.contains(v.getId()) && (StringUtils.isBlank(v.getIfcp()) || "N".equals(v.getIfcp())))
                     .collect(Collectors.toList());
             updateProductStatusByOrderIds(toupstatus);
             // 自动加锁坯料计划下的工序作业
@@ -2693,11 +2693,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
         //自动匹配工艺路线 && apsProductionOrderDo.getAuditstatus().equals("待制定坯料计划")
         if (checkLevel == 1 && idmatureprocess && StringUtils.isEmpty(apsBlankOrderDo.getCraftrouteid())) {
-            String xlstr="";
-            if(apsBlankOrderDo.getBlankcomefrom().equals("新料")){
-                xlstr="and IFNULL(BLANKCOMEFROM,'')='新料'";
+            String xlstr = "and TENANTID='" + apsBlankOrderDo.getTenantid() + "'";
+            if (apsBlankOrderDo.getBlankcomefrom().equals("新料")) {
+                xlstr += " and IFNULL(BLANKCOMEFROM,'')='新料'";
             }
-            ApsBlankOrderDo historyBlank = apsBlankOrderDao.getHistoryBlank(endProcessDesc,xlstr);
+            ApsBlankOrderDo historyBlank = apsBlankOrderDao.getHistoryBlank(endProcessDesc, xlstr);
             if (historyBlank != null) {
                 Map<String, Object> processMap = new HashMap<>();
                 Map<String, Object> blankMap = new HashMap<>();
@@ -2719,6 +2719,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 processMap.put("BLANKDATA", blankMap);
                 processMap.put("NEWBLANKID", historyBlank.getId());
                 processMap.put("CRAFTROUTEID", historyBlank.getCraftrouteid());
+                processMap.put("DATATYPE", "自动匹配");
                 apsProcessOperationService.chooseHistoryRoute(processMap);
             }
         }
@@ -5147,8 +5148,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         for (ApsProcessOperationProcessEquDo equDo : notMoveDataList) {
             if (!needUpdateDo.getPlanenddate().after(equDo.getPlanstartdate())) {
                 break;
-            }else if (!needUpdateDo.getPlanstartdate().before(equDo.getPlanenddate())){
-            }else {
+            } else if (!needUpdateDo.getPlanstartdate().before(equDo.getPlanenddate())) {
+            } else {
                 Date planstartdate = needUpdateDo.getPlanstartdate();
                 Date planenddate = needUpdateDo.getPlanenddate();
                 //移动开始时间为上一个的结束时间

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationServiceImpl.java

@@ -605,6 +605,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 apsBlankOrderService.update(new LambdaUpdateWrapper<ApsBlankOrderDo>()
                         .eq(ApsBlankOrderDo::getId, blanckdata.getStr("ID"))
                         .set(ApsBlankOrderDo::getCraftrouteid, craftrouteid)
+                        .set(ApsBlankOrderDo::getRoption, "{\"dataSource\":\"选择路线\",\"dataCode\":\"" + apsCraftRouteDo.getRoutenum() + "\"}")
                         .set(ApsBlankOrderDo::getRouteproducttypeid, apsCraftRouteDo.getProducttype())
                         .set(ApsBlankOrderDo::getRoutemetal, apsCraftRouteDo.getMetal())
                         .set(ApsBlankOrderDo::getRoutemetalstate, apsCraftRouteDo.getMetalstate())
@@ -638,6 +639,10 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         JSONObject blanckdata = new JSONObject(params.get("BLANKDATA"));
         String newblankid = params.get("NEWBLANKID").toString();
         String craftrouteid = params.get("CRAFTROUTEID").toString();
+        String dataType = "选择历史路线";
+        if (params.get("DATATYPE") != null && StringUtils.isNotBlank(params.get("DATATYPE").toString())) {
+            dataType = params.get("DATATYPE").toString();
+        }
 
         // 获取排程参数设置
         List<ApsScheduleConfigDo> apsConfigs = apsScheduleConfigService.list();
@@ -1152,8 +1157,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             }
             apsBlankOrderService.update(new LambdaUpdateWrapper<ApsBlankOrderDo>()
                     .eq(ApsBlankOrderDo::getId, blanckdata.getStr("ID"))
-                    .set(ApsBlankOrderDo::getRoption, newblankid)
                     .set(ApsBlankOrderDo::getCraftrouteid, craftrouteid)
+                    .set(ApsBlankOrderDo::getRoption, "{\"dataSource\":\"" + dataType + "\",\"dataCode\":\"" + newblankid + "\"}")
                     .set(ApsBlankOrderDo::getRouteproducttypeid, apsCraftRouteDo.getProducttype())
                     .set(ApsBlankOrderDo::getRoutemetal, apsCraftRouteDo.getMetal())
                     .set(ApsBlankOrderDo::getRoutemetalstate, apsCraftRouteDo.getMetalstate())