物料管理 603版 sku作废

abi-cloud-qr-platform-common/src/main/java/com/abi/task/common/excel/preperties/MaterialProperty.java

@@ -22,8 +22,9 @@ public class MaterialProperty implements AbstractExcelProperty {
     @ExcelHeadAlias(value = "物料名称（必填）")
     private String materialName;
 
-    @ExcelHeadAlias(value = "SKU名称 (必填)")
-    private String skuName;
+    //603版 已作废
+    /*@ExcelHeadAlias(value = "SKU名称 (必填)")
+    private String skuName;*/
 
     @ExcelHeadAlias(value = "描述")
     private String description;

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

@@ -35,8 +35,9 @@ public class BaseMaterial {
 	@Schema(name = "物料类型: 1-瓶子 2-PET 3-罐子 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘")
     private Integer materialType;
 
-    @Schema(name = "商品ID（即base_sku表的主键id）")
-	private Long skuId;
+	//603版 已作废
+    /*@Schema(name = "商品ID（即base_sku表的主键id）")
+	private Long skuId;*/
 
 	@Schema(name = "描述")
     private String description;

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

@@ -39,8 +39,9 @@ public class MaterialVO {
     @Schema(name = "修改时间")
     private LocalDateTime updateTime;
 
-    @Schema(name = "SKU名称")
-    private String skuName;
+    //603版 已作废
+    /*@Schema(name = "SKU名称")
+    private String skuName;*/
 
 
 }

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

@@ -30,8 +30,9 @@ public class AddMaterialReq implements Serializable {
     @Schema(name = "描述")
     private String description;
 
-    @NotNull
+    //603版 已作废
+    /*@NotNull
     @Schema(name = "SKU商品Id")
-    private Long skuId;
+    private Long skuId;*/
 
 }

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

@@ -26,7 +26,8 @@ public class ListMaterialReq extends PageReq implements Serializable {
     @Schema(name = "是否有效 0-无效 1-有效")
     private Integer valid;
 
-    @Schema(name = "SKU商品名称")
-    private String skuName;
+    //603版 已作废
+    /*@Schema(name = "SKU商品名称")
+    private String skuName;*/
 
 }

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

@@ -30,7 +30,8 @@ public class UpdateMaterialReq implements Serializable {
     @Schema(name = "是否有效 0-无效 1-有效")
     private Integer valid;
 
-    @Schema(name = "SKU商品Id")
-    private Long skuId;
+    //603版 已作废
+    /*@Schema(name = "SKU商品Id")
+    private Long skuId;*/
 
 }

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

@@ -35,8 +35,9 @@ public class GetMaterialRes implements Serializable {
     @Schema(name = "是否有效 0-无效 1-有效")
     private Integer valid;
 
-    @Schema(name = "SKU商品Id")
-    private Long skuId;
+    //603版 已作废
+    /*@Schema(name = "SKU商品Id")
+    private Long skuId;*/
 
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

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

@@ -61,8 +61,9 @@ public class ListMaterialRes extends PageResp implements Serializable {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime updateTime;
 
-        @Schema(name = "SKU商品名称")
-        private String skuName;
+        //603版 已作废
+        /*@Schema(name = "SKU商品名称")
+        private String skuName;*/
 
     }
 }

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

@@ -75,7 +75,8 @@ public class MaterialServiceImpl implements MaterialService {
         material.setMaterialName(req.getMaterialName());
         material.setMaterialType(req.getMaterialType());
         material.setDescription(req.getDescription());
-        material.setSkuId(req.getSkuId());
+        //603版 已作废
+        //material.setSkuId(req.getSkuId());
         baseMaterialMapper.insert(material);
 
     }
@@ -108,7 +109,8 @@ public class MaterialServiceImpl implements MaterialService {
         material.setMaterialType(req.getMaterialType());
         material.setDescription(req.getDescription());
         material.setValid(req.getValid());
-        material.setSkuId(req.getSkuId());
+        //603版 已作废
+        //material.setSkuId(req.getSkuId());
         baseMaterialMapper.updateById(material);
 
     }
@@ -239,8 +241,9 @@ public class MaterialServiceImpl implements MaterialService {
                 //1-校验必填与枚举
                 Map<String, Object> returnMap = checkMaterialProperty(materialProperty);
                 String errotMessage = String.valueOf(returnMap.get("errorMessage"));
-                BaseSku baseSku = (BaseSku) returnMap.get("baseSku");
-                if (StringUtils.isNotBlank(errotMessage) || null == baseSku) {
+                //603版 已作废
+                //BaseSku baseSku = (BaseSku) returnMap.get("baseSku");
+                if (StringUtils.isNotBlank(errotMessage) /*|| null == baseSku*//*603版 已作废*/) {
                     throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), errotMessage);
                 }
                 //2-调用业务代码新增
@@ -249,7 +252,8 @@ public class MaterialServiceImpl implements MaterialService {
                 req.setMaterialName(materialProperty.getMaterialName());
                 req.setMaterialType(MaterialTypeEnum.getCode(materialProperty.getMaterialType()));
                 req.setDescription(materialProperty.getDescription());
-                req.setSkuId(baseSku.getId());
+                //603版 已作废
+                //req.setSkuId(baseSku.getId());
 
                 addMaterial(req);
             } catch (BusinessException e) {
@@ -286,7 +290,8 @@ public class MaterialServiceImpl implements MaterialService {
         if (StringUtils.isBlank(materialProperty.getDescription())) {
             errorMessage.append("描述").append("为空,");
         }
-        if (StringUtils.isBlank(materialProperty.getSkuName())){
+        //603版 已作废
+        /*if (StringUtils.isBlank(materialProperty.getSkuName())){
             errorMessage.append("SKU名称").append("为空,");
         }else {
             //查询SKU是否存在
@@ -300,7 +305,7 @@ public class MaterialServiceImpl implements MaterialService {
                 errorMessage.append("该SKU").append("不存在");
             }
             returnMap.put("baseSku",baseSku);
-        }
+        }*/
         returnMap.put("errorMessage",errorMessage.toString());
         return returnMap;
     }

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

@@ -9,7 +9,8 @@
         <result column="MATERIAL_NAME" property="materialName" />
         <result column="MATERIAL_TYPE" property="materialType" />
         <result column="DESCRIPTION" property="description" />
-        <result column="sku_id" property="skuId" />
+        <!--603版 已作废-->
+        <!--<result column="sku_id" property="skuId" />-->
         <result column="VALID" property="valid" />
         <result column="CREATE_TIME" property="createTime" />
         <result column="CREATE_BY" property="createBy" />
@@ -20,16 +21,15 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, MATERIAL_CODE, MATERIAL_NAME, MATERIAL_TYPE, DESCRIPTION, sku_id, VALID, CREATE_TIME, CREATE_BY, UPDATE_TIME, UPDATE_BY, IS_DELETE
+        ID, MATERIAL_CODE, MATERIAL_NAME, MATERIAL_TYPE, DESCRIPTION, VALID, CREATE_TIME, CREATE_BY, UPDATE_TIME, UPDATE_BY, IS_DELETE
     </sql>
 
     <select id="listMaterial" resultType="com.abi.qms.platform.dao.vo.result.MaterialVO">
         select
         m.id, m.material_code, m.material_name, m.material_type, m.description,
-        m.valid,m.create_time,m.update_time,bs.sku_name
+        m.valid,m.create_time,m.update_time
 
         from base_material m
-        left join base_sku bs on m.sku_id = bs.id
 
         <where>
             <if test="req.materialCode!=null and req.materialCode!=''">
@@ -41,9 +41,6 @@
             <if test="req.materialType!=null">
                 and m.material_type = #{req.materialType}
             </if>
-            <if test="req.skuName != null and req.skuName != ''">
-                AND bs.sku_name LIKE CONCAT('%',#{req.skuName},'%')
-            </if>
             <if test="req.valid!=null">
                 and m.valid = #{req.valid}
             </if>