From d6b740ba5063d53c2f20e3fd757173ed5a991922 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Thu, 16 May 2024 17:53:44 +0800
Subject: [PATCH] =?UTF-8?q?wms=E5=8C=85=E6=9D=90=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B950?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/wms/controller/WmsToWCSmissionController.java   | 7 ++++---
 .../op/wms/service/impl/OdsProcureOrderServiceImpl.java    | 3 ++-
 .../src/main/resources/mapper/wms/WmsProductPutMapper.xml  | 3 ++-
 3 files changed, 8 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 8b7a6b553..91f224bde 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
@@ -110,9 +110,6 @@ public class WmsToWCSmissionController {
         int tem = odsProcureOrderService.PurchaseOrderdeliPda(odsProcureOrder);
         return success(tem);
     }
-    /**
-     * 手持 －－包材采购单采购收货查询总共已经收货数量
-     */
 
     /**
      * 手持 －－包材采购单采购收货确认操作
@@ -136,6 +133,10 @@ public class WmsToWCSmissionController {
         String result = odsProcureOrderService.ArrivalRegistration(odsProcureOrder);
         return success(result);
     }
+    /**
+     * 手持 －－包材采购单采购收货查询总共已经收货数量
+     */
+
     @PostMapping("/selectOdsProcureOrderAlready")
     public AjaxResult selectOdsProcureOrderAlready(@RequestBody OdsProcureOrder odsProcureOrder) {
 //        odsProcureOrderService.PurchaseOrderdeliPdas(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 e0c4b8aa3..4a8eb2dbc 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
@@ -166,7 +166,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         wmsRawOrderInSn.setUserDefined2(odsProcureOrder.getIncomeBatchNo());//批次
         wmsRawOrderInSn.setWhCode(odsProcureOrder.getWhCode());//厂库编号
         wmsRawOrderInSn.setPoNo(order.getProcureCode());//采购单号
-//		wmsRawOrderInSn.setPoLine(odsProcureOrder.getPoLine());//行项目
+		wmsRawOrderInSn.setPoLine(odsProcureOrder.getPoLine());//行项目
         wmsRawOrderInSn.setMaterialCode(odsProcureOrder.getMaterialCode());
         wmsRawOrderInSn.setMaterialDesc(odsProcureOrder.getMaterialDesc());
         wmsRawOrderInSn.setAmount(odsProcureOrder.getPlanNumber());
@@ -722,6 +722,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
         String  result="操作成功";
         List<WmsRawOrderInSn> wmsRawOrderInSn  =   wmsRawOrderInSnMapper.selecPurchaseOrderdeliPdaList(odsProcureOrder);
+
         return result;
     }
 
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 232093a85..07564a799 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
@@ -51,7 +51,8 @@
             <if test="workOrder != null  and workOrder != ''">and work_order    like concat('%', #{workOrder},
                 '%') </if>
             <if test="factoryCode != null  and factoryCode != ''">and factory_code = #{factoryCode}</if>
-            <if test="productOrder != null  and productOrder != ''">and product_order = #{productOrder}</if>
+            <if test="productOrder != null  and productOrder != ''">and product_order  like concat('%', #{productOrder},
+                '%')</if>
             <if test="whCode != null  and whCode != ''">and wh_code = #{whCode}</if>
             <if test="waCode != null  and waCode != ''">and wa_code = #{waCode}</if>
             <if test="wlCode != null  and wlCode != ''">and wl_code = #{wlCode}</if>