aps-作业冲突增加校验修改

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

@@ -930,24 +930,21 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             });
             //避免合并加工时，找到除去本身之外同一计划开工日期同一设备‘更新时间’更改之后存在冲突的工序作业明细
             this.updateBatchById(changeApsProcessEquList);
-            ApsProcessOperationProcessEquDo finalApsProcessOperationProcessEquDo = apsProcessOperationProcessEquDo;
-            changeApsProcessEquList.forEach(detail -> {
+            for (ApsProcessOperationProcessEquDo detail : changeApsProcessEquList) {
                 //当工序作业为合并加工时处理工序作业明细冲突
-                String oldEquId = finalApsProcessOperationProcessEquDo.getProcessdeviceid();
-                Date oldPlanstartdate = finalApsProcessOperationProcessEquDo.getPlanstartdate();
-                Date oldPlanenddate = finalApsProcessOperationProcessEquDo.getPlanenddate();
-                this.updateById(finalApsProcessOperationProcessEquDo);
+                String oldEquId = apsProcessOperationProcessEquDo.getProcessdeviceid();
+                Date oldPlanstartdate = apsProcessOperationProcessEquDo.getPlanstartdate();
+                Date oldPlanenddate = apsProcessOperationProcessEquDo.getPlanenddate();
                 // 增加受影响的工序作业信息
                 affectedIdList.addAll(checkProcessingTimeConflict(detail, oldPlanstartdate,
                         oldPlanenddate, oldEquId, apsProcessOperationDo.getProcessway(), new ArrayList<>()));
                 // 判断是否存在设备不可用
-                detail = this.getById(detail.getId());
                 inspectionEquipmentIsAvailable(detail, detail.getProcessdeviceid()
                         , detail.getPlanstartdate(), detail.getPlanenddate());
-                if (!detail.getId().equals(finalApsProcessOperationProcessEquDo.getId())) {
+                if (!detail.getId().equals(apsProcessOperationProcessEquDo.getId())) {
                     mergeWorkerIdList.add(detail.getId());
                 }
-            });
+            }
         } else {
             // 更新开工时间 jobDetailsVo
             String equId = jobDetailsVo.getEquId();