箱码合一打印sku去除 603版 已作废

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/BaseSapSkuMapper.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author: fangxinjian
  * @date: 2021/06/02 09:34
  * @description: sap sku mapper接口
+ * 603版 已作废
  */
 public interface BaseSapSkuMapper extends BaseMapper<BaseSapSku> {
 

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

@@ -36,7 +36,8 @@ public class PrintingDetailVO {
     @ApiModelProperty(value = "啤酒厂id")
     private Long factoryBeerId;
 
-    @ApiModelProperty(value = "sku名称")
-    private String skuName;
+    //603版 已作废
+    /*@ApiModelProperty(value = "sku名称")
+    private String skuName;*/
 
 }

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

@@ -39,7 +39,8 @@ public class PrintingDetailRes implements Serializable {
     @ApiModelProperty(value = "啤酒厂名称")
     private String factoryBeerName;
 
-    @ApiModelProperty(value = "sku名称")
-    private String skuName;
+    //603版 已作废
+    /*@ApiModelProperty(value = "sku名称")
+    private String skuName;*/
 
 }

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

@@ -171,10 +171,8 @@ public class QrBoxMappingServiceImpl implements QrBoxMappingService {
 
         PrintingDetailVO printingDetail = qrBoxMappingMapper.getPrintingDetail(req.getPackageId());
         PrintingDetailRes res = PojoConverterUtils.copy(printingDetail, PrintingDetailRes.class);
-        Long factoryCoverLevelTwoId = printingDetail.getFactoryCoverLevelTwoId();
-        Long factoryBeerId = printingDetail.getFactoryBeerId();
-        res.setFactoryCoverName(getFactoryName(factoryCoverLevelTwoId));
-        res.setFactoryBeerName(getFactoryName(factoryBeerId));
+        res.setFactoryCoverName(null == printingDetail.getFactoryCoverLevelTwoId() ? "" : getFactoryName(printingDetail.getFactoryCoverLevelTwoId()));
+        res.setFactoryBeerName(null == printingDetail.getFactoryBeerId() ? "" : getFactoryName(printingDetail.getFactoryBeerId()));
 
         return res;
     }

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

@@ -2,25 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.abi.qms.platform.dao.mapper.BaseSapSkuMapper">
 
+    <!--603版 已作废-->
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.BaseSapSku">
-        <id column="id" property="id"/>
-        <result column="sku_code" property="skuCode"/>
-        <result column="sku_name" property="skuName"/>
-        <result column="brand_code" property="brandCode"/>
-        <result column="sub_brand_code" property="subBrandCode"/>
-        <result column="valid" property="valid"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_by" property="createBy"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="update_by" property="updateBy"/>
-        <result column="is_delete" property="isDelete"/>
-    </resultMap>
+<!--    <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.BaseSapSku">-->
+<!--        <id column="id" property="id"/>-->
+<!--        <result column="sku_code" property="skuCode"/>-->
+<!--        <result column="sku_name" property="skuName"/>-->
+<!--        <result column="brand_code" property="brandCode"/>-->
+<!--        <result column="sub_brand_code" property="subBrandCode"/>-->
+<!--        <result column="valid" property="valid"/>-->
+<!--        <result column="create_time" property="createTime"/>-->
+<!--        <result column="create_by" property="createBy"/>-->
+<!--        <result column="update_time" property="updateTime"/>-->
+<!--        <result column="update_by" property="updateBy"/>-->
+<!--        <result column="is_delete" property="isDelete"/>-->
+<!--    </resultMap>-->
 
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, sku_code, sku_name, brand_code, sub_brand_code, valid, create_time, create_by, update_time, update_by, is_delete
-    </sql>
+<!--    &lt;!&ndash; 通用查询结果列 &ndash;&gt;-->
+<!--    <sql id="Base_Column_List">-->
+<!--        id, sku_code, sku_name, brand_code, sub_brand_code, valid, create_time, create_by, update_time, update_by, is_delete-->
+<!--    </sql>-->
 
 
 </mapper>

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

@@ -55,11 +55,10 @@
     <select id="getPrintingDetail" resultType="com.abi.qms.platform.dao.vo.result.PrintingDetailVO">
         select
         qbm.begin_qr_code,qbm.end_qr_code,qbm.create_time,qbm.box_code,qbm.qr_code_count,
-        qp.factory_cover_level_two_id,qp.factory_beer_id,bs.sku_name
+        qp.factory_cover_level_two_id,qp.factory_beer_id
         from qr_box_mapping qbm
         inner join qr_package qp on qp.id=qbm.package_id
         inner join base_material bm on bm.id=qp.material_id
-        inner join base_sku bs on bs.id=bm.sku_id
         <where>
             <if test="packageId != null and packageId!='' ">
                 qbm.package_id = #{packageId}