diff --git a/src/main/java/com/yxt/goods/apiadmin/GoodsSkuRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsSkuRest.java index fa80cf0..5589d33 100644 --- a/src/main/java/com/yxt/goods/apiadmin/GoodsSkuRest.java +++ b/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> purGoodsListPage(@RequestBody PagerQuery pq) { return goodsSkuService.purGoodsListPage(pq); diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml index 8dc785e..820dcf7 100644 --- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml +++ b/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.goodsShortName, - a.goodsTypeSid, - a.brandSid, - a.manufacturerSid, - a.goodsUnitName + a.barCode, + s.own_spec AS goodsSkuOwnSpec FROM goods_sku s LEFT JOIN goods_spu a diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectList.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectList.java index cd72550..2cf4c98 100644 --- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectList.java +++ b/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 goodsShortName; - //商品类别sid - private String goodsTypeSid; - //品牌sid - private String brandSid; - //厂家sid - private String manufacturerSid; - //商品单位名称 - private String goodsUnitName; - //sku特有规格参数键值对 - private String ownSpec; + //商品条码 + private String barCode; + //规格名称 + private String goodsSkuOwnSpec; } diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectQuery.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectQuery.java index e06fc15..d4e2e63 100644 --- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectQuery.java +++ b/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 goodsPY; - //品牌sid - private String brandSid; - //零件号 - private String goodsSkuCode; - //规格 - private String title; - //其他查询条件 - private String otherQuery; + //商品条码 + private String barCode; + //规格名称 + private String goodsSkuOwnSpec; } diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java index 5b0f352..0c7cb95 100644 --- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java +++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java @@ -200,29 +200,17 @@ public class GoodsSkuService extends MybatisBaseService qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getOrgSid())){ - qw.eq("s.createOrgSid",query.getOrgSid()); + if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { + qw.eq("s.goodsSkuCode", query.getGoodsSkuCode()); } if (StringUtils.isNotBlank(query.getGoodsName())) { qw.like("a.goodsName", query.getGoodsName()); } - if (StringUtils.isNotBlank(query.getGoodsTypeSid())) { - qw.eq("a.goodsTypeSid", query.getGoodsTypeSid()); - } - if (StringUtils.isNotBlank(query.getGoodsPY())) { - qw.like("a.goodsPY", query.getGoodsPY()); - } - 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 (StringUtils.isNotBlank(query.getBarCode())) { + qw.like("a.barCode", query.getBarCode()); } - 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())); + if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) { + qw.like("s.own_spec", query.getGoodsSkuOwnSpec()); } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.purGoodsListPage(page, qw);