采购单选择商品接口开发

src/main/java/com/yxt/goods/apiadmin/GoodsSkuRest.java

@@ -72,7 +72,7 @@ public class GoodsSkuRest {
         return rb.success().setData(pv);
     }
 
-    @ApiOperation("采购商品分页列表")
+    @ApiOperation("采购单选择商品")
     @PostMapping("/purGoodsListPage")
     public ResultBean<PagerVo<GoodsSkuPurSelectList>> purGoodsListPage(@RequestBody PagerQuery<GoodsSkuPurSelectQuery> pq) {
         return goodsSkuService.purGoodsListPage(pq);

src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml

@@ -44,15 +44,9 @@
         SELECT
         s.sid,
         s.goodsSkuCode,
-        s.title,
-        s.own_spec AS ownSpec,
         a.goodsName,
-        a.goodsPY,
+        a.barCode,
-        a.goodsShortName,
+        s.own_spec AS goodsSkuOwnSpec
-        a.goodsTypeSid,
-        a.brandSid,
-        a.manufacturerSid,
-        a.goodsUnitName
         FROM
         goods_sku s
         LEFT JOIN goods_spu a

src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectList.java

@@ -12,24 +12,12 @@ public class GoodsSkuPurSelectList {
 
     //sid
     private String sid;
-    //零件号
+    //商品编码
     private String goodsSkuCode;
-    //规格
-    private String title;
     //商品名称
     private String goodsName;
-    //商品拼音
+    //商品条码
-    private String goodsPY;
+    private String barCode;
-    //商品简称
+    //规格名称
-    private String goodsShortName;
+    private String goodsSkuOwnSpec;
-    //商品类别sid
-    private String goodsTypeSid;
-    //品牌sid
-    private String brandSid;
-    //厂家sid
-    private String manufacturerSid;
-    //商品单位名称
-    private String goodsUnitName;
-    //sku特有规格参数键值对
-    private String ownSpec;
 }

src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectQuery.java

@@ -11,20 +11,12 @@ import lombok.Data;
 @Data
 public class GoodsSkuPurSelectQuery implements Query {
 
-    //组织sid
+    //商品编码
-    private String orgSid;
+    private String goodsSkuCode;
     //商品名称
     private String goodsName;
-    //商品类别sid
+    //商品条码
-    private String goodsTypeSid;
+    private String barCode;
-    //商品拼音
+    //规格名称
-    private String goodsPY;
+    private String goodsSkuOwnSpec;
-    //品牌sid
-    private String brandSid;
-    //零件号
-    private String goodsSkuCode;
-    //规格
-    private String title;
-    //其他查询条件
-    private String otherQuery;
 }

src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java

@@ -200,29 +200,17 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
         ResultBean rb = ResultBean.fireFail();
         GoodsSkuPurSelectQuery query = pq.getParams();
         QueryWrapper<GoodsSku> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(query.getOrgSid())){
+        if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
-            qw.eq("s.createOrgSid",query.getOrgSid());
+            qw.eq("s.goodsSkuCode", query.getGoodsSkuCode());
         }
         if (StringUtils.isNotBlank(query.getGoodsName())) {
             qw.like("a.goodsName", query.getGoodsName());
         }
-        if (StringUtils.isNotBlank(query.getGoodsTypeSid())) {
+        if (StringUtils.isNotBlank(query.getBarCode())) {
-            qw.eq("a.goodsTypeSid", query.getGoodsTypeSid());
+            qw.like("a.barCode", query.getBarCode());
         }
-        if (StringUtils.isNotBlank(query.getGoodsPY())) {
+        if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) {
-            qw.like("a.goodsPY", query.getGoodsPY());
+            qw.like("s.own_spec", query.getGoodsSkuOwnSpec());
-        }
-        if (StringUtils.isNotBlank(query.getBrandSid())) {
-            qw.like("a.brandSid", query.getBrandSid());
-        }
-        if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
-            qw.like("s.goodsSkuCode", query.getGoodsSkuCode());
-        }
-        if (StringUtils.isNotBlank(query.getTitle())) {
-            qw.like("s.title", query.getTitle());
-        }
-        if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getOtherQuery())){
-            qw.and(wrapper -> wrapper.like("a.goodsName", query.getOtherQuery()).or().like("s.goodsSkuCode", query.getOtherQuery()).or().like("a.goodsPY",query.getOtherQuery()));
         }
         IPage<GoodsSku> page = PagerUtil.queryToPage(pq);
         IPage<GoodsSkuPurSelectList> pagging = baseMapper.purGoodsListPage(page, qw);