码包详情添加字段

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

@@ -34,16 +34,15 @@ public class QrPackageVO implements Serializable {
     @ApiModelProperty("包材厂名称")
     private String factoryCoverName;
 
+    @ApiModelProperty("二级包材厂名称")
+    private String factoryCoverLevelTwoName;
+
     @ApiModelProperty(value = "啤酒厂id")
     private Long factoryBeerId;
 
     @ApiModelProperty("啤酒厂名称")
     private String factoryBeerName;
 
-    //603版 sku已作废
-    /*@ApiModelProperty("SKU名称")
-    private String skuName;*/
-
     @ApiModelProperty(value = "备用码包")
     private Integer standbyRatio;
 
@@ -68,6 +67,9 @@ public class QrPackageVO implements Serializable {
     @ApiModelProperty("码数量")
     private Long qrNumber;
 
+    @ApiModelProperty("SAP采购数量")
+    private Long purchaseCount;
+
     @ApiModelProperty("码类型")
     private Integer qrType;
 

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

@@ -36,16 +36,15 @@ public class GetQrPackageDetailRes implements Serializable {
 	@ApiModelProperty("包材厂名称")
 	private String factoryCoverName;
 
+	@ApiModelProperty("二级包材厂名称")
+	private String factoryCoverLevelTwoName;
+
 	@ApiModelProperty(value = "啤酒厂id")
 	private Long factoryBeerId;
 
 	@ApiModelProperty("啤酒厂名称")
 	private String factoryBeerName;
 
-	//603版 sku已作废
-	/*@ApiModelProperty("SKU名称")
-	private String skuName;*/
-
 	@ApiModelProperty(value = "备用码包")
 	private Integer standbyRatio;
 

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

@@ -51,16 +51,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="qrType" column="qr_type"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
-        <!-- SKU名称 603版 已作废 -->
-<!--        <result property="skuName" column="sku_name"/>-->
+        <result property="purchaseCount" column="purchase_count"/>
+
         <!-- 包材厂 -->
         <result property="factoryCoverName" column="factory_cover_name"/>
         <!-- 啤酒厂 -->
         <result property="factoryBeerName" column="factory_beer_name"/>
+        <!-- 二级包材厂 -->
+        <result property="factoryCoverLevelTwoName" column="factory_cover_level_two_name"/>
+
         <!-- 物料名称 -->
         <result property="materialName" column="material_name"/>
         <!-- 码库 -->
-        <result property="qrRepertoryId" column="qr_Repertory_id"/>
+        <result property="qrRepertoryId" column="qr_repertory_id"/>
         <result property="qrRepertoryName" column="qr_repertory_name"/>
         <result property="qrRepertoryType" column="qr_repertory_type"/>
         <result property="boxCodeFormatName" column="box_code_format_name"/>
@@ -152,7 +155,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bcf.name as box_code_format_name,
             bfc.factory_name as factory_cover_name,
             bfb.factory_name as factory_beer_name,
-            qr.id AS qr_Repertory_id,
+            bfc_l2.factory_name as factory_cover_level_two_name,
+            qr.id AS qr_repertory_id,
             qr.name AS qr_repertory_name,
             qr.type AS qr_repertory_type,
             qpdr.create_time AS download_time,
@@ -160,7 +164,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             qpb.id as batch_id,
             qpb.package_id,
             qpb.batch_number,
-            qpb.batch_qr_number
+            qpb.batch_qr_number,
+            sap_item.purchase_count
         FROM
             qr_package qp
         LEFT JOIN qr_box_code_format bcf ON qp.box_code_format_id = bcf.id
@@ -168,6 +173,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN base_material bm ON qp.material_id = bm.id
         LEFT JOIN base_factory bfc ON qp.factory_cover_id = bfc.id
         LEFT JOIN base_factory bfb ON qp.factory_beer_id = bfb.id
+        LEFT JOIN base_factory bfc_l2 ON qp.factory_cover_level_two_id = bfc_l2.id and bfc_l2.factory_type=3
+        LEFT JOIN qr_package_sap_order_item sap_item on sap_item.sap_order_no=qp.sap_order_no and sap_item.sap_material_id=bm.material_code and sap_item.is_delete=0
         LEFT JOIN qr_package_download_record qpdr ON qpdr.qr_package_id = qp.id
         LEFT JOIN qr_package_batch qpb ON qpb.package_id = qp.id
         LEFT JOIN user_info ui ON ui.id = qpdr.create_by