From 9215741984f35eb0f5d82a8f5dc54cb7b8a45bf8 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Thu, 22 Aug 2024 09:03:51 +0800
Subject: [PATCH] goods

---
 .../yxt/goods/biz/goodssku/GoodsSkuMapper.xml | 19 ++++++++++------
 .../biz/goodssku/GoodsSkuSelectQuery.java     |  2 ++
 .../goods/biz/goodssku/GoodsSkuService.java   |  5 +++++
 .../yxt/goods/biz/goodssku/SkuSelectList.java | 22 ++++++++++++++++---
 4 files changed, 38 insertions(+), 10 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 0da3a36..08a5eae 100644
--- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml
@@ -36,15 +36,20 @@
     </select>
 
     <select id="getSelectList" resultType="com.yxt.goods.biz.goodssku.SkuSelectList">
-        select sku.sid       goodsSkuSid,
-               spu.sid   as  goodsSpuSid,
-               spu.goodsName goodsSpuName,
-               sku.goodsSkuCode,
-               sku.title as  goodsSkuTitle,
-               spu.goodsUnitSid,
-               spu.goodsUnitName
+        select
+        sku.sid goodsSkuSid,
+        spu.sid AS goodsSpuSid,
+        spu.goodsName goodsSpuName,
+        sku.goodsSkuCode,
+        sku.title AS goodsSkuTitle,
+        spu.goodsUnitSid,
+        spu.goodsUnitName,
+        ex.costPrice,
+        spu.shelfLife,
+        sku.own_spec as ownSpec
         from goods_sku sku
                  left join goods_spu spu on spu.sid = sku.goodsSpuSid
+        LEFT JOIN goods_sku_extend ex ON ex.goodsSkuSid = sku.sid
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuSelectQuery.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuSelectQuery.java
index d71a5b2..3a624cb 100644
--- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuSelectQuery.java
+++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuSelectQuery.java
@@ -12,4 +12,6 @@ import lombok.Data;
 public class GoodsSkuSelectQuery implements Query {
 
     private String goodsSkuCode;
+    private String goodsSpuName;
+    private String createOrgSid;
 }
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 65e47a2..6446712 100644
--- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java
+++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java
@@ -208,7 +208,12 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
             if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
                 qw.like("sku.goodsSkuCode", query.getGoodsSkuCode());
             }
+            if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
+                qw.like("spu.goodsName", query.getGoodsSpuName());
+            }
+            qw.eq("spu.createOrgSid",query.getCreateOrgSid());
         }
+
         IPage<GoodsSku> page = PagerUtil.queryToPage(pagerQuery);
         IPage<SkuSelectList> pagging = baseMapper.getSelectList(page, qw);
         PagerVo<SkuSelectList> p = PagerUtil.pageToVo(pagging, null);
diff --git a/src/main/java/com/yxt/goods/biz/goodssku/SkuSelectList.java b/src/main/java/com/yxt/goods/biz/goodssku/SkuSelectList.java
index 9a07717..d30f006 100644
--- a/src/main/java/com/yxt/goods/biz/goodssku/SkuSelectList.java
+++ b/src/main/java/com/yxt/goods/biz/goodssku/SkuSelectList.java
@@ -2,6 +2,8 @@ package com.yxt.goods.biz.goodssku;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -15,13 +17,27 @@ public class SkuSelectList {
     private String goodsSpuName;
     //商品sid
     private String goodsSkuSid;
+    //
+    private String goodsSkuTitle;
     //商品编码
     private String goodsSkuCode;
+    //条码
+    private String barCode;
     //规格/型号
-    private String goodsSkuTitle;
+    private String ownSpec;
+
     //计量单位
-    private String goodsUnitSid;
-    private String goodsUnitName;
+    private String goodsUnitSid;//
+    private String goodsUnitName;//单位
+    private BigDecimal costPrice=new BigDecimal(0);//单价
+    private BigDecimal totalPrice=new BigDecimal(0);//总金额
+    private String remarks;//备注
+    private Integer count=0;//数量
+    private String serialNumber;//序列号
+    private String batch;//批次
+    private String warehouseRackSid;//
+    private String warehouseRackName;//库位
+    private String shelfLife;//保质期 天数
     //仓库名称
     //货位
     //单位成本（进货价）