feat：sap sku 添加类型字段

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/BaseSapSku.java

@@ -58,4 +58,7 @@ public class BaseSapSku {
     @Schema(name = "是否删除")
     private Integer isDelete;
 
+    @Schema(name = "类型")
+    private String skuType;
+
 }

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

@@ -9,4 +9,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @description:
  */
 public interface BaseSapBrandMapper extends BaseMapper<BaseSapBrand> {
+
+    /**
+     * 删除sap品牌所有数据
+     */
+    void deleteTable();
 }

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

@@ -45,6 +45,9 @@ public class BatchImportSkuReq implements Serializable {
         @ApiModelProperty(value = "子品牌code")
         private String subBrandCode;
 
+        @ApiModelProperty(value = "类型")
+        private String skuType;
+
 
     }
 

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

@@ -6,7 +6,6 @@ import com.abi.qms.platform.dto.req.BatchImportSkuReq;
  * @author: fangxinjian
  * @date: 2021/06/02 09:37
  * @description:
- * 603版 已作废
  */
 public interface BaseSapSkuService {
 

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

@@ -29,6 +29,8 @@ public class BaseSapBrandServiceImpl implements BaseSapBrandService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void batchImportBrand(BatchImportBrandReq req) {
+        //sap品牌数据是全量数据，先删除品牌数据
+        baseSapBrandMapper.deleteTable();
         List<BatchImportBrandReq.SapBrandBean> brandBeanList = req.getSapBrandBeanList();
 
         for (BatchImportBrandReq.SapBrandBean brand : brandBeanList) {

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

@@ -18,7 +18,7 @@ import java.util.List;
 /**
  * @author: fangxinjian
  * @date: 2021/06/02 09:38
- * @description: 603版 已作废
+ * @description:
  */
 @Service
 public class BaseSapSkuServiceImpl implements BaseSapSkuService {
@@ -41,6 +41,7 @@ public class BaseSapSkuServiceImpl implements BaseSapSkuService {
             sapSku.setSubBrandCode(sku.getSubBrandCode());
             sapSku.setSkuCode(sku.getSkuCode());
             sapSku.setSkuName(sku.getSkuName());
+            sapSku.setSkuType(sku.getSkuType());
 
             saveBaseSapSku(sapSku);
         }

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

@@ -22,4 +22,8 @@
         ID, BRAND_CODE, BRAND_NAME, BRAND_LEVEL, PARENT_BRAND_CODE, PARENT_BRAND_NAME, CREATE_TIME, CREATE_BY, UPDATE_TIME, UPDATE_BY, IS_DELETE
     </sql>
 
+    <delete id="deleteTable">
+        delete from base_sap_brand
+    </delete>
+
 </mapper>

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

@@ -2,26 +2,25 @@
 <!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"/>
+        <result column="sku_type" property="skuType"/>
+    </resultMap>
 
-<!--    &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>-->
+    <!-- 通用查询结果列 -->
+    <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,sku_type
+    </sql>
 
 
 </mapper>