Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

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

@@ -670,9 +670,6 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         processOperationDo.setId(processId);
                         processOperationDo.setBlankid(blanckdata.getStr("ID"));
                         processOperationDo.setNextprocessid(null);
-                        processOperationDo.setWorkstatus(SaveConstans.JobStatus.JOBSTATUS_TO_BE_START);
-                        processOperationDo.setProcessstatus(SaveConstans.ProductionStatus.TO_BE_SCHEDULED);
-                        processOperationDo.setClosestatus(SaveConstans.CloseStatus.UNFINISHED);
 
                         //前道工序输出
                         List<PreviousProcessVo> processVo = newProcessIds.stream().filter(pro -> pro.getPreviousstepid().equals(apsProcessOperationDo1.getPreviousprocessid())).collect(Collectors.toList());
@@ -720,6 +717,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         processOperationDo.setWorkstatus(SaveConstans.JobStatus.JOBSTATUS_TO_BE_START);
                         processOperationDo.setProcessstatus(SaveConstans.ProductionStatus.TO_BE_SCHEDULED);
                         processOperationDo.setClosestatus(SaveConstans.CloseStatus.UNFINISHED);
+                        processOperationDo.setLockmark(LOCKMARK_N);
 
                         //更新前道工序的后道工序
                         ApsProcessOperationDo aDo = apsProcessOperationDoList.stream().filter(qtr -> processVo.get(0).getProcessId().equals(qtr.getId())).findAny().orElse(null);
@@ -869,6 +867,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     processOperationDo.setWorkstatus(SaveConstans.JobStatus.JOBSTATUS_TO_BE_START);
                     processOperationDo.setProcessstatus(SaveConstans.ProductionStatus.TO_BE_SCHEDULED);
                     processOperationDo.setClosestatus(SaveConstans.CloseStatus.UNFINISHED);
+                    processOperationDo.setLockmark(LOCKMARK_N);
 
 //                    if (!processOperationDo.getProcessway().equals("合并加工")) {
                     BigDecimal loadingmin = processOperationDo.getLoadingmin() == null ? BigDecimal.valueOf(0) : processOperationDo.getLoadingmin();