Przeglądaj źródła

商品管理SKU 603版 作废

v_KaixiangGuo 3 lat temu
rodzic
commit
68fdf4b870
18 zmienionych plików z 80 dodań i 68 usunięć
  1. 3 2
      abi-cloud-qr-platform-common/src/main/java/com/abi/task/common/excel/preperties/SkuProperty.java
  2. 4 4
      abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/SkuController.java
  3. 3 3
      abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/BaseSku.java
  4. 3 3
      abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/BaseSkuMapper.java
  5. 3 2
      abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/BaseSkuVO.java
  6. 3 2
      abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/AddSkuReq.java
  7. 3 2
      abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/DisableSkuReq.java
  8. 3 2
      abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/EnableSkuReq.java
  9. 3 2
      abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/GetSkuReq.java
  10. 1 0
      abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListSkuForSelectReq.java
  11. 3 2
      abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListSkuReq.java
  12. 3 2
      abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/UpdateSkuReq.java
  13. 3 2
      abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/GetSkuRes.java
  14. 5 4
      abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListSkuForSelectRes.java
  15. 5 4
      abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListSkuRes.java
  16. 9 9
      abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/SkuService.java
  17. 19 19
      abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/SkuServiceImpl.java
  18. 4 4
      abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BaseSkuMapper.xml

+ 3 - 2
abi-cloud-qr-platform-common/src/main/java/com/abi/task/common/excel/preperties/SkuProperty.java

@@ -8,17 +8,18 @@ import lombok.Data;
 /**
  * SKU模板
  * @author Andy.Tan
+ * 603版 已作废
  */
 @Data
 public class SkuProperty implements AbstractExcelProperty {
 
-    @ExcelHeadAlias(value = "商品编号(即页面上手输的skuid)(必填)")
+    /*@ExcelHeadAlias(value = "商品编号(即页面上手输的skuid)(必填)")
     private String skuCode;
 
     @ExcelHeadAlias(value = "sku名称(必填)")
     private String skuName;
 
     @ExcelHeadAlias(value = "子品牌名称(必填)")
-    private String subBrandName;
+    private String subBrandName;*/
 
 }

+ 4 - 4
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/SkuController.java

@@ -24,16 +24,16 @@ import java.util.List;
  * <p>
  * 商品管理
  * </p>
- *
+ * 603版 已作废
  * @author Andy.Tan
  */
 @Slf4j
 @RestController
 @RequestMapping("sku")
-@Api(tags = "商品管理")
+@Api(tags = "商品管理 603版 已作废")
 public class SkuController {
 
-    @Autowired
+    /*@Autowired
     private SkuService skuService;
 
 
@@ -115,7 +115,7 @@ public class SkuController {
         ExcelImportRes result = skuService.skulExcelImport(skuPropertyList);
         //包装出参
         return BaseResponse.create(result);
-    }
+    }*/
 
 }
 

+ 3 - 3
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/BaseSku.java

@@ -14,7 +14,7 @@ import java.time.LocalDateTime;
  * <p>
  * sku表
  * </p>
- *
+ * 603版 已作废
  * @author Andy.Tan
  */
 @Data
@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
 @Schema(name="sku表对象", description="sku表")
 public class BaseSku {
 
-	@Schema(name = "id")
+	/*@Schema(name = "id")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
@@ -56,7 +56,7 @@ public class BaseSku {
     private Long updateBy;
 
 	@Schema(name = "是否删除")
-    private Integer isDelete;
+    private Integer isDelete;*/
 
 
 

+ 3 - 3
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/BaseSkuMapper.java

@@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Param;
  * <p>
  * sku表 Mapper 接口
  * </p>
- *
+ * 商品管理 603版 已作废
  * @author Andy.Tan
  */
 public interface BaseSkuMapper extends BaseMapper<BaseSku> {
@@ -19,7 +19,7 @@ public interface BaseSkuMapper extends BaseMapper<BaseSku> {
     /**
      * 分页查询商品信息
      */
-    IPage<BaseSkuVO> listSku(IPage page, @Param(value = "param") ListSkuReq param);
+    //IPage<BaseSkuVO> listSku(IPage page, @Param(value = "param") ListSkuReq param);
 
     /**
      * 根据ID查询详情信息
@@ -27,6 +27,6 @@ public interface BaseSkuMapper extends BaseMapper<BaseSku> {
      * @param id
      * @return
      */
-    BaseSkuVO selectSkuById(@Param("id") Long id);
+    //BaseSkuVO selectSkuById(@Param("id") Long id);
 
 }

+ 3 - 2
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/BaseSkuVO.java

@@ -9,12 +9,13 @@ import java.time.LocalDateTime;
 /**
  * SKU商品查询出参
  * @author KaiXiangGuo
+ * 603版 已作废
  */
 @Data
 @ApiModel
 public class BaseSkuVO {
 
-    @ApiModelProperty(value = "id")
+    /*@ApiModelProperty(value = "id")
     private Long id;
 
 	@ApiModelProperty(value = "商品编号")
@@ -42,7 +43,7 @@ public class BaseSkuVO {
     private LocalDateTime createTime;
 
 	@ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
+    private LocalDateTime updateTime;*/
 
 
 }

+ 3 - 2
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/AddSkuReq.java

@@ -7,12 +7,13 @@ import java.io.Serializable;
 /**
  * @author:Andy.Tan
  * @Description: 新增商品入参
+ *  603版 已作废
  */
 @Data
 @Schema
 public class AddSkuReq implements Serializable {
 
-    @Schema(name = "商品编号(即页面上手输的skuid)")
+    /*@Schema(name = "商品编号(即页面上手输的skuid)")
     private String skuCode;
 
     @Schema(name = "sku名称")
@@ -22,7 +23,7 @@ public class AddSkuReq implements Serializable {
     private String brandCode;
 
     @Schema(name = "子品牌code")
-    private String subBrandCode;
+    private String subBrandCode;*/
 
 
 }

+ 3 - 2
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/DisableSkuReq.java

@@ -9,13 +9,14 @@ import java.util.List;
 /**
  * @author:Andy.Tan
  * @Description: 商品入参
+ * 603版 已作废
  */
 @Data
 @Schema
 public class DisableSkuReq implements Serializable {
 
-    @NotNull(message = "ID为空")
+    /*@NotNull(message = "ID为空")
     @Schema(name = "ids")
-    private List<Long> ids;
+    private List<Long> ids;*/
 
 }

+ 3 - 2
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/EnableSkuReq.java

@@ -9,13 +9,14 @@ import java.util.List;
 /**
  * @author:Andy.Tan
  * @Description: 商品入参
+ * 603版 已作废
  */
 @Data
 @Schema
 public class EnableSkuReq implements Serializable {
 
-    @NotNull(message = "ID为空")
+    /*@NotNull(message = "ID为空")
     @Schema(name = "ids")
-    private List<Long> ids;
+    private List<Long> ids;*/
 
 }

+ 3 - 2
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/GetSkuReq.java

@@ -9,13 +9,14 @@ import java.io.Serializable;
 /**
  * @author:Andy.Tan
  * @Description: 查询商品明细入参
+ * 603版 已作废
  */
 @Data
 @Schema
 public class GetSkuReq implements Serializable {
 
-    @NotNull(message = "ID为空")
+    /*@NotNull(message = "ID为空")
     @Schema(name = "id")
-    private Long id;
+    private Long id;*/
 
 }

+ 1 - 0
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListSkuForSelectReq.java

@@ -9,6 +9,7 @@ import java.io.Serializable;
 /**
  * @author:Andy.Tan
  * @Description: 下拉选择SKU列表入参
+ * 603版 已作废
  */
 @Data
 @Schema

+ 3 - 2
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListSkuReq.java

@@ -8,17 +8,18 @@ import java.io.Serializable;
 /**
  * @author:Andy.Tan
  * @Description: 分页查询商品入参
+ * 603版 已作废
  */
 @Data
 @Schema
 public class ListSkuReq extends PageReq implements Serializable {
 
-    @Schema(name = "sku名称")
+    /*@Schema(name = "sku名称")
     private String skuName;
 
     @Schema(name = "品牌code")
     private String brandCode;
 
     @Schema(name = "是否有效 0-无效 1-有效")
-    private Integer valid;
+    private Integer valid;*/
 }

+ 3 - 2
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/UpdateSkuReq.java

@@ -7,12 +7,13 @@ import java.io.Serializable;
 /**
  * @author:Andy.Tan
  * @Description: 编辑商品入参
+ * 603版 已作废
  */
 @Data
 @Schema
 public class UpdateSkuReq implements Serializable {
 
-    @Schema(name = "id")
+   /* @Schema(name = "id")
     private Long id;
 
     @Schema(name = "商品编号(即页面上手输的skuid)")
@@ -25,7 +26,7 @@ public class UpdateSkuReq implements Serializable {
     private String brandCode;
 
     @Schema(name = "子品牌code")
-    private String subBrandCode;
+    private String subBrandCode;*/
 
 
 }

+ 3 - 2
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/GetSkuRes.java

@@ -14,12 +14,13 @@ import java.time.LocalDateTime;
 /**
  * @author:Andy.Tan
  * @Description: 查询商品明细出参
+ * 603版 已作废
  */
 @Data
 @Schema
 public class GetSkuRes implements Serializable {
 
-    @Schema(name = "id")
+    /*@Schema(name = "id")
     private Long id;
 
     @Schema(name = "商品编号(即页面上手输的skuid)")
@@ -40,6 +41,6 @@ public class GetSkuRes implements Serializable {
 
     @Schema(name = "修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
+    private LocalDateTime updateTime;*/
 
 }

+ 5 - 4
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListSkuForSelectRes.java

@@ -16,17 +16,18 @@ import java.util.List;
 /**
  * @author:Andy.Tan
  * @Description: 分页查询商品出参
+ * 603版 已作废
  */
 @Data
 @Schema
 public class ListSkuForSelectRes implements Serializable {
 
-    @Schema(name = "商品列表")
+    /*@Schema(name = "商品列表")
     private List<SkuBean> skuBeanList;
 
-    /**
+    *//**
      * 商品bean
-     */
+     *//*
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
@@ -40,5 +41,5 @@ public class ListSkuForSelectRes implements Serializable {
         @Schema(name = "sku名称")
         private String skuName;
 
-    }
+    }*/
 }

+ 5 - 4
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListSkuRes.java

@@ -16,17 +16,18 @@ import java.util.List;
 /**
  * @author:Andy.Tan
  * @Description: 分页查询商品出参
+ * 603版 已作废
  */
 @Data
 @Schema
 public class ListSkuRes extends PageResp implements Serializable {
 
-    @Schema(name = "商品列表")
+    /*@Schema(name = "商品列表")
     private List<SkuBean> skuBeanList;
 
-    /**
+    *//**
      * 商品bean
-     */
+     *//*
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
@@ -60,5 +61,5 @@ public class ListSkuRes extends PageResp implements Serializable {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime updateTime;
 
-    }
+    }*/
 }

+ 9 - 9
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/SkuService.java

@@ -14,7 +14,7 @@ import java.util.List;
  * <p>
  * 商品管理
  * </p>
- *
+ * 603版 已作废
  * @author Andy.Tan
  */
 public interface SkuService{
@@ -25,39 +25,39 @@ public interface SkuService{
      * @param addSkuReq
      * @throws Exception
      */
-    void addSku(AddSkuReq addSkuReq);
+    //void addSku(AddSkuReq addSkuReq);
 
     /**
      * 编辑商品
      * @param updateSkuReq
      */
-    void updateSku(UpdateSkuReq updateSkuReq);
+    //void updateSku(UpdateSkuReq updateSkuReq);
 
     /**
      * 分页查询商品
      * @param listSkuReq
      * @return
      */
-    ListSkuRes listSku(ListSkuReq listSkuReq);
+    //ListSkuRes listSku(ListSkuReq listSkuReq);
 
     /**
      * 查询商品明细
      * @param getSkuReq
      * @return
      */
-    GetSkuRes getSku(GetSkuReq getSkuReq);
+    //GetSkuRes getSku(GetSkuReq getSkuReq);
 
     /**
      * 商品启用
      * @param enableSkuReq
      */
-    void enableSku(EnableSkuReq enableSkuReq);
+    //void enableSku(EnableSkuReq enableSkuReq);
 
     /**
      * 商品禁用
      * @param disableSkuReq
      */
-    void disableSku(DisableSkuReq disableSkuReq);
+    //void disableSku(DisableSkuReq disableSkuReq);
 
 
     /**
@@ -66,7 +66,7 @@ public interface SkuService{
      * @return
      * @throws Exception
      */
-    ListSkuForSelectRes listSkuForSelect(ListSkuForSelectReq listSkuForSelectReq) throws Exception;
+    //ListSkuForSelectRes listSkuForSelect(ListSkuForSelectReq listSkuForSelectReq) throws Exception;
 
     /**
      * 批量导入SKU
@@ -74,6 +74,6 @@ public interface SkuService{
      * @return
      * @throws Exception
      */
-    ExcelImportRes skulExcelImport(List<SkuProperty> skuPropertyList) throws Exception;
+    //ExcelImportRes skulExcelImport(List<SkuProperty> skuPropertyList) throws Exception;
 
 }

+ 19 - 19
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/SkuServiceImpl.java

@@ -36,13 +36,13 @@ import java.util.Map;
  * <p>
  * 商品
  * </p>
- *
+ * 603版 已作废
  * @author Andy.Tan
  */
 @Service
 public class SkuServiceImpl implements SkuService {
 
-    @Autowired
+    /*@Autowired
     private BaseSkuMapper baseSkuMapper;
 
     @Autowired
@@ -51,9 +51,9 @@ public class SkuServiceImpl implements SkuService {
     @Autowired
     private BaseMaterialMapper baseMaterialMapper;
 
-    /**
+    *//**
      * 新增商品
-     */
+     *//*
     @Override
     public void addSku(AddSkuReq req){
         //校验入参
@@ -83,9 +83,9 @@ public class SkuServiceImpl implements SkuService {
 
     }
 
-    /**
+    *//**
      * 编辑商品
-     */
+     *//*
     @Override
     public void updateSku(UpdateSkuReq req){
 
@@ -102,9 +102,9 @@ public class SkuServiceImpl implements SkuService {
 
     }
 
-    /**
+    *//**
      * 分页查询商品
-     */
+     *//*
     @Override
     public ListSkuRes listSku(ListSkuReq req){
 
@@ -122,9 +122,9 @@ public class SkuServiceImpl implements SkuService {
 
     }
 
-    /**
+    *//**
      * 查询商品明细
-     */
+     *//*
     @Override
     public GetSkuRes getSku(GetSkuReq req){
 
@@ -139,9 +139,9 @@ public class SkuServiceImpl implements SkuService {
 
     }
 
-    /**
+    *//**
      * 商品启用
-     */
+     *//*
     @Override
     public void enableSku(EnableSkuReq req){
         List<Long> ids = req.getIds();
@@ -162,9 +162,9 @@ public class SkuServiceImpl implements SkuService {
         }
     }
 
-    /**
+    *//**
      * 商品禁用
-     */
+     *//*
     @Override
     public void disableSku(DisableSkuReq req){
         List<Long> ids = req.getIds();
@@ -195,12 +195,12 @@ public class SkuServiceImpl implements SkuService {
         }
     }
 
-    /**
+    *//**
      * 其他页面下拉选择SKU
      * @param listSkuForSelectReq
      * @return
      * @throws Exception
-     */
+     *//*
     @Override
     public ListSkuForSelectRes listSkuForSelect(ListSkuForSelectReq listSkuForSelectReq) throws Exception {
         //1-查询所有有效的物料
@@ -217,12 +217,12 @@ public class SkuServiceImpl implements SkuService {
         return res;
     }
 
-    /**
+    *//**
      * 批量导入SKU
      * @param skuPropertiesList
      * @return
      * @throws Exception
-     */
+     *//*
     @Override
     public ExcelImportRes skulExcelImport(List<SkuProperty> skuPropertiesList) throws Exception {
         List<ExcelImportRes.FailBean> failList = new ArrayList<>();
@@ -283,6 +283,6 @@ public class SkuServiceImpl implements SkuService {
         }
         returnMap.put("errorMessage",errorMessage.toString());
         return returnMap;
-    }
+    }*/
 
 }

+ 4 - 4
abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BaseSkuMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!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.BaseSkuMapper">
-
-    <!-- 通用查询映射结果 -->
+    <!--603版 已作废-->
+    <!--&lt;!&ndash; 通用查询映射结果 &ndash;&gt;
     <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.BaseSku">
         <id column="id" property="id" />
         <result column="sku_code" property="skuCode" />
@@ -17,7 +17,7 @@
         <result column="is_delete" property="isDelete" />
     </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>
@@ -72,6 +72,6 @@
         LEFT JOIN base_brand bb on bs.brand_code = bb.brand_code
         LEFT JOIN base_brand bb1 on bs.sub_brand_code = bb1.brand_code
         where bs.id = #{id} and bs.is_delete = 0
-    </select>
+    </select>-->
 
 </mapper>