From 16d966b6d8fe385110e129096e29c1a159ad834c Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Wed, 12 Mar 2025 15:43:31 +0800
Subject: [PATCH] =?UTF-8?q?wms=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OdsProcureOutOrderController.java           | 17 +++++++++++++++--
 .../impl/OdsProcureOrderServiceImpl.java        |  1 +
 .../impl/OdsProcureOutOrderServiceImpl.java     |  5 ++++-
 .../mapper/wms/OdsProcureOutOrderMapper.xml     |  1 +
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java
index c88017299..57fd6a91b 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java
@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.op.common.core.utils.uuid.IdUtils;
+import com.op.wms.service.IOdsProcureOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,7 +25,7 @@ import com.op.common.core.utils.poi.ExcelUtil;
 import com.op.common.core.web.page.TableDataInfo;
 
 /**
- * 包材出库单Controller
+ * 包材出库单Controllers
  *
  * @author Open Platform
  * @date 2023-07-06
@@ -34,7 +35,8 @@ import com.op.common.core.web.page.TableDataInfo;
 public class OdsProcureOutOrderController extends BaseController {
     @Autowired
     private IOdsProcureOutOrderService odsProcureOutOrderService;
-
+    @Autowired
+    private IOdsProcureOrderService odsProcureOrderService;
     /**
      * 查询包材出库单列表
      */
@@ -174,4 +176,15 @@ public class OdsProcureOutOrderController extends BaseController {
         String  result = odsProcureOutOrderService.addwmsFpStorageNewsTS(orderList);
         return success(result);
     }
+    /**
+     * 退货过账
+     *
+     * @param orderList
+     * @return
+     */
+    @PostMapping("/OutboundPostingzcSAPTH")
+    public AjaxResult OutboundPostingzcSAPTH(@RequestBody List<OdsProcureOutOrder> orderList) {
+        odsProcureOrderService.OutboundPostingzcSAPTH(orderList);
+        return success();
+    }
 }
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 05b43bed5..512c54337 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
@@ -1674,6 +1674,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
     }
 
     @Override
+    @DS("#header.poolName")
     public void OutboundPostingzcSAPTH(List<OdsProcureOutOrder> orderList) {
         //先根据出库单获取
 //		* 退料的移动类型为 262
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java
index e8775496a..1dd22b55a 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java
@@ -241,7 +241,10 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
     @DS("#header.poolName")
     public List<OdsProcureOutOrder> listReturnDY(OdsProcureOutOrder odsProcureOutOrder) {
         List<OdsProcureOutOrder> orderList = odsProcureOutOrderMapper.selectOdsProcureReturnOrderListZC(odsProcureOutOrder);
-        return orderList;
+        OdsProcureOutOrder  order=new OdsProcureOutOrder();
+        order.setProduceCode(orderList.get(0).getProduceCode());
+        List<OdsProcureOutOrder> odsProcureOutOrders = odsProcureOutOrderMapper.selectOdsProcureReturnOrderListZC(order);
+        return odsProcureOutOrders;
     }
     //特殊出库
     @Override
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 e7472e856..bc9edfd40 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
@@ -1472,6 +1472,7 @@
 			<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="ID != null  and ID != ''"> and ID = #{ID}</if>
 		</where>
 		ORDER BY	User_Defined4	DESC
 	</select>