aps-报工新增在制品时需要记录报工作业明细的坯料计划ID，坯料计划编号，领料批次号，以便在制品库存查看生产卡片

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

@@ -1171,8 +1171,10 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
                     outPutNumber = String.join(",", outputNumbers);
                     if (StringUtils.isNotBlank(apsProcessOperationDo.getIfblankprocess()) && "是".equals(apsProcessOperationDo.getIfblankprocess())) {
                         processEquWrapper.set(ApsProcessOperationProcessEquDo::getBlankbatchnumber, outPutNumber);
+                        apsProcessOperationProcessEquDo.setBlankbatchnumber(outPutNumber);
                     } else {
                         processEquWrapper.set(ApsProcessOperationProcessEquDo::getBlankbatchnumber, nowReportRecordsDo.getBatchnumber());
+                        apsProcessOperationProcessEquDo.setBlankbatchnumber(nowReportRecordsDo.getBatchnumber());
                     }
                 }
                 updateAfterBlankByBatchAndOutPutNumber(apsProcessOperationDo, nowReportRecordsDo, apsProcessOperationProcessEquDo, outPutNumber);
@@ -1473,6 +1475,10 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             workInProgressInventoryDo.setJoboutputmaterial(outPut);
             //计划输出卷重
             workInProgressInventoryDo.setPlansinglerollweight(apsProcessOperationOutMaterDo.getSinglerollweight());
+            //坯料计划相关信息
+            workInProgressInventoryDo.setPlanblankid(apsBlankOrderDo.getId());
+            workInProgressInventoryDo.setBlanknumber(apsBlankOrderDo.getBlanknumber());
+            workInProgressInventoryDo.setBlankbatchnumber(apsProcessOperationProcessEquDo.getBlankbatchnumber());
 
             needAddWorkInProgressInventoryList.add(workInProgressInventoryDo);
         }

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

@@ -40,7 +40,7 @@ public class ApsWorkInProgressInventoryDo extends BaseDo implements Serializable
     private String blankbatchnumber;
 
     /**
-     * 坯料ID
+     * 报工输出物料ID
      */
     private String blankid;
 
@@ -179,6 +179,21 @@ public class ApsWorkInProgressInventoryDo extends BaseDo implements Serializable
      */
     private String previousworkinprocessstatus;
 
+    /**
+     * 坯料计划ID
+     */
+    private String planblankid;
+
+    /**
+     * 坯料计划编号
+     */
+    private String blanknumber;
+
+    /**
+     * 领料批次号
+     */
+    private String pickingbatchnumber;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }