Merge remote-tracking branch 'origin/master'

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

@@ -54,7 +54,7 @@
         SELECT
         s.sid,
         s.goodsSkuCode,
-        a.goodsName,
+        s.title AS goodsName,
         a.barCode,
         s.own_spec AS goodsSkuOwnSpec,
         a.goodsUnitName as unit,
@@ -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
         <where>
             ${ew.sqlSegment}
         </where>

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;
 }

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

@@ -60,6 +60,7 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
         PagerVo<GoodsSkuVo> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(p);
     }
+
     public ResultBean<List<GoodsSkuVo>> listAllByOrg(OrgPathQuery query) {
         ResultBean rb = ResultBean.fireFail();
         List<GoodsSkuVo> pagging = baseMapper.listAllByOrg(query.getOrgPath());
@@ -88,11 +89,12 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
         }
         return rb.success().setMsg("成功");
     }
+
     @Transactional
     public ResultBean<String> skuBatchSave(List<GoodsSpuDto> dtos) {
         ResultBean rb = ResultBean.fireFail();
         List<GoodsSku> skus = new ArrayList<>();
-        List<GoodsSkuDto> dtos1=new ArrayList<>();
+        List<GoodsSkuDto> 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<GoodsSkuMapper, GoodsSku
         goodsSkuExtendService.skuEBatchSave(dtos1);
         return rb.success().setMsg("成功");
     }
+
     @Transactional
     public ResultBean<String> saveOrUpdate(List<GoodsSkuDto> dtos) {
         ResultBean rb = ResultBean.fireFail();
         for (GoodsSkuDto dto : dtos) {
-            GoodsSku sku=baseMapper.selectOne(new QueryWrapper<GoodsSku>().eq("sid",dto.getSid()));
+            GoodsSku sku = baseMapper.selectOne(new QueryWrapper<GoodsSku>().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<GoodsSkuMapper, GoodsSku
     public ResultBean<GoodsSkuVo> initialization(String sid) {
         ResultBean rb = ResultBean.fireFail();
         GoodsSkuVo vo = baseMapper.getSkuBySid(sid);
-        GoodsSkuExtendVo vo1= goodsSkuExtendService.getExtendBySkuSid(vo.getSid()).getData();
+        GoodsSkuExtendVo vo1 = goodsSkuExtendService.getExtendBySkuSid(vo.getSid()).getData();
-        if(vo1==null){
+        if (vo1 == null) {
             vo.setBaseGoodsSkuExtend(new GoodsSkuExtendVo());
         }
         vo.setBaseGoodsSkuExtend(vo1);
@@ -207,11 +210,12 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
         ResultBean rb = ResultBean.fireFail();
         GoodsSkuPurSelectQuery query = pq.getParams();
         QueryWrapper<GoodsSku> qw = new QueryWrapper<>();
+        qw.like("o.orgSidPath", query.getOrgPath());
         if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
             qw.eq("s.goodsSkuCode", query.getGoodsSkuCode());
         }
         if (StringUtils.isNotBlank(query.getGoodsName())) {
-            qw.like("a.goodsName", query.getGoodsName());
+            qw.like("s.title", query.getGoodsName());
         }
         if (StringUtils.isNotBlank(query.getBarCode())) {
             qw.like("a.barCode", query.getBarCode());