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 89cd150..b8afdbb 100644 --- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml @@ -70,6 +70,8 @@ ON a.sid = s.goodsSpuSid LEFT JOIN goods_sku_extend e ON s.sid = e.goodsSkuSid + LEFT JOIN ss_user.sys_organization o + ON a.useOrgSid = o.sid ${ew.sqlSegment} 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 d4e2e63..1a5f133 100644 --- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectQuery.java @@ -19,4 +19,6 @@ public class GoodsSkuPurSelectQuery implements Query { private String barCode; //规格名称 private String goodsSkuOwnSpec; + + private String orgPath; } 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 e3d430d..65a529b 100644 --- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java +++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java @@ -60,6 +60,7 @@ public class GoodsSkuService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } + public ResultBean> listAllByOrg(OrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); List pagging = baseMapper.listAllByOrg(query.getOrgPath()); @@ -88,11 +89,12 @@ public class GoodsSkuService extends MybatisBaseService skuBatchSave(List dtos) { ResultBean rb = ResultBean.fireFail(); List skus = new ArrayList<>(); - List dtos1=new ArrayList<>(); + List dtos1 = new ArrayList<>(); for (GoodsSpuDto dto : dtos) { for (GoodsSkuDto baseGoodsSkus : dto.getBaseGoodsSkus()) { GoodsSku sku = new GoodsSku(); @@ -106,13 +108,14 @@ public class GoodsSkuService extends MybatisBaseService saveOrUpdate(List dtos) { ResultBean rb = ResultBean.fireFail(); for (GoodsSkuDto dto : dtos) { - GoodsSku sku=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); + GoodsSku sku = baseMapper.selectOne(new QueryWrapper().eq("sid", dto.getSid())); String sid = ""; - if (null!=sku) { + if (null != sku) { sid = dto.getSid(); GoodsSku wmsGoods = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsGoods); @@ -136,8 +139,8 @@ public class GoodsSkuService extends MybatisBaseService initialization(String sid) { ResultBean rb = ResultBean.fireFail(); GoodsSkuVo vo = baseMapper.getSkuBySid(sid); - GoodsSkuExtendVo vo1= goodsSkuExtendService.getExtendBySkuSid(vo.getSid()).getData(); - if(vo1==null){ + GoodsSkuExtendVo vo1 = goodsSkuExtendService.getExtendBySkuSid(vo.getSid()).getData(); + if (vo1 == null) { vo.setBaseGoodsSkuExtend(new GoodsSkuExtendVo()); } vo.setBaseGoodsSkuExtend(vo1); @@ -207,6 +210,7 @@ public class GoodsSkuService extends MybatisBaseService qw = new QueryWrapper<>(); + qw.like("o.orgSidPath", query.getOrgPath()); if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { qw.eq("s.goodsSkuCode", query.getGoodsSkuCode()); }