From 5e8991f73abc286217e15d1f2e84a658450cf0a9 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Fri, 21 Mar 2025 14:54:20 +0800
Subject: [PATCH] =?UTF-8?q?wms=E5=85=A5=E5=BA=93=E6=8A=A5=E6=A3=80?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9=EF=BC=8C=EF=BC=8C=E5=8D=A1=E6=AD=BB?=
 =?UTF-8?q?=E6=8A=A5=E6=A3=80=EF=BC=8C=E4=B8=8D=E6=8A=A5=E6=A3=80=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=9A=82=E6=94=B6=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WmsToWCSmissionController.java |  9 ++++
 .../op/wms/mapper/OdsProcureOrderMapper.java  |  2 +
 .../wms/service/IOdsProcureOrderService.java  |  2 +
 .../impl/OdsProcureOrderServiceImpl.java      |  7 +++
 .../mapper/wms/OdsProcureOrderMapper.xml      | 44 ++++++++++++++++++-
 .../mapper/wms/OdsProcureOutOrderMapper.xml   |  6 +--
 .../mapper/wms/WmsProductPutMapper.xml        |  3 +-
 7 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java
index 8d9725f41..0f1824329 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java
@@ -115,6 +115,15 @@ public class WmsToWCSmissionController {
     }
 
 
+    /**
+     * 手持 －－包材采购单采购收货查询--新的用于卡住没有报检的
+     */
+
+    @PostMapping("/PurchaseOrderPdaT")
+    public AjaxResult PurchaseOrderPdaT(@RequestBody OdsProcureOrder odsProcureOrder) {
+        List<OdsProcureOrder> orderList = odsProcureOrderService.PurchaseOrderPdaT(odsProcureOrder);
+        return success(orderList);
+    }
     /**
      * 手持 －－包材采购单采购收货操作
      */
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 a9a347632..562e3ec18 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
@@ -125,4 +125,6 @@ public interface OdsProcureOrderMapper {
     public void updateodsProcureOrderCardByu1(OdsProcureOrder order1);
 
     String selectBaseProductAttached(@Param("order1MaterialCode")String order1MaterialCode);
+
+    public  List<OdsProcureOrder> selectOdsProcureOrderListT(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 7c65f0128..086b63407 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
@@ -158,4 +158,6 @@ public interface IOdsProcureOrderService {
     void OutboundPostingzcSAPTS(List<OdsProcureOutOrder> orderList);
 
     void OutboundPostingzcSAPTH(List<OdsProcureOutOrder> orderList);
+
+    List<OdsProcureOrder> PurchaseOrderPdaT(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 b9a8c9f41..4061ef7e6 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
@@ -1750,6 +1750,13 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         }
     }
 
+    @Override
+    public List<OdsProcureOrder> PurchaseOrderPdaT(OdsProcureOrder odsProcureOrder) {
+        DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
+        odsProcureOrder.setOperationNumber(new BigDecimal("1"));
+        return odsProcureOrderMapper.selectOdsProcureOrderListT(odsProcureOrder);
+    }
+
 
     @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 1970c0f1c..f5e91856b 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
@@ -127,7 +127,48 @@
         </where>
         order by Create_Date desc
     </select>
-
+    <select id="selectOdsProcureOrderListT" parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
+        <include refid="selectOdsProcureOrderVo"/>
+        <where>
+            <if test="siteCode != null  and siteCode != ''">and Site_code = #{siteCode}</if>
+            <if test="ID != null  and ID != ''">and ID = #{ID}</if>
+            <if test="procureCode != null  and procureCode != ''">and Procure_Code = #{procureCode}</if>
+            <if test="materialCode != null  and materialCode != ''">and Material_Code    like concat('%', #{materialCode},
+                '%') </if>
+            <if test="materialDesc != null  and materialDesc != ''">and Material_Desc = #{materialDesc}</if>
+            <if test="planDate != null ">and Plan_Date = #{planDate}</if>
+            <if test="planNumber != null ">and Plan_Number = #{planNumber}</if>
+            <if test="Unit != null  and Unit != ''">and Unit = #{Unit}</if>
+            <if test="realityNumber != null ">and Reality_Number = #{realityNumber}</if>
+            <if test="orderStatus != null  and orderStatus != ''">and Order_Status = #{orderStatus}</if>
+            <if test="userDefined1 != null  and userDefined1 != ''">and User_Defined1 = #{userDefined1}</if>
+            <if test="userDefined2 != null  and userDefined2 != ''">and User_Defined2 = #{userDefined2}</if>
+            <if test="userDefined3 != null  and userDefined3 != ''">and User_Defined3 = #{userDefined3}</if>
+            <if test="userDefined4 != null  and userDefined4 != ''">and User_Defined4 = #{userDefined4}</if>
+            <if test="userDefined5 != null  and userDefined5 != ''">and User_Defined5 = #{userDefined5}</if>
+            <if test="userDefined6 != null  and userDefined6 != ''">and User_Defined6 = #{userDefined6}</if>
+            <if test="userDefined7 != null  and userDefined7 != ''">and User_Defined7 = #{userDefined7}</if>
+            <if test="userDefined8 != null  and userDefined8 != ''">and User_Defined8 = #{userDefined8}</if>
+            <if test="userDefined9 != null  and userDefined9 != ''">and User_Defined9 = #{userDefined9}</if>
+            <if test="userDefined10 != null  and userDefined10 != ''">and User_Defined10 = #{userDefined10}</if>
+            <if test="userDefined11 != null  and userDefined11 != ''">and User_Defined11 = #{userDefined11}</if>
+            <if test="supplierCode != null  and supplierCode != ''">and Supplier_Code = #{supplierCode}</if>
+            <if test="supplierName != null  and supplierName != ''">and Supplier_Name like concat('%', #{supplierName},
+                '%')
+            </if>
+            <if test="Remark != null  and Remark != ''">and Remark = #{Remark}</if>
+            <if test="createBy != null  and createBy != ''">and Create_By = #{createBy}</if>
+            <if test="createDate != null ">and Create_Date = #{createDate}</if>
+            <if test="lastUpdateBy != null  and lastUpdateBy != ''">and Last_Update_By = #{lastUpdateBy}</if>
+            <if test="lastUpdateDate != null ">and Last_Update_Date = #{lastUpdateDate}</if>
+            <if test="Active != null  and Active != ''">and Active = #{Active}</if>
+            <if test="enterpriseId != null  and enterpriseId != ''">and Enterprise_Id = #{enterpriseId}</if>
+            <if test="enterpriseCode != null  and enterpriseCode != ''">and Enterprise_Code = #{enterpriseCode}</if>
+            <if test="palletNum != null  and palletNum != ''">and pallet_num = #{palletNum}</if>
+            <if test="operationNumber != null  and operationNumber != ''">and Operation_Number is not null </if>
+        </where>
+        order by Create_Date desc
+    </select>
     <select id="selectOdsProcureOrderByID" parameterType="String" resultMap="OdsProcureOrderResult">
         <include refid="selectOdsProcureOrderVo"/>
         where ID = #{ID}
@@ -883,6 +924,7 @@
             ods_procure_order_card
                 LEFT JOIN ods_procure_order ON  ods_procure_order.ID = TRY_CAST(ods_procure_order_card.User_Defined4 AS INT)
         WHERE	ods_procure_order.user_defined5=#{userDefined5}
+          AND ods_procure_order.Operation_Number IS NOT NULL
     </select>
     <select id="selectCardListSH" resultMap="OdsProcureOrderResult">
         SELECT
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 19c69276a..d3a729bc8 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
@@ -906,7 +906,7 @@
 		wms_ods_procure_return_order.Plan_Number,
 		wms_ods_procure_return_order.Unit,
 		COALESCE ( wms_ods_procure_return_order.Return_Number, 0 ) AS Return_Number,
-		wms_raw_mission_out.user_defined2 Loc_Code,
+		wms_raw_order_in_sn.wh_code Loc_Code,
 		wms_ods_procure_return_order.Loc_Desc,
 		wms_ods_procure_return_order.Production_Line_Desc,
 		wms_ods_procure_return_order.Production_Line_Code,
@@ -933,8 +933,8 @@
 		wms_ods_procure_return_order.Enterprise_Code
 		FROM
 		wms_ods_procure_return_order
-		LEFT JOIN	wms_raw_mission_out	ON wms_raw_mission_out.prd_order	= wms_ods_procure_return_order.Produce_Code
-		AND wms_raw_mission_out.material_code	= wms_ods_procure_return_order.Material_Code
+		LEFT JOIN	wms_raw_order_in_sn	ON wms_raw_order_in_sn.user_defined5	= wms_ods_procure_return_order.Produce_Code
+		AND wms_raw_order_in_sn.material_code	= wms_ods_procure_return_order.Material_Code
 		where 	wms_ods_procure_return_order.ID	IN
 		<foreach item="odsProcureOutOrder" collection="list" open="(" separator="," close=")">
 			#{odsProcureOutOrder.ID}
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
index 6131b6e84..ba13df565 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
@@ -532,7 +532,8 @@
         AND qc.check_type = 'checkTypeCP'
         WHERE
         mw.report_code = #{wmsProductPut.workOrder}
-        AND mw.product_code =  #{wmsProductPut.productCode}
+        AND mw.product_code  like concat('%',  #{wmsProductPut.productCode},
+                                          '%')
         AND mw.batch =  #{wmsProductPut.batchNumber}
         AND qc.check_result IS NOT NULL
         <![CDATA[   AND qc.check_result <> '']]>