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

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

@@ -2069,6 +2069,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         for (ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo : apsProcessOperationProcessEquDos) {
             Date planstartdate = apsProcessOperationProcessEquDo.getPlanstartdate();
             Date planenddate = apsProcessOperationProcessEquDo.getPlanenddate();
+            String processdeviceid = apsProcessOperationProcessEquDo.getProcessdeviceid();
             ApsProcessOperationProcessEquDo needUpdate = new ApsProcessOperationProcessEquDo();
             needUpdate.setId(apsProcessOperationProcessEquDo.getId());
             needUpdate.setProcessdeviceid(req.getEquId());
@@ -2102,7 +2103,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             apsProcessOperationProcessEquDo.setPlanstartdate(needUpdate.getPlanstartdate());
             apsProcessOperationProcessEquDo.setPlanenddate(needUpdate.getPlanenddate());
             checkProcessingTimeConflict(apsProcessOperationProcessEquDo,
-                    planstartdate, planenddate, apsProcessOperationProcessEquDo.getProcessdeviceid(), "非合并加工", new LinkedList<>());
+                    planstartdate, planenddate, processdeviceid, "非合并加工", new LinkedList<>());
             // 判断是否存在设备不可用
             apsProcessOperationProcessEquDo = this.getById(apsProcessOperationProcessEquDo.getId());
             inspectionEquipmentIsAvailable(apsProcessOperationProcessEquDo,