From 7516fa3196e101fcb615bff8de7df1635b255ea9 Mon Sep 17 00:00:00 2001
From: liuy <37787198+LiuyCodes@users.noreply.github.com>
Date: Mon, 13 Jan 2025 15:16:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(purchase):=20=E4=BF=AE=E5=A4=8D=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E9=80=80=E5=BA=93=E5=92=8C=E9=87=87=E8=B4=AD=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91-=20?=
 =?UTF-8?q?=E5=9C=A8=20ProxyPurchaseReturn=20=E5=92=8C=20ProxyPurchaseWare?=
 =?UTF-8?q?housWarehouse=20=E7=B1=BB=E4=B8=AD=EF=BC=8C=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E4=BA=86=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E8=A1=8C=E7=9A=84=E9=97=AE=E9=A2=98=20-=20=E5=B0=86=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=9B=BA=E5=AE=9A=E7=9A=84=E7=AC=AC=E4=B8=80=E6=9D=A1?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=8C=E6=94=B9=E4=B8=BA=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=E7=9A=84=E6=98=8E=E7=BB=86=E8=A1=8C=20-=20?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=87=87=E8=B4=AD=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/lets/plugin/purchase/ProxyPurchaseReturn.java      | 4 ++--
 .../lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java  | 3 ++-
 .../plugin/purchase/ProxyPurchaseWarehousWarehouseTest.java   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java
index 420db544..c3fc0928 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java
@@ -934,10 +934,10 @@ public class ProxyPurchaseReturn extends PluginBaseEntity {
         if (ofsPoOrderDataDetails != null && ofsPoOrderDataDetails.size() > 0 && detailsDto != null) {
             for (int i = 0; i < ofsPoOrderDataDetails.size(); i++) {
                 Assert.notNull(ofsPoOrderDataDetails.get(i).getId(), "采退订单明细行主键不能为空!");
-
                 Assert.notNull(detailsDto.getRefOrderDetailId(), "采退出库单明细行对应的关联采退订单的明细行主键不能为空！");
+
                 if (ofsPoOrderDataDetails.get(i).getId().equals(detailsDto.getRefOrderDetailId())) {
-                    return ofsPoOrderDataDetails.get(0);
+                    return ofsPoOrderDataDetails.get(i);
                 }
             }
         } else {
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java
index ed11d569..7b5eb2b4 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java
@@ -929,8 +929,9 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity {
             for (int i = 0; i < ofsPoOrderDataDetails.size(); i++) {
                 Assert.notNull(ofsPoOrderDataDetails.get(i).getId(), "采购订单明细行主键不能为空!");
                 Assert.notNull(stockinB.getRefOrderDetailId(), "采购入库单明细行对应的关联采购订单的明细行主键不能为空！");
+
                 if (ofsPoOrderDataDetails.get(i).getId().equals(stockinB.getRefOrderDetailId())) {
-                    return ofsPoOrderDataDetails.get(0);
+                    return ofsPoOrderDataDetails.get(i);
                 }
             }
         } else {
diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouseTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouseTest.java
index 2f93aa18..cdf355f1 100644
--- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouseTest.java
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouseTest.java
@@ -26,6 +26,6 @@ public class ProxyPurchaseWarehousWarehouseTest {
 
     @Test
     public void startImplementByCode() {
-        proxyPurchaseWarehousWarehouse.startImplementByCode("LETS-RE2025010200000596");
+        proxyPurchaseWarehousWarehouse.startImplementByCode("LETS-RE2024123100000763");
     }
 }
\ No newline at end of file