From 931ec31b279f2e46fd6063e63fb6b855a0d74f7e Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 29 Jul 2024 15:14:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=95=86=E5=93=81=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=BB=84=E7=BB=87=E6=9D=83=E9=99=90=20=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E9=A2=84=E7=BA=A6=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89=E5=91=98=E5=B7=A5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml  |  2 ++
 .../goods/biz/goodssku/GoodsSkuPurSelectQuery.java |  2 ++
 .../yxt/goods/biz/goodssku/GoodsSkuService.java    | 14 +++++++++-----
 3 files changed, 13 insertions(+), 5 deletions(-)

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
         <where>
             ${ew.sqlSegment}
         </where>
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<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();
-        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<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());
         }