feature 报工检验合格且没有下一道工序作业的情况下 更新在制品状态为:待加工 在制品类型为:在制品

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

@@ -24,6 +24,9 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static com.rongwei.safecommon.utils.SaveConstans.WorkInProgressStatus.WAITING;
+import static com.rongwei.safecommon.utils.SaveConstans.WorkInProgressStatus.WAIT_WORK;
+
 /**
  * ReportCheckServiceImpl class
  *
@@ -56,8 +59,6 @@ public class ReportCheckServiceImpl implements ReportCheckService {
     public static final String YES = "是";
     public static final String NO = "否";
     public static final String PENDING_PLAN_REVIEW = "待计划评审";
-    public static final String PREPARING_MATERIAL = "备料中";
-    public static final String TO_BE_PROCESSED = "待加工";
     public static final String VERIFIED = "已检验";
     public static final String COMPLETED = "已完工";
     public static final String REJECTS = "不良品备料";
@@ -183,7 +184,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                 apsWorkInProgressInventoryDos, nextProcessOperationDos, currentProcessOperationMainDo,
                 operationOutMaterDoList);
         // 获取所有待加工的批次号信息
-        String toBeProcessedBatchNum = apsWorkInProgressInventoryDos.stream().filter(info -> TO_BE_PROCESSED.equals(info.getWorkinprocessstatus()))
+        String toBeProcessedBatchNum = apsWorkInProgressInventoryDos.stream().filter(info -> WAIT_WORK.equals(info.getWorkinprocessstatus()))
                 .map(ApsWorkInProgressInventoryDo::getBatchnumber).collect(Collectors.joining(","));
 //        if (!qualifiedOutPutList.isEmpty()) {
 //            // 获取后道工序的数据
@@ -302,7 +303,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         List<String> unqualificationNum = unqualificationOutPutList.stream().map(ApsReportOutputDo::getOutputnumber).collect(Collectors.toList());
         apsWorkInProgressInventoryDos.forEach(info -> {
             if (unqualificationNum.contains(info.getBatchnumber())) {
-                info.setWorkinprocessstatus(PREPARING_MATERIAL);
+                info.setWorkinprocessstatus(WAITING);
                 info.setWorkinprocesstype(REJECTS);
             }
         });
@@ -328,14 +329,17 @@ public class ReportCheckServiceImpl implements ReportCheckService {
             if (nextProcessOperationDo.isEmpty()) {
                 if (processOperationDo.getOutputqualifiednum() + 1 <= operationOutMaterDo.getPlanprodrollnum()) {
                     info.setDeleted(DELETED);
+                }else{
+                    info.setWorkinprocessstatus(WAIT_WORK);
+                    info.setWorkinprocesstype(WORK_IN_PROCESS);
                 }
             } else {
                 // 输出合格卷数>计划成品卷数+下一个工序的(计划加工卷数-已取消卷数)
                 if (processOperationDo.getOutputqualifiednum() + 1 > operationOutMaterDo.getPlanprodrollnum() + nextProcessingPlannedNum) {
-                    info.setWorkinprocessstatus(PREPARING_MATERIAL);
+                    info.setWorkinprocessstatus(WAITING);
                     info.setWorkinprocesstype(SEMIFINISHED_PRODUCTS);
                 } else  { // if (processOperationDo.getOutputqualifiednum() + 1 <= operationOutMaterDo.getPlanprodrollnum() + nextProcessingPlannedNum)
-                    info.setWorkinprocessstatus(TO_BE_PROCESSED);
+                    info.setWorkinprocessstatus(WAIT_WORK);
                     info.setWorkinprocesstype(WORK_IN_PROCESS);
                 }
             }