码包明细修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/QrPackageVO.java

@@ -25,6 +25,9 @@ public class QrPackageVO implements Serializable {
     @ApiModelProperty(value = "物料id")
     private Long materialId;
 
+    @ApiModelProperty(value = "物料号")
+    private String materialCode;
+
     @ApiModelProperty("物料名称")
     private String materialName;
 
@@ -64,6 +67,9 @@ public class QrPackageVO implements Serializable {
     @ApiModelProperty("SAP单号")
     private String sapOrderNo;
 
+    @ApiModelProperty("预订单号")
+    private String bookingOrder;
+
     @ApiModelProperty("码数量")
     private Long qrNumber;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/SaveQrPackageReq.java

@@ -42,7 +42,7 @@ public class SaveQrPackageReq implements Serializable {
 	@ApiModelProperty(value = "物料id")
 	private Long materialId;
 
-	@Schema(name = "物料号")
+	@ApiModelProperty(value = "物料号")
 	private String materialCode;
 
 	@NotNull(message = "包材厂为空")

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/GetQrPackageDetailRes.java

@@ -27,6 +27,9 @@ public class GetQrPackageDetailRes implements Serializable {
 	@ApiModelProperty(value = "物料id")
 	private Long materialId;
 
+	@ApiModelProperty(value = "物料号")
+	private String materialCode;
+
 	@ApiModelProperty("物料名称")
 	private String materialName;
 
@@ -66,6 +69,9 @@ public class GetQrPackageDetailRes implements Serializable {
 	@ApiModelProperty("SAP单号")
 	private String sapOrderNo;
 
+	@ApiModelProperty("预订单号")
+	private String bookingOrder;
+
 	@ApiModelProperty("码数量")
 	private Long qrNumber;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageServiceImpl.java

@@ -272,6 +272,7 @@ public class QrPackageServiceImpl implements QrPackageService {
 
         qrPackage.setSapOrderNo(req.getSapOrderNo());
         qrPackage.setMaterialId(req.getMaterialId());
+        qrPackage.setMaterialCode(req.getMaterialCode());
         qrPackage.setFactoryCoverId(req.getFactoryCoverId());
         qrPackage.setFactoryCoverLevelTwoId(req.getFactoryCoverLevelTwoId());
         qrPackage.setFactoryBeerId(req.getFactoryBeerId());

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageMapper.xml

@@ -35,12 +35,14 @@
     <resultMap type="com.abi.qms.platform.dao.vo.result.QrPackageVO" id="QrPackageResult">
         <result property="id" column="id"/>
         <result property="materialId" column="material_id"/>
+        <result property="materialCode" column="material_code"/>
         <result property="factoryCoverId" column="factory_cover_id"/>
         <result property="factoryBeerId" column="factory_beer_id"/>
         <result property="standbyRatio" column="standby_ratio"/>
         <result property="reasonApply" column="reason_apply"/>
         <result property="boxCodeFormatId" column="box_code_format_id"/>
         <result property="sapOrderNo" column="sap_order_no"/>
+        <result property="bookingOrder" column="booking_order"/>
         <result property="qrNumber" column="qr_number"/>
         <result property="applyStatus" column="apply_status"/>
         <result property="generateStatus" column="generate_status"/>
@@ -138,12 +140,14 @@
         SELECT
             qp.id,
             qp.material_id,
+            qp.material_code,
             qp.factory_cover_id,
             qp.factory_beer_id,
             qp.standby_ratio,
             qp.reason_apply,
             qp.box_code_format_id,
             qp.sap_order_no,
+            qp.booking_order,
             qp.qr_number,
             qp.apply_status,
             qp.generate_status,