feature 1400

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

@@ -52,6 +52,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
     public static final String COMPLETED = "已完工";
     public static final String SEMIFINISHED_PRODUCTS = "半成品备料";
     public static final String WORK_IN_PROCESS = "在制品";
+    public static final String MATERIAL_PREPARATION_ORDER="备料订单";
     private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
     @Autowired
     private ApsReportRecordsService apsReportRecordsService;
@@ -189,7 +190,8 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                 operationOutMaterDoList,
                 currentProcessOperationMainDo,
                 currentProcessOperationEqu,
-                reportRecordsDo);
+                reportRecordsDo,
+                productionOrderDo);
 //        updateProcessOutputMater(apsWorkInProgressInventoryDos, reportOutputDos,
 //                operationOutMaterDoList,
 //                currentProcessOperationMainDo,
@@ -274,7 +276,8 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                                     List<ApsProcessOperationOutMaterDo> operationOutMaterDoList,
                                     ApsProcessOperationDo currentProcessOperationDo,
                                     ApsProcessOperationProcessEquDo currentProcessOperationEqu,
-                                    ApsReportRecordsDo reportRecordsDo) {
+                                    ApsReportRecordsDo reportRecordsDo,
+                                    ApsProductionOrderDo productionOrderDo) {
         // 获取当前工序作业对应的下一个工序作业 以及工序作业明细信息
         String nextProcessesIds = currentProcessOperationEqu.getNextprocessesids();
         log.debug("当前工序作业明细对应的下一个工序作业信息ID:{}", nextProcessesIds);
@@ -470,9 +473,17 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                     // 添加需要流转的编号信息
                     toBeProcessedDataMap.put(outputId, outputNumbers);
                 }
-                // 更新成品的在制品状态
-                updateWorkInProgressInventoryStatus(blScNum + lzScNum, cpScNum, YES,
-                        apsWorkInProgressInventoryDos, currentReportOutputs, TO_BE_PUT_INTO_STORAGE, PASS);
+                if(MATERIAL_PREPARATION_ORDER.equals(productionOrderDo.getOrdertype())){
+                    log.debug("订单类型为备料");
+                    // 更新成品的在制品状态
+                    updateWorkInProgressInventoryStatus(blScNum + lzScNum, cpScNum, YES,
+                            apsWorkInProgressInventoryDos, currentReportOutputs, WAITING, PASS);
+                }else{
+                    // 更新成品的在制品状态
+                    updateWorkInProgressInventoryStatus(blScNum + lzScNum, cpScNum, YES,
+                            apsWorkInProgressInventoryDos, currentReportOutputs, TO_BE_PUT_INTO_STORAGE, PASS);
+                }
+
             }
         }
         log.info("开始更新在制品和工序作业输出物料信息");