From 03a496bd44f3c325206e29f9c1e8c2b3257f13b3 Mon Sep 17 00:00:00 2001
From: FCD <2453864257@qq.com>
Date: Mon, 31 Mar 2025 14:18:44 +0800
Subject: [PATCH] =?UTF-8?q?pda=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=85=B3=E8=81=94=E5=BA=93=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/wms/OdsProcureOrderMapper.xml      | 69 ++++++++++---------
 1 file changed, 36 insertions(+), 33 deletions(-)

diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
index f5e91856b..88f7631af 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
@@ -51,40 +51,43 @@
 
     <sql id="selectOdsProcureOrderVo">
         SELECT
-            Site_code,
-            ID,
-            Procure_Code,
-            Material_Code,
-            Material_Desc,
-            Plan_Date,
-            Plan_Number,
-            Unit,
-            COALESCE ( Reality_Number, 0 ) Reality_Number,
-            Order_Status,
-            User_Defined1,
-            User_Defined2,
-            User_Defined3,
-            User_Defined4,
-            User_Defined5,
-            User_Defined6,
-            User_Defined7,
-            User_Defined8,
-            User_Defined9,
-            User_Defined10,
-            User_Defined11,
-            Supplier_Code,
-            Supplier_Name,
-            Remark,
-            Create_By,
-            Create_Date,
-            Last_Update_By,
-            Last_Update_Date,
-            Active,
-            Enterprise_Id,
-            Enterprise_Code,
-            COALESCE ( Operation_Number, 0 ) Operation_Number
+            opo.Site_code,
+            opo.ID,
+            opo.Procure_Code,
+            opo.Material_Code,
+            opo.Material_Desc,
+            opo.Plan_Date,
+            opo.Plan_Number,
+            opo.Unit,
+            COALESCE ( opo.Reality_Number, 0 ) Reality_Number,
+            opo.Order_Status,
+            opo.User_Defined1,
+            opo.User_Defined2,
+            opo.User_Defined3,
+            opo.User_Defined4,
+            opo.User_Defined5,
+            opo.User_Defined6,
+            opo.User_Defined7,
+            opo.User_Defined8,
+            opo.User_Defined9,
+            opo.User_Defined10,
+            opo.User_Defined11,
+            opo.Supplier_Code,
+            opo.Supplier_Name,
+            opo.Remark,
+            opo.Create_By,
+            opo.Create_Date,
+            opo.Last_Update_By,
+            opo.Last_Update_Date,
+            opo.Active,
+            opo.Enterprise_Id,
+            opo.Enterprise_Code,
+            COALESCE ( opo.Operation_Number, 0 ) Operation_Number,
+            bpa.wa_code waCode
         FROM
-            ods_procure_order</sql>
+            ods_procure_order opo
+            LEFT JOIN base_product_attached bpa on RIGHT ( opo.Material_Code, 11 ) = bpa.product_code
+    </sql>
 
     <select id="selectOdsProcureOrderList" parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
         <include refid="selectOdsProcureOrderVo"/>