From 9f97b4b6218529c4ed454ee68bf0b01640629ef9 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 25 Jul 2024 11:02:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=20=E9=87=87=E8=B4=AD=E5=AE=A1=E6=A0=B8=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=98=8E=E7=BB=86=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E5=AE=8C=E6=88=90=20=E9=87=87=E8=B4=AD=E5=8D=95?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=20=E6=93=8D=E4=BD=9C=E6=97=A5=E6=9C=9F=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=20=E9=87=87=E8=B4=AD=E5=8D=95=E5=AE=A1=E6=A0=B8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90=20=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/goods/biz/goodssku/GoodsSkuMapper.xml    | 11 ++++++++++-
 .../biz/goodssku/GoodsSkuPurSelectList.java      | 16 ++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

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 820dcf7..cbcb659 100644
--- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml
@@ -46,11 +46,20 @@
         s.goodsSkuCode,
         a.goodsName,
         a.barCode,
-        s.own_spec AS goodsSkuOwnSpec
+        s.own_spec AS goodsSkuOwnSpec,
+        a.goodsUnitName as unit,
+        '1' as count,
+        '1' as count1,
+        '1' as pcsNum,
+        e.tagPrice,
+        e.salesPrice as cost,
+        e.salesPrice as cost1
         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
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectList.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectList.java
index 2cf4c98..8b05412 100644
--- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectList.java
+++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectList.java
@@ -2,6 +2,8 @@ package com.yxt.goods.biz.goodssku;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -20,4 +22,18 @@ public class GoodsSkuPurSelectList {
     private String barCode;
     //规格名称
     private String goodsSkuOwnSpec;
+    //单位
+    private String unit;
+    //数量
+    private BigDecimal count;
+    //数量1
+    private BigDecimal count1;
+    //数量
+    private BigDecimal pcsNum;
+    //吊牌价
+    private BigDecimal tagPrice;
+    //单价
+    private BigDecimal cost;
+    //单价1
+    private BigDecimal cost1;
 }