aps-车间作业跟踪增加排单功能

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

@@ -2015,8 +2015,12 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         //作业明细集合
         List<String> processEquIdList = req.getProcessEquIdList();
         List<ApsProcessOperationProcessEquDo> apsProcessOperationProcessEquDos = apsProcessOperationProcessEquService.listByIds(processEquIdList).stream().collect(Collectors.toList());
+        //作业ID集合
+        List<String> processIdList = apsProcessOperationProcessEquDos.stream().map(ApsProcessOperationProcessEquDo::getProcessid).distinct().collect(Collectors.toList());
+        //可选设备
+        List<ApsProcessOperationEquDo> processOperationEquDos = apsProcessOperationEquService.list(new LambdaQueryWrapper<ApsProcessOperationEquDo>().in(ApsProcessOperationEquDo::getMainid, processIdList));
 
-//        List<String> blankIdList = apsProcessOperationProcessEquDos.stream().map(ApsProcessOperationProcessEquDo::getBlankid).distinct().collect(Collectors.toList());
+        List<String> blankIdList = apsProcessOperationProcessEquDos.stream().map(ApsProcessOperationProcessEquDo::getBlankid).distinct().collect(Collectors.toList());
         apsProcessOperationProcessEquDos.sort(Comparator.comparing(ApsProcessOperationProcessEquDo::getPlanstartdate));
         //需要更新的集合
 //        List<ApsProcessOperationProcessEquDo> needUpdateList = new LinkedList<>();
@@ -2029,6 +2033,20 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             needUpdate.setId(apsProcessOperationProcessEquDo.getId());
             needUpdate.setProcessdeviceid(req.getEquId());
             needUpdate.setProcessdevice(req.getEquName());
+            //对应的辊赋值
+            String processid = apsProcessOperationProcessEquDo.getProcessid();
+            List<ApsProcessOperationEquDo> myEquList = processOperationEquDos.stream().filter(item -> item.getMainid().equals(processid)).collect(Collectors.toList());
+            if (myEquList.isEmpty()){
+                needUpdate.setRollerid("");
+            }else {
+                ApsProcessOperationEquDo apsProcessOperationEquDo = myEquList.stream().filter(item -> item.getResourceid().equals(req.getEquId())).findFirst().orElse(null);
+                if (ObjectUtil.isEmpty(apsProcessOperationEquDo)){
+                    needUpdate.setRollerid("");
+                }else {
+                    needUpdate.setRollerid(apsProcessOperationEquDo.getRollerid());
+                }
+            }
+
             needUpdate.setProcessworkshopid(req.getWorkshopId());
             needUpdate.setProcessworkshop(req.getWorkshopName());
             needUpdate.setPlanstartdate(nextStartDate);
@@ -2046,6 +2064,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     apsProcessOperationProcessEquDo.getPlanenddate(),
                     new LinkedList<>());
         }
+        blankIdList.forEach(item->apsBlankOrderService.updateBlankDeliveryDate(null, item));
+
 
         return R.ok();
     }