物料添加字段：是否二维码、活动id

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

@@ -35,9 +35,8 @@ public class BaseMaterial {
 	@Schema(name = "物料类型: 1-瓶子 2-PET 3-罐子 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘")
     private Integer materialType;
 
-	//603版 已作废
-    /*@Schema(name = "商品ID（即base_sku表的主键id）")
-	private Long skuId;*/
+    @Schema(name = "活动ID")
+    private Long activeId;
 
 	@Schema(name = "描述")
     private String description;
@@ -45,6 +44,9 @@ public class BaseMaterial {
 	@Schema(name = "是否有效 0-无效 1-有效")
     private Integer valid;
 
+    @Schema(name = "是否有二维码 0-没有 1-有")
+    private Integer hasQr;
+
 	@Schema(name = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;

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

@@ -39,9 +39,13 @@ public class MaterialVO {
     @Schema(name = "修改时间")
     private LocalDateTime updateTime;
 
-    //603版 已作废
-    /*@Schema(name = "SKU名称")
-    private String skuName;*/
+    @Schema(name = "活动id")
+    private Long activeId;
 
+    @Schema(name = "活动名称")
+    private String activeName;
+
+    @Schema(name = "是否有二维码 0-没有 1-有")
+    private Integer hasQr;
 
 }

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

@@ -30,9 +30,10 @@ public class AddMaterialReq implements Serializable {
     @Schema(name = "描述")
     private String description;
 
-    //603版 已作废
-    /*@NotNull
-    @Schema(name = "SKU商品Id")
-    private Long skuId;*/
+    @Schema(name = "活动ID")
+    private Long activeId;
+
+    @Schema(name = "是否有二维码 0-没有 1-有")
+    private Integer hasQr;
 
 }

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

@@ -30,8 +30,10 @@ public class UpdateMaterialReq implements Serializable {
     @Schema(name = "是否有效 0-无效 1-有效")
     private Integer valid;
 
-    //603版 已作废
-    /*@Schema(name = "SKU商品Id")
-    private Long skuId;*/
+    @Schema(name = "活动ID")
+    private Long activeId;
+
+    @Schema(name = "是否有二维码 0-没有 1-有")
+    private Integer hasQr;
 
 }

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

@@ -35,9 +35,11 @@ public class GetMaterialRes implements Serializable {
     @Schema(name = "是否有效 0-无效 1-有效")
     private Integer valid;
 
-    //603版 已作废
-    /*@Schema(name = "SKU商品Id")
-    private Long skuId;*/
+    @Schema(name = "活动ID")
+    private Long activeId;
+
+    @Schema(name = "是否有二维码 0-没有 1-有")
+    private Integer hasQr;
 
     @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,9 +61,14 @@ public class ListMaterialRes extends PageResp implements Serializable {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime updateTime;
 
-        //603版 已作废
-        /*@Schema(name = "SKU商品名称")
-        private String skuName;*/
+        @Schema(name = "活动id")
+        private Long activeId;
+
+        @Schema(name = "活动名称")
+        private String activeName;
+
+        @Schema(name = "是否有二维码 0-没有 1-有")
+        private Integer hasQr;
 
     }
 }

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

@@ -75,8 +75,8 @@ public class MaterialServiceImpl implements MaterialService {
         material.setMaterialName(req.getMaterialName());
         material.setMaterialType(req.getMaterialType());
         material.setDescription(req.getDescription());
-        //603版 已作废
-        //material.setSkuId(req.getSkuId());
+        material.setActiveId(req.getActiveId());
+        material.setHasQr(req.getHasQr());
         baseMaterialMapper.insert(material);
 
     }
@@ -109,8 +109,8 @@ public class MaterialServiceImpl implements MaterialService {
         material.setMaterialType(req.getMaterialType());
         material.setDescription(req.getDescription());
         material.setValid(req.getValid());
-        //603版 已作废
-        //material.setSkuId(req.getSkuId());
+        material.setActiveId(req.getActiveId());
+        material.setHasQr(req.getHasQr());
         baseMaterialMapper.updateById(material);
 
     }
@@ -151,14 +151,8 @@ public class MaterialServiceImpl implements MaterialService {
         GetMaterialRes res = PojoConverterUtils.copy(material, GetMaterialRes.class);
 
         return res;
-
     }
 
-
-
-
-
-
     /**
      * 物料启用
      */
@@ -212,6 +206,7 @@ public class MaterialServiceImpl implements MaterialService {
     public ListMaterialForSelectRes listMaterialForSelect(ListMaterialForSelectReq req) {
         //1-查询所有有效的物料
         QueryWrapper<BaseMaterial> materialQw = new QueryWrapper<>();
+        materialQw.eq("has_qr",1);
         materialQw.eq("valid",1);
         materialQw.eq("is_delete",0);
         List<BaseMaterial> baseMaterialList = baseMaterialMapper.selectList(materialQw);
@@ -290,22 +285,7 @@ public class MaterialServiceImpl implements MaterialService {
         if (StringUtils.isBlank(materialProperty.getDescription())) {
             errorMessage.append("描述").append("为空,");
         }
-        //603版 已作废
-        /*if (StringUtils.isBlank(materialProperty.getSkuName())){
-            errorMessage.append("SKU名称").append("为空,");
-        }else {
-            //查询SKU是否存在
-            QueryWrapper<BaseSku> skuQw = new QueryWrapper<>();
-            skuQw.eq("sku_name",materialProperty.getSkuName());
-            skuQw.eq("valid",1);
-            skuQw.eq("is_delete",0);
-            BaseSku baseSku = baseSkuMapper.selectOne(skuQw);
-            //SKU不存在
-            if (null == baseSku){
-                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

@@ -4,32 +4,34 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.BaseMaterial">
-        <id column="ID" property="id" />
-        <result column="MATERIAL_CODE" property="materialCode" />
-        <result column="MATERIAL_NAME" property="materialName" />
-        <result column="MATERIAL_TYPE" property="materialType" />
-        <result column="DESCRIPTION" property="description" />
-        <!--603版 已作废-->
-        <!--<result column="sku_id" property="skuId" />-->
-        <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" />
+        <id column="id" property="id" />
+        <result column="material_code" property="materialCode" />
+        <result column="material_name" property="materialName" />
+        <result column="material_type" property="materialType" />
+        <result column="description" property="description" />
+        <result column="active_id" property="activeId" />
+        <result column="has_qr" property="hasQr" />
+        <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, MATERIAL_CODE, MATERIAL_NAME, MATERIAL_TYPE, DESCRIPTION, VALID, CREATE_TIME, CREATE_BY, UPDATE_TIME, UPDATE_BY, IS_DELETE
+        id, material_code, material_name, material_type, description, active_id, 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
+            m.id, m.material_code, m.material_name, m.material_type, m.description,m.has_qr,
+            m.active_id,a.active_name,
+            m.valid,m.create_time,m.update_time
 
         from base_material m
+            left join base_active a on m.active_id=a.id
 
         <where>
             <if test="req.materialCode!=null and req.materialCode!=''">