|
@@ -104,6 +104,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
private ApsProductionOrderDao apsProductionOrderDao;
|
|
|
@Autowired
|
|
|
private GanttServiceImpl ganttService;
|
|
|
+ @Autowired
|
|
|
+ private ApsConflictLogServiceImpl apsConflictLogService;
|
|
|
|
|
|
|
|
|
private final static Map<String, String> UNIT_MAP = new HashMap<String, String>() {{
|
|
@@ -747,6 +749,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
processOperationDo.setLeavewaitworkroll(processOperationDo.getPlanprocessrall());
|
|
|
processOperationDo.setWorkstatus(SaveConstans.JobStatus.JOBSTATUS_TO_BE_START);
|
|
|
processOperationDo.setProcessstatus(SaveConstans.ProductionStatus.TO_BE_SCHEDULED);
|
|
|
+ //存储日志
|
|
|
+ apsConflictLogService.recordLog("","更新工序作业的生产状态为待排程,工序作业ID为:"+processOperationDo.getId(),"",2,null);
|
|
|
+
|
|
|
processOperationDo.setClosestatus(SaveConstans.CloseStatus.UNFINISHED);
|
|
|
processOperationDo.setLockmark(LOCKMARK_N);
|
|
|
processOperationDo.setRemark("");
|
|
@@ -937,6 +942,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
processOperationDo.setNextprocessid("");
|
|
|
processOperationDo.setWorkstatus(SaveConstans.JobStatus.JOBSTATUS_TO_BE_START);
|
|
|
processOperationDo.setProcessstatus(SaveConstans.ProductionStatus.TO_BE_SCHEDULED);
|
|
|
+ //存储日志
|
|
|
+ apsConflictLogService.recordLog("","更新工序作业的生产状态为待排程,工序作业ID为:"+processOperationDo.getId(),"",2,null);
|
|
|
+
|
|
|
processOperationDo.setClosestatus(SaveConstans.CloseStatus.UNFINISHED);
|
|
|
processOperationDo.setLockmark(LOCKMARK_N);
|
|
|
processOperationDo.setRemark("");
|