From 5a56f4023ac55c40114b108ed77f3af6eb5d42fe Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 2 Mar 2026 15:32:44 +0800 Subject: [PATCH] =?UTF-8?q?2026-03-02=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shopOrder/entity/ProductMixInShopOrder.java | 9 +++++++++ src/main/resources/mapper/shopOrder/ShopOrderMapper.xml | 6 ++++-- 2 files changed, 13 insertions(+), 2 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 07a1fa8..084840e 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/entity/ProductMixInShopOrder.java +++ b/src/main/java/com/gaotao/modules/shopOrder/entity/ProductMixInShopOrder.java @@ -30,6 +30,15 @@ public class ProductMixInShopOrder { @TableField(exist = false) private String qtyOnHand; private String issueMethod; + private String partUmName; + + public String getPartUmName() { + return partUmName; + } + + public void setPartUmName(String partUmName) { + this.partUmName = partUmName; + } public String getIssueMethod() { return issueMethod; diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml index 0f9e364..9b97818 100644 --- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml +++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml @@ -651,8 +651,9 @@ B.ItemNo, B.ComponentPartNo, P.PartDescription AS PartDesc, - P.Spec AS PartSpec, - P.UMid AS PartUm, + P.Spec AS partSpec, + P.UMid AS partUm, + um.umName AS partUmName, B.QtyAssembly, B.QtyFixedScrapt, B.ScraptFactor, @@ -665,6 +666,7 @@ 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 + left join um as um on p.site = um.site and p.umid = um.umid Where B.Site = #{site} and B.OrderNo = #{orderNo} Order by B.ItemNo