aps-作业报工增加加工中批次号的处理，工序作业明细增加加工中批次号字段

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

@@ -259,6 +259,9 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             //更新实际开工时间
             needUpdateProcessOperationProcessEqu.setActualstartdate(DateUtil.date());
         }
+        if (ObjectUtil.isNotEmpty(req.getInputBatchNumber())) {
+            needUpdateProcessOperationProcessEqu.setDoingbatchnumber(req.getInputBatchNumber());
+        }
         apsProcessOperationProcessEquService.updateById(needUpdateProcessOperationProcessEqu);
 
         //===============更新工序作业==================
@@ -482,6 +485,8 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         if (apsProcessOperationProcessEquDo.getClosestatus().equals("未完工") && apsProcessOperationProcessEquDo.getStartingroll() > 0) {
             needUpdateProcessOperationProcessEquDo.setWorkstatus("加工中");
         }
+        //清空加工中批次号
+        needUpdateProcessOperationProcessEquDo.setDoingbatchnumber("");
         apsProcessOperationProcessEquService.updateById(needUpdateProcessOperationProcessEquDo);
 
         //==============更新工序作业信息==============
@@ -542,7 +547,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         //查询新的输出物料
         List<ApsReportOutputDo> newOutputDos = apsReportOutputService.list(new QueryWrapper<ApsReportOutputDo>().lambda().eq(ApsReportOutputDo::getMainid, apsReportRecordsDo.getId()));
         //填补对应的检验等级和是否合格
-        if(apsReportOutputDoList.size() == newOutputDos.size()){
+        if (apsReportOutputDoList.size() == newOutputDos.size()) {
             for (int i = 0; i < newOutputDos.size(); i++) {
                 newOutputDos.get(i).setInsepctionlevel(apsReportOutputDoList.get(i).getInsepctionlevel());
                 newOutputDos.get(i).setQualified(apsReportOutputDoList.get(i).getQualified());

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOperationProcessEquBackupDo.java

@@ -148,4 +148,9 @@ public class ApsProcessOperationProcessEquBackupDo extends BaseDo implements Ser
      * 后道工序ID
      */
     private String nextprocessesids;
+    /**
+     * 加工中批次号
+     */
+    @TableField("DOINGBATCHNUMBER")
+    private String doingbatchnumber;
 }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOperationProcessEquDo.java

@@ -167,4 +167,9 @@ public class ApsProcessOperationProcessEquDo extends BaseDo {
      * 后道工序ID
      */
     private String nextprocessesids;
+    /**
+     * 加工中批次号
+     */
+    @TableField("DOINGBATCHNUMBER")
+    private String doingbatchnumber;
 }