From 1549f46fcd943f026d5e3484c75dbbbc8ac0d260 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Thu, 9 Jan 2025 08:40:02 +0800
Subject: [PATCH] 01-09

---
 .../yxt/goods/biz/goodssku/GoodsSkuMapper.xml | 48 +++++++++++++++++--
 .../goods/biz/goodssku/GoodsSkuService.java   |  1 +
 .../yxt/goods/biz/goodsspu/GoodsSpuQuery.java |  1 +
 .../goods/biz/goodsspu/GoodsSpuService.java   |  6 ++-
 4 files changed, 52 insertions(+), 4 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 26cb722..df1afdf 100644
--- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml
@@ -90,13 +90,10 @@
             ${ew.sqlSegment}
         </where>
     </select>
-
     <select id="purGoodsListPage" resultType="com.yxt.goods.biz.goodssku.GoodsSkuPurSelectList">
         SELECT
         s.sid,
         s.goodsSkuCode,
-        s.title AS goodsName,
-        a.barCode,
         s.own_spec AS goodsSkuOwnSpec,
         a.goodsUnitName as unit,
         e.tagPrice,
@@ -136,6 +133,51 @@
             ${ew.sqlSegment}
         </where>
     </select>
+<!--    <select id="purGoodsListPage" resultType="com.yxt.goods.biz.goodssku.GoodsSkuPurSelectList">-->
+<!--        SELECT-->
+<!--        s.sid,-->
+<!--        s.goodsSkuCode,-->
+<!--        s.title AS goodsName,-->
+<!--        a.barCode,-->
+<!--        s.own_spec AS goodsSkuOwnSpec,-->
+<!--        a.goodsUnitName as unit,-->
+<!--        e.tagPrice,-->
+<!--        e.salesPrice as cost,-->
+<!--        e.salesPrice as cost1,-->
+<!--        a.shelfLife,-->
+<!--        a.taxRate,-->
+<!--        a.factoryCode as itemNumber,-->
+<!--        a.sid AS goodsSpuSid,-->
+<!--        a.goodsName goodsName,-->
+<!--        a.goodsCode goodsCode,-->
+<!--        a.barCode barCode,-->
+<!--        s.sid goodsSkuSid,-->
+<!--        s.goodsSkuCode,-->
+<!--        s.title AS title,-->
+<!--        s.own_spec as ownSpec,-->
+<!--        d.sid as typeSid,-->
+<!--        d.goodsTypeName as typeName,-->
+<!--        b.sid as brandSid,-->
+<!--        b.brandName,-->
+<!--        c.manufacturerName,-->
+<!--        c.sid as manufacturerSid,-->
+<!--        a.factoryCode,-->
+<!--        a.goodsUnitSid as unitSid,-->
+<!--        a.goodsUnitName as unit,-->
+<!--        e.salesPrice-->
+<!--        FROM-->
+<!--        goods_sku s-->
+<!--        LEFT JOIN goods_spu a-->
+<!--        ON a.sid = s.goodsSpuSid-->
+<!--        LEFT JOIN goods_sku_extend e-->
+<!--        ON s.sid = e.goodsSkuSid-->
+<!--        left join goods_brand_info b on b.sid=a.brandSid-->
+<!--        left join goods_manufacturer c on c.sid = a.manufacturerSid-->
+<!--        left join goods_type d on d.sid =a.goodsTypeSid-->
+<!--        <where>-->
+<!--            ${ew.sqlSegment}-->
+<!--        </where>-->
+<!--    </select>-->
     <select id="getGoodsList" resultType="com.yxt.goods.biz.goodssku.GoodsSkuDetailVo">
         SELECT
         *,e.packUnit as sPackUnit,e.packPrice as sPackPrice,e.quantityOfPackage as sQuantityOfPackage,e.packageSpecs  as sPackageSpecs,s.sid as skuSid ,a.sid as spuSid
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 204b7ad..865604d 100644
--- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java
+++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java
@@ -374,6 +374,7 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
             qw.like("a.factoryCode", query.getManufacturerCode());
         }
         qw.eq("a.isEnable","1");
+        qw.eq("a.isDelete","0");
         IPage<GoodsSku> page = PagerUtil.queryToPage(pq);
         IPage<GoodsSkuPurSelectList> pagging = baseMapper.purGoodsListPage(page, qw);
         PagerVo<GoodsSkuPurSelectList> p = PagerUtil.pageToVo(pagging, null);
diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java
index d403a51..b71595e 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java
@@ -41,4 +41,5 @@ public class GoodsSpuQuery implements Query {
     private int index;
     private String brandSid;
     private String typeSid;
+    private String state;
 }
diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
index 69c831d..0522950 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
@@ -157,6 +157,10 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
         if(StringUtils.isNotBlank(query.getTypeSid())){
             qw.eq("goodsTypeSid",query.getTypeSid());
         }
+        if(StringUtils.isNotBlank(query.getState())){
+            qw.eq("isEnable",query.getState());
+        }
+        qw.eq("createOrgSid",query.getOrgPath());
         List<GoodsSpuVo> vos=baseMapper.listAllByQuery(qw);
         return rb.success().setData(vos);
     }
@@ -166,7 +170,7 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
         String sid = "";
         GoodsSpu spun = baseMapper.selectOne(new QueryWrapper<GoodsSpu>().eq("sid", dto.getSid()));
         GoodsUnit goodsUnit = goodsUnitService.getOne(new QueryWrapper<GoodsUnit>().eq("sid", dto.getGoodsUnitSid()));
-        GoodsSpu spu1 = baseMapper.selectOne(new QueryWrapper<GoodsSpu>().eq("goodsCode", dto.getGoodsCode()));
+        GoodsSpu spu1 = baseMapper.selectOne(new QueryWrapper<GoodsSpu>().eq("goodsCode", dto.getGoodsCode()).eq("isDelete","0"));
         if (null != goodsUnit) {
             dto.setGoodsUnitName(goodsUnit.getUnitName());
         }