From 3dab1128396502afe293653cdd44163668713e72 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 10 Feb 2026 13:52:07 +0800
Subject: [PATCH] =?UTF-8?q?2026-02-10=20=E7=94=9F=E4=BA=A7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E9=A2=86=E6=96=99?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProductMixInShopOrder.java         |  9 ++++
 .../mapper/shopOrder/ShopOrderMapper.xml      | 43 +++++++++----------
 2 files changed, 30 insertions(+), 22 deletions(-)

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 a81549d..07a1fa8 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/entity/ProductMixInShopOrder.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/entity/ProductMixInShopOrder.java
@@ -29,6 +29,15 @@ public class ProductMixInShopOrder {
 
     @TableField(exist = false)
     private String qtyOnHand;
+    private String issueMethod;
+
+    public String getIssueMethod() {
+        return issueMethod;
+    }
+
+    public void setIssueMethod(String issueMethod) {
+        this.issueMethod = issueMethod;
+    }
 
     public String getDefaultLocationID() {
         return defaultLocationID;
diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
index f05e0ae..0f9e364 100644
--- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
@@ -645,28 +645,27 @@
     </select>
 
     <select id="getProductMixInShopOrder" resultType="com.gaotao.modules.shopOrder.entity.ProductMixInShopOrder">
-        Select B.Site
-             , B.OrderNo
-             , B.ItemNo
-             , B.ComponentPartNo
-             , P.PartDescription as PartDesc
-             , P.Spec            as PartSpec
-             , P.UMid            as PartUm
-             , B.QtyAssembly
-             , B.QtyFixedScrapt
-             , B.ScraptFactor
-             , B.Remark
-             , B.QtyRequired
-             , B.QtyIssue
-             , B.IssueDate
-             , B.QtyReserved
-             , B.RMType_DB
-        From dbo.view_SAP_SOBOM as B
-           left join  Part as P on B.Site = P.Site
-        and B.ComponentPartNo = P.PartNo
-        Where
-           B.Site = #{site}
-          and B.OrderNo = #{orderNo}
+        SELECT
+            B.Site,
+            B.OrderNo,
+            B.ItemNo,
+            B.ComponentPartNo,
+            P.PartDescription AS PartDesc,
+            P.Spec AS PartSpec,
+            P.UMid AS PartUm,
+            B.QtyAssembly,
+            B.QtyFixedScrapt,
+            B.ScraptFactor,
+            B.Remark,
+            B.QtyRequired,
+            B.QtyIssue,
+            B.IssueDate,
+            B.QtyReserved,
+            B.RMType_DB,
+            p.issue_method
+        FROM dbo.view_SAP_SOBOM AS B
+        left join Part as P on B.Site = P.Site and B.ComponentPartNo = P.PartNo
+        Where B.Site = #{site} and B.OrderNo = #{orderNo}
         Order by B.ItemNo
     </select>
     <select id="getShopOrderSapSOBOM" resultType="com.gaotao.modules.shopOrder.entity.ProductMixInShopOrder">