aps-小卷报工后待加工料卷批次号/作业状态更新优化testin1725

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

@@ -206,8 +206,10 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                 currentProcessOperationMainDo.setCheckoutroll(currentProcessOperationMainDo.getCheckoutroll() + 1);
                 currentProcessOperationEqu.setCheckoutroll(currentProcessOperationEqu.getCheckoutroll() + 1);
             }
-            currentProcessOperationEqu.setWorkstatus(JOBSTATUS_TO_BE_END);
-            currentProcessOperationEqu.setBachmaterialprocess("");
+            if (StringUtils.isBlank(currentProcessOperationEqu.getBachmaterialprocess())){
+                currentProcessOperationEqu.setWorkstatus(JOBSTATUS_TO_BE_END);
+                currentProcessOperationEqu.setBachmaterialprocess("");
+            }
             // 更新 更新该报工检验记录所有输出物料 以及待加工料卷批次号
             batchNumCirculation(apsWorkInProgressInventoryDos, reportOutputDos,
                     operationOutMaterDoList,