添加生成批次代码

src/main/java/cn/ezhizao/project/business/controller/BizProductionPlanDetailSubDetailController.java

@@ -172,8 +172,8 @@ public class BizProductionPlanDetailSubDetailController extends BaseController {
         final int lotNumber = planDetail.getTotalLotNumber();
         final int oneLotQuantity = planDetail.getOneLotQuantity();
         final int lastLotQuantity = planDetail.getLastLotQuantity();
-        final String baseCode = planDetail.getProductionPlanNo().substring(0, 3);
-        final String baseCodeSeq = planDetail.getProductionPlanNo().substring(3, 6) + planDetail.getLineNumber().toString();
+        final String baseCode = planDetail.getProductionPlanNo().substring(0, 4);
+        final String baseCodeSeq = planDetail.getProductionPlanNo().substring(4, 7) + planDetail.getLineNumber().toString();
 
         List<BizLot> bizLotList = new ArrayList<>();
         for (int i = 0; i < lotNumber; ++i) {
@@ -182,6 +182,10 @@ public class BizProductionPlanDetailSubDetailController extends BaseController {
             String lotSeq = String.format("%03d", i + 1);
             bizLot.setLotCode(baseCode + baseCodeSeq + lotSeq + "0");
             bizLot.setProductionPlanDetailId(bizProductionPlanDetailSubDetail.getId());
+            bizLot.setTechnologicalProcessId(bizProductionPlanDetailSubDetail.getTechnologicalProcessId());
+            bizLot.setTechnologyVersion(bizProductionPlanDetailSubDetail.getTechnologyVersion());
+            bizLot.setProductId(bizProductionPlanDetailSubDetail.getProductId());
+            bizLot.setProductDescription(bizProductionPlanDetailSubDetail.getProductDescription());
             bizLot.setProductionQuantity(oneLotQuantity);
             if (i == lotNumber - 1) {
                 bizLot.setProductionQuantity(lastLotQuantity);

src/main/java/cn/ezhizao/project/business/domain/BizLot.java

@@ -83,6 +83,13 @@ public class BizLot extends BaseEntity {
     @ApiModelProperty(value = "产品图号")
     private String drawingNumber;
 
+    /**
+     * 产品描述
+     */
+    @Excel(name = "产品描述")
+    @ApiModelProperty(value = "产品描述")
+    private String productDescription;
+
     /**
      * 生产数量
      */

src/main/java/cn/ezhizao/project/business/domain/BizProductionPlanDetail.java

@@ -119,7 +119,7 @@ public class BizProductionPlanDetail extends BaseEntity
 
     /** 状态id（对应数据字典id） */
     @ApiModelProperty(value = "限额领料量/投料数量")
-    private Long statusDictCode;
+    private Long statusId;
 
     /** NA：经营初始，FM：经营申请，JH：计划审核，OP：调度下单，YA：领料锁定，CL：全部领完，IN：部分领料 */
     @Excel(name = "NA：经营初始，FM：经营申请，JH：计划审核，OP：调度下单，YA：领料锁定，CL：全部领完，IN：部分领料")
@@ -128,7 +128,7 @@ public class BizProductionPlanDetail extends BaseEntity
 
     /** 批号状态id（对应数据字典id） */
     @ApiModelProperty(value = "NA：经营初始，FM：经营申请，JH：计划审核，OP：调度下单，YA：领料锁定，CL：全部领完，IN：部分领料")
-    private Long lotCodeStatusDictCode;
+    private Long lotCodeStatusId;
 
     /** 批号状态：NA：未生成批号，OK：已生成批号，CL：批号已完工 */
     @Excel(name = "批号状态：NA：未生成批号，OK：已生成批号，CL：批号已完工")
@@ -137,7 +137,7 @@ public class BizProductionPlanDetail extends BaseEntity
 
     /** 批次类型id（对应数据字典id） */
     @ApiModelProperty(value = "批号状态：NA：未生成批号，OK：已生成批号，CL：批号已完工")
-    private Long lotTypeDictCode;
+    private Long lotTypeId;
 
     /** 批次类型：Y：正常,新增批次；G：改料,不增批次；B：补料 */
     @Excel(name = "批次类型：Y：正常,新增批次；G：改料,不增批次；B：补料")
@@ -146,7 +146,7 @@ public class BizProductionPlanDetail extends BaseEntity
 
     /** 生产类型id */
     @ApiModelProperty(value = "批次类型：Y：正常,新增批次；G：改料,不增批次；B：补料")
-    private Long productionTypeDictCode;
+    private Long productionTypeId;
 
     /** 生产类型（Y：量产、X：样品、试制S） */
     @Excel(name = "生产类型", readConverterExp = "Y=：量产、X：样品、试制")