aps-编辑工序作业明细增加编辑字段：辊

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

@@ -557,8 +557,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     affectedIdList.addAll(checkProcessingTimeConflict(apsProcessOperationProcessEquDo,
                             data.getOldPlanStartdate(), data.getOldPlanEnddate(), data.getOldEquId(), data.getCurrentProcessWay(), returnAboutIds));
                     // 判断是否存在设备不可用
-                    ApsProcessOperationProcessEquDo newApsProcessEqu = this.getById(apsProcessOperationProcessEquDo.getId());
-                    inspectionEquipmentIsAvailable(newApsProcessEqu,
+                    inspectionEquipmentIsAvailable(apsProcessOperationProcessEquDo,
                             apsProcessOperationProcessEquDo.getProcessdeviceid(),
                             apsProcessOperationProcessEquDo.getPlanstartdate(),
                             apsProcessOperationProcessEquDo.getPlanenddate());
@@ -750,15 +749,15 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             log.error("根据ID：{} 获取工序作业失败", apsProcessOperationProcessEquDo.getProcessid());
         }
         if (apsProcessOperationDo != null && "合并加工".equals(apsProcessOperationDo.getProcessway())) {
-            if (Arrays.asList(COMPLETED, PROCESSING).contains(apsProcessOperationDo.getProcessstatus())) {
-                log.error("已开工的作业不可修改");
-                return R.error("已开工的作业不可修改");
-            }
+//            if (Arrays.asList(COMPLETED, PROCESSING).contains(apsProcessOperationDo.getProcessstatus())) {
+//                log.error("已开工的作业不可修改");
+//                return R.error("已开工的作业不可修改");
+//            }
         } else {
-            if (!JOBSTATUS_TO_BE_START.equals(apsProcessOperationProcessEquDo.getWorkstatus())) {
-                log.error("已开工的作业不可修改");
-                return R.error("已开工的作业不可修改");
-            }
+//            if (!JOBSTATUS_TO_BE_START.equals(apsProcessOperationProcessEquDo.getWorkstatus())) {
+//                log.error("已开工的作业不可修改");
+//                return R.error("已开工的作业不可修改");
+//            }
         }
         if (apsProcessOperationDo != null && "合并加工".equals(apsProcessOperationDo.getProcessway())) {
             List<ApsProcessOperationProcessEquDo> changeApsProcessEquList = apsProcessOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
@@ -774,6 +773,9 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     info.setProcessdeviceid(equId);
                     info.setProcessworkshop(jobDetailsVo.getWorkshopName());
                     info.setProcessworkshopid(jobDetailsVo.getWorkshopId());
+                    if (ObjectUtil.isNotEmpty(jobDetailsVo.getRollerId())) {
+                        info.setRollerid(jobDetailsVo.getRollerId());
+                    }
                 }
                 // 更新计划开工时间
                 Date planStartTime = jobDetailsVo.getPlanStartTime();
@@ -812,6 +814,9 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 apsProcessOperationProcessEquDo.setProcessdeviceid(equId);
                 apsProcessOperationProcessEquDo.setProcessworkshop(jobDetailsVo.getWorkshopName());
                 apsProcessOperationProcessEquDo.setProcessworkshopid(jobDetailsVo.getWorkshopId());
+                if (ObjectUtil.isNotEmpty(jobDetailsVo.getRollerId())) {
+                    apsProcessOperationProcessEquDo.setRollerid(jobDetailsVo.getRollerId());
+                }
             }
             // 更新计划开工时间
             Date planStartTime = jobDetailsVo.getPlanStartTime();
@@ -1556,7 +1561,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 apsProcessOperationProcessEquDo.getPlanstartdate(),
                 apsProcessOperationProcessEquDo.getPlanenddate(),
                 apsProcessOperationProcessEquDo.getId());
-        if (!needAddTimeOverLapList.isEmpty()){
+        if (!needAddTimeOverLapList.isEmpty()) {
             //把自己的冲突增加
             ProcessVo processVo2 = new ProcessVo();
             processVo2.setProcessEquId(apsProcessOperationProcessEquDo.getId());
@@ -1655,6 +1660,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
 //                });
 //            }
 //        }
+        apsProcessOperationProcessEquDo = this.getById(apsProcessOperationProcessEquDo.getId());
         return affectedIdList;
     }
 
@@ -1662,7 +1668,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                                          Date newPlanstartdate, Date newPlanenddate,
                                          String processEquId) {
         //判断当前是否存在冲突
-        List<ProcessVo> haveTimeOverLapList = newList.stream().filter(item -> haveTimeOverLap(item, processEquId, newPlanstartdate, newPlanenddate,false)).collect(Collectors.toList());
+        List<ProcessVo> haveTimeOverLapList = newList.stream().filter(item -> haveTimeOverLap(item, processEquId, newPlanstartdate, newPlanenddate, false)).collect(Collectors.toList());
         return haveTimeOverLapList;
     }
 
@@ -1671,11 +1677,11 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                                             String processEquId) {
         List<ProcessVo> needRemoveTimeOverLapIdList = new LinkedList<>();
         //移除前存在冲突的数据
-        List<ProcessVo> haveTimeOverLapList = oldList.stream().filter(item -> haveTimeOverLap(item, processEquId, oldPlanstartdate, oldPlanenddate,true)).collect(Collectors.toList());
+        List<ProcessVo> haveTimeOverLapList = oldList.stream().filter(item -> haveTimeOverLap(item, processEquId, oldPlanstartdate, oldPlanenddate, true)).collect(Collectors.toList());
         if (!haveTimeOverLapList.isEmpty()) {
             //判断是否还有时间冲突，如果没有时间冲突，去除时间冲突，还存在时间冲突，则不更改数据
             for (ProcessVo processVo : haveTimeOverLapList) {
-                long count = oldList.stream().filter(item -> haveTimeOverLap(item, processVo.getProcessEquId(), processVo.getPlanStartTime(), processVo.getPlanEndTime(),true)).count();
+                long count = oldList.stream().filter(item -> haveTimeOverLap(item, processVo.getProcessEquId(), processVo.getPlanStartTime(), processVo.getPlanEndTime(), true)).count();
                 if (count == 0) {
                     needRemoveTimeOverLapIdList.add(processVo);
                 }
@@ -1684,7 +1690,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         return needRemoveTimeOverLapIdList;
     }
 
-    private boolean haveTimeOverLap(ProcessVo item, String processEquId, Date oldPlanstartdate, Date oldPlanenddate,boolean isRemove) {
+    private boolean haveTimeOverLap(ProcessVo item, String processEquId, Date oldPlanstartdate, Date oldPlanenddate, boolean isRemove) {
         if (isRemove && item.getProcessEquId().equals(processEquId)) {
             return false;
         }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/JobDetailsVo.java

@@ -25,5 +25,9 @@ public class JobDetailsVo  extends  ChangingWiresVo{
      */
     @NotNull(message = "计划完工时间必填")
     private Date planEndTime;
+    /**
+     * 辊ID
+     */
+    private String rollerId;
 
 }