From 09883b4828053684ef8e24e6e573010104762a67 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 10 May 2024 11:05:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=95=86=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/basegoodssku/BaseGoodsSkuMapper.xml   |  8 +++++---
 .../base/basegoodssku/BaseGoodsSkuService.java | 14 ++++++++++----
 .../biz/base/basegoodssku/GoodsSkuQuery.java   | 14 ++++++++++----
 .../base/biz/base/basegoodssku/GoodsSkuVo.java | 18 +++++++++---------
 .../biz/base/basegoodsspu/BaseGoodsSpu.java    |  1 +
 5 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml
index a7cdb391f1..e49e783453 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml
@@ -62,10 +62,12 @@
 
     <select id="getGoodsListPage" resultType="com.yxt.base.biz.base.basegoodssku.GoodsSkuVo">
         select sku.sid       goodsSkuSid,
-               spu.sid   as  goodsSpuSid,
+               spu.sid as    goodsSpuSid,
                spu.goodsName goodsSpuName,
-               sku.title as  goodsSkuTitle,
-               sku.goodsSkuCode
+               sku.goodsSkuCode,
+               sku.indexes,
+               spu.goodsUnitName,
+               spu.manufacturerName
         from base_goods_sku sku
                  left join base_goods_spu spu on spu.sid = sku.goodsSpuSid
         <where>
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java
index 412583573a..f1389b7859 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java
@@ -218,11 +218,17 @@ public class BaseGoodsSkuService extends MybatisBaseService<BaseGoodsSkuMapper,
         GoodsSkuQuery query = pagerQuery.getParams();
         QueryWrapper<BaseGoodsSku> qw = new QueryWrapper<>();
         if (query != null) {
-            if (StringUtils.isNotBlank(query.getOrgSid())) {
-                qw.eq("spu.createOrgSid", query.getOrgSid());
+            //商品名称
+            if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
+                qw.like("spu.goodsName", query.getGoodsSpuName());
             }
-            if (StringUtils.isNotBlank(query.getGoodsSkuTitle())) {
-                qw.like("sku.title", query.getGoodsSkuTitle());
+            //商品编码
+            if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
+                qw.like("sku.goodsSkuCode", query.getGoodsSkuCode());
+            }
+            //厂家
+            if (StringUtils.isNotBlank(query.getManufacturerName())) {
+                qw.like("spu.manufacturerName", query.getManufacturerName());
             }
         }
         IPage<BaseGoodsSku> page = PagerUtil.queryToPage(pagerQuery);
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java
index 42456d1890..12a69c3865 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java
@@ -1,6 +1,7 @@
 package com.yxt.base.biz.base.basegoodssku;
 
 import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -11,8 +12,13 @@ import lombok.Data;
 @Data
 public class GoodsSkuQuery implements Query {
 
-    //组织sid
-    private String orgSid;
-    //商品名称
-    private String goodsSkuTitle;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("商品名称")
+    private String goodsSpuName;
+    @ApiModelProperty("商品编码")
+    private String goodsSkuCode;
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
+
 }
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuVo.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuVo.java
index ba28b435d9..9231698ab8 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuVo.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuVo.java
@@ -17,16 +17,16 @@ public class GoodsSkuVo {
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")
     private String goodsSkuSid;
-    @ApiModelProperty("商品Sku名称")
-    private String goodsSkuTitle;
-    @ApiModelProperty("商品sku编码")
+    @ApiModelProperty("商品编码")
     private String goodsSkuCode;
-    @ApiModelProperty("规格型号")
-    private String goodsSkuOwnSpec;
-    @ApiModelProperty("计量单位")
-    private String unit;
+    @ApiModelProperty("规格属性")
+    private String indexes;
+    @ApiModelProperty("单位")
+    private String goodsUnitName;
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
 
-    @ApiModelProperty("仓库sid")
+   /* @ApiModelProperty("仓库sid")
     private String warehouseSid;
     @ApiModelProperty("仓库名称")
     private String warehouseName;
@@ -46,5 +46,5 @@ public class GoodsSkuVo {
     @ApiModelProperty("金额")
     private String amount;
     @ApiModelProperty("有效天数")
-    private String shelfLife;
+    private String shelfLife;*/
 }
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java
index 3e5acaff13..ccac2973ec 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java
@@ -18,6 +18,7 @@ public class BaseGoodsSpu extends BaseEntity {
     private String goodsTypeSid;//商品分类sid
     private String brandSid;//品牌sid
     private String manufacturerSid;//厂家sid
+    private String manufacturerName;//厂家名称
     private String goodsUnitSid;//商品单位sid
     private String goodsUnitName;//商品单位名称
     private String taxRate;//税率