From 812976e8cfa469b3393a5a530e85f5011e224a83 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Thu, 17 Apr 2025 09:53:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E4=BA=8Ewms=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=85=A5=E5=BA=93=E5=8A=9F=E8=83=BD=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3--=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E6=89=80=E6=9C=89=E6=A0=87=E8=AF=86=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/wms/mapper/OdsProcureOrderMapper.java   |  4 +++-
 .../wms/service/IOdsProcureOrderService.java   |  2 ++
 .../impl/OdsProcureOrderServiceImpl.java       |  8 ++++++++
 .../mapper/wms/OdsProcureOrderMapper.xml       | 18 ++++++++++++++++++
 .../mapper/wms/OdsProcureOutOrderMapper.xml    |  1 +
 5 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java
index 562e3ec18..838aa536a 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java
@@ -124,7 +124,9 @@ public interface OdsProcureOrderMapper {
 
     public void updateodsProcureOrderCardByu1(OdsProcureOrder order1);
 
-    String selectBaseProductAttached(@Param("order1MaterialCode")String order1MaterialCode);
+    public String selectBaseProductAttached(@Param("order1MaterialCode")String order1MaterialCode);
 
     public  List<OdsProcureOrder> selectOdsProcureOrderListT(OdsProcureOrder odsProcureOrder);
+
+    public  OdsProcureOrder selectOdsProcureOrderCardTLTWO(OdsProcureOrder odsProcureOrder);
 }
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java
index 086b63407..9ae074e1a 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java
@@ -160,4 +160,6 @@ public interface IOdsProcureOrderService {
     void OutboundPostingzcSAPTH(List<OdsProcureOutOrder> orderList);
 
     List<OdsProcureOrder> PurchaseOrderPdaT(OdsProcureOrder odsProcureOrder);
+
+    OdsProcureOrder selectOrderCardTLTWO(OdsProcureOrder odsProcureOrder);
 }
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
index cc6991120..9e5939aed 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
@@ -1784,6 +1784,14 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         return odsProcureOrderMapper.selectOdsProcureOrderListT(odsProcureOrder);
     }
 
+    @Override
+    public OdsProcureOrder selectOrderCardTLTWO(OdsProcureOrder odsProcureOrder) {
+        //送货单，采购单，行项目，物料编码，物料名称，工厂号，托盘，状态，实际收货
+        DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
+        OdsProcureOrder order=  odsProcureOrderMapper.selectOdsProcureOrderCardTLTWO(odsProcureOrder);
+        return order;
+    }
+
 
     @Override
     @DS("#header.poolName")
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 88f7631af..02138b6c4 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
@@ -643,6 +643,24 @@
              WHERE
             card.User_Defined1= #{userDefined1}
     </select>
+    <select id="selectOdsProcureOrderCardTLTWO"      resultMap="OdsProcureOrderResult">
+        SELECT
+            card.Site_code,
+            card.Procure_Code ,
+            card.Material_Code ,
+            card.Material_Desc ,
+            card.User_Defined3 ,
+            card.User_Defined4 ,
+            card.User_Defined1  sn,
+            card.Plan_Number ,
+            card.User_Defined10,
+            card.User_Defined7,
+            card.User_Defined1
+        FROM
+            ods_procure_order_card card
+        WHERE
+            card.Procure_Code= #{procureCode}
+    </select>
     <select id="selectOdsProcureOrderList1" parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
             SELECT
                 o.Site_code,
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
index bd91cdf45..094fa33e1 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
@@ -1387,6 +1387,7 @@
 		WHERE
 			workorder_code =#{userDefined4}
 		  AND material_code = #{materialCode}
+		  AND	del_flag='0'
 	</select>
 	<select id="selectMesReportWorkConsumeFC"	resultMap="OdsProcureOutOrderResult">
 		select