From e6dc9e99d7d2571b886da2a844fe61c4fc22f753 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 15 Apr 2026 13:27:29 +0800
Subject: [PATCH] =?UTF-8?q?2026-04-15=20=E7=94=9F=E4=BA=A7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8-=E3=80=8B=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E9=A1=B5=E7=AD=BE=E5=A2=9E=E5=8A=A0=E4=B8=80?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shopOrder/entity/ProductMixInShopOrder.java        | 10 ++++++++++
 .../resources/mapper/shopOrder/ShopOrderMapper.xml     |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/shopOrder/entity/ProductMixInShopOrder.java b/src/main/java/com/gaotao/modules/shopOrder/entity/ProductMixInShopOrder.java
index aed875a..e4b9fab 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/entity/ProductMixInShopOrder.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/entity/ProductMixInShopOrder.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 public class ProductMixInShopOrder {
@@ -33,6 +34,15 @@ public class ProductMixInShopOrder {
     private String partUmName;
     private String outboundWarehouseId;
     private String outboundWarehouseName;
+    private BigDecimal qtyReturn;
+
+    public BigDecimal getQtyReturn() {
+        return qtyReturn;
+    }
+
+    public void setQtyReturn(BigDecimal qtyReturn) {
+        this.qtyReturn = qtyReturn;
+    }
 
     public String getOutboundWarehouseId() {
         return outboundWarehouseId;
diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
index 5af4338..e428a97 100644
--- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
@@ -665,7 +665,8 @@
             B.RMType_DB,
             b.IssueType as issueMethod,
             B.outbound_warehouse_id,
-            w.WareHouseName as outboundWarehouseName
+            w.WareHouseName as outboundWarehouseName,
+            B.qtyReturn
         FROM dbo.view_SAP_SOBOM AS B
         left join Part as P on B.Site = P.Site and B.ComponentPartNo = P.PartNo
         left join um as um on p.site = um.site and p.umid = um.umid