From b9e0331f131bef9fa67d821131fab60645784a14 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Fri, 16 Aug 2024 00:38:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=92=8C=E5=87=BA=E5=BA=93=E6=98=8E=E7=BB=86=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=A2=9E=E5=8A=A0=E5=A4=9A=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsh/erp/datasource/vo/DepotHeadVo4InDetail.java    | 10 ++++++++++
 .../main/resources/mapper_xml/DepotHeadMapperEx.xml    |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java
index 4a25c7a1..01d9a866 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java
@@ -18,6 +18,8 @@ public class DepotHeadVo4InDetail {
 
     private BigDecimal unitPrice;
 
+    private String sku;
+
     private String mUnit;
 
     private String newRemark;
@@ -90,6 +92,14 @@ public class DepotHeadVo4InDetail {
         this.unitPrice = unitPrice;
     }
 
+    public String getSku() {
+        return sku;
+    }
+
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
+
     public String getmUnit() {
         return mUnit;
     }
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index c80c0ebc..1ed8a91e 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -19,6 +19,7 @@
         <result column="model" jdbcType="VARCHAR" property="model" />
         <result column="standard" jdbcType="VARCHAR" property="standard" />
         <result column="unitPrice" jdbcType="DECIMAL" property="unitPrice" />
+        <result column="sku" jdbcType="VARCHAR" property="sku" />
         <result column="operNumber" jdbcType="DECIMAL" property="operNumber" />
         <result column="allPrice" jdbcType="DECIMAL" property="allPrice" />
         <result column="taxRate" jdbcType="DECIMAL" property="taxRate" />
@@ -293,7 +294,7 @@
     </select>
 
     <select id="findInOutDetail" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultWithInfoExMap">
-        select dh.number,me.bar_code barCode, m.name mname,m.model,m.standard,di.unit_price unitPrice,di.material_unit as mUnit,
+        select dh.number,me.bar_code barCode, m.name mname,m.model,m.standard,di.unit_price unitPrice,di.material_unit as mUnit, di.sku,
         di.oper_number operNumber,di.all_price allPrice, ifnull(di.tax_rate,0) taxRate, ifnull(di.tax_money,0) taxMoney, ifnull(di.tax_last_money,0) taxLastMoney,
         s.supplier sname,d.dname dname, date_format(dh.oper_time, '%Y-%m-%d') operTime, concat(dh.sub_type,dh.type) as newType,
         concat_ws('  ',dh.remark,di.remark) as newRemark