Merge branch 'feature/1.0.0' of github.com:ab-inbev-apac/abi-cloud-qr-platform into feature/1.0.0

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

@@ -22,8 +22,9 @@ public class ActivePackageVO implements Serializable {
     @ApiModelProperty("码类型 1-箱码 2-盖码")
     private Integer qrType;
 
-    @ApiModelProperty("sku名称")
-    private String skuName;
+    //603版 已作废
+    /*@ApiModelProperty("sku名称")
+    private String skuName;*/
 
     @ApiModelProperty("品牌名称")
     private String brandName;

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

@@ -40,8 +40,9 @@ public class QrPackageVO implements Serializable {
     @ApiModelProperty("啤酒厂名称")
     private String factoryBeerName;
 
-    @ApiModelProperty("SKU名称")
-    private String skuName;
+    //603版 sku已作废
+    /*@ApiModelProperty("SKU名称")
+    private String skuName;*/
 
     @ApiModelProperty(value = "备用码包")
     private Integer standbyRatio;

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

@@ -27,8 +27,9 @@ public class QrSingleCheckVO implements Serializable {
 	@ApiModelProperty("物料名称")
 	private String materialName;
 
-	@ApiModelProperty(value = "sku名称")
-	private String skuName;
+	//603版 已废弃
+	/*@ApiModelProperty(value = "sku名称")
+	private String skuName;*/
 
 	@ApiModelProperty("包材厂名称")
 	private String factoryCoverName;

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

@@ -20,7 +20,7 @@ public class GetPackageCodeRes {
     @Schema(name = "码类型")
     private Integer qrType;
 
-    //630版 已废弃
+    //603版 已废弃
     /*@Schema(name = "SKU商品名称")
     private String skuName;*/
 

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

@@ -42,8 +42,9 @@ public class GetQrPackageDetailRes implements Serializable {
 	@ApiModelProperty("啤酒厂名称")
 	private String factoryBeerName;
 
-	@ApiModelProperty("SKU名称")
-	private String skuName;
+	//603版 sku已作废
+	/*@ApiModelProperty("SKU名称")
+	private String skuName;*/
 
 	@ApiModelProperty(value = "备用码包")
 	private Integer standbyRatio;

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

@@ -29,8 +29,9 @@ public class GetQrSingleCheckDetailRes {
     @ApiModelProperty("物料名称")
     private String materialName;
 
-    @ApiModelProperty(value = "sku名称")
-    private String skuName;
+    //603版 已废弃
+    /*@ApiModelProperty(value = "sku名称")
+    private String skuName;*/
 
     @ApiModelProperty("包材厂名称")
     private String factoryCoverName;

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

@@ -50,8 +50,8 @@ 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名称 -->
-        <result property="skuName" column="sku_name"/>
+        <!-- SKU名称 603版 已作废 -->
+<!--        <result property="skuName" column="sku_name"/>-->
         <!-- 包材厂 -->
         <result property="factoryCoverName" column="factory_cover_name"/>
         <!-- 啤酒厂 -->
@@ -148,7 +148,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             qp.update_by,
             qp.qr_type,
             bm.material_name,
-            bs.sku_name,
             bcf.name as box_code_format_name,
             bfc.factory_name as factory_cover_name,
             bfb.factory_name as factory_beer_name,
@@ -166,7 +165,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN qr_box_code_format bcf ON qp.box_code_format_id = bcf.id
         LEFT JOIN qr_repertory qr ON bcf.qr_repertory_id = qr.id
         LEFT JOIN base_material bm ON qp.material_id = bm.id
-        LEFT JOIN base_sku bs on bm.sku_id = bs.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 qr_package_download_record qpdr ON qpdr.qr_package_id = qp.id
@@ -182,36 +180,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         qp.qr_type,
         qp.generate_time,
         bm.material_name,
-        bs.sku_name,
         bfa.factory_name AS factory_cover_name,
         bfb.factory_name AS factory_beer_name
         FROM
         qr_package qp
         LEFT JOIN base_material bm ON qp.material_id = bm.id
-        LEFT JOIN base_sku bs ON bm.sku_id = bs.id
         LEFT JOIN base_factory bfa ON qp.factory_cover_id = bfa.id
         LEFT JOIN base_factory bfb ON qp.factory_beer_id = bfb.id
         WHERE
         qp.id = #{id}
     </select>
 
+    <!--6.03已废弃-->
     <!--通过码活动id查询关联码包列表-->
-    <select id="listPackageById" resultType="com.abi.qms.platform.dao.vo.result.ActivePackageVO">
-    select
-    qp.id as packageId,
-    qp.qr_type,
-    bs.sku_name,
-    bb.brand_name,
-    bb.parent_brand_name,
-    qp.qr_number
-    from qr_package qp
-    inner join base_material bm on bm.id=qp.material_id
-    inner join base_sku bs on bs.id=bm.sku_id
-    inner join base_brand bb on bb.brand_code=bs.sub_brand_code
-    left join base_active_qr_package_mapping baqpm on baqpm.qr_package_id=qp.id
-    left join base_active ba on ba.id = baqpm.active_id
-    where ba.id = #{id}
-    </select>
+<!--    <select id="listPackageById" resultType="com.abi.qms.platform.dao.vo.result.ActivePackageVO">-->
+<!--    select-->
+<!--    qp.id as packageId,-->
+<!--    qp.qr_type,-->
+<!--    bb.brand_name,-->
+<!--    bb.parent_brand_name,-->
+<!--    qp.qr_number-->
+<!--    from qr_package qp-->
+<!--    inner join base_material bm on bm.id=qp.material_id-->
+<!--    inner join base_brand bb on bb.brand_code=bs.sub_brand_code-->
+<!--    left join base_active_qr_package_mapping baqpm on baqpm.qr_package_id=qp.id-->
+<!--    left join base_active ba on ba.id = baqpm.active_id-->
+<!--    where ba.id = #{id}-->
+<!--    </select>-->
 
 
     <!--6.03已废弃-->