From 8bf32a71260bebf67a2da3bde1f8d5e8a17e902e Mon Sep 17 00:00:00 2001
From: liuy <37787198+LiuyCodes@users.noreply.github.com>
Date: Thu, 9 Jan 2025 17:47:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(purchase):=20=E4=BF=AE=E5=A4=8D=E4=BB=A3?=
 =?UTF-8?q?=E7=90=86=E5=93=81=E7=89=8C=E9=87=87=E8=B4=AD=E9=80=80=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8F=AA=E5=A4=84=E7=90=86=E4=BB=A3=E7=90=86=E5=93=81?=
 =?UTF-8?q?=E7=89=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 查询 OFS 采购订单以确认采购类型
- 更新采退订单查询方法名称
- 修改测试用例中的订单号
---
 .../plugin/lets/plugin/purchase/ProxyPurchaseReturn.java | 9 +++++++--
 .../plugin/outsourc/ConsignmachiningInReturnTest.java    | 2 +-
 .../lets/plugin/purchase/ProxyPurchaseReturnTest.java    | 3 +--
 3 files changed, 9 insertions(+), 5 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 fb5a4880..2a6627eb 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
@@ -631,10 +631,14 @@ public class ProxyPurchaseReturn extends PluginBaseEntity {
                     generateBusinessDate = createGenerateBusinessDate(header);
 
                     //2024年8月22日 15:30:09 如果purchaseReturnOrder为null，那么在queryPurchaseReturnOrder会抛出异常，此处不需要验证purchaseReturnOrder是否为null
+                    //查询OFS采退订单
                     PurchaseReturnOrder purchaseReturnOrder = queryPurchaseReturnOrder(header.getRefOrderCode());
                     PurchaseReturnOrderHeader header1 = purchaseReturnOrder.getHeader();
                     List<PurchaseReturnOrderDetails> details1 = purchaseReturnOrder.getDetails();
-                    boolean checkResult = onlyImplementProxyOrder.onlyImplementProxyOrder(purchaseReturnOrder, "DLCG");
+                    //查询OFS采购订单
+                    OfsPoOrderData ofsPoOrderData = ofsStandardUtil.queryOfsPoOrder(header1.getRefOrderCode());
+                    Assert.notNull(ofsPoOrderData, "根据O退订单管理的采购订单号{}，无法匹配到OFS采购订单，无法确认「采购类型」", header1.getRefOrderCode());
+                    boolean checkResult = onlyImplementProxyOrder.onlyImplementProxyOrder(ofsPoOrderData, "DLCG");
                     if (!checkResult) {
                         continue;
                     }
@@ -997,7 +1001,7 @@ public class ProxyPurchaseReturn extends PluginBaseEntity {
     }
 
     /**
-     * 查询采退订单
+     * 查询OFS采退订单
      *
      * @param code 采退订单号
      * @author liuyang
@@ -1017,6 +1021,7 @@ public class ProxyPurchaseReturn extends PluginBaseEntity {
         return null;
     }
 
+
     /**
      * 2024年8月23日 10:21:50 只保留代理品牌采购入库单
      *
diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturnTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturnTest.java
index dfed72ba..3f6a9fb6 100644
--- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturnTest.java
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturnTest.java
@@ -27,7 +27,7 @@ public class ConsignmachiningInReturnTest {
     @Test
     public void startImplement() {
         try {
-            consignmachiningInReturn.startImplement("LETS-SH2024082300017733");
+            consignmachiningInReturn.startImplement("LETS-SH2025010800023052");
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturnTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturnTest.java
index fc5ec406..027b331b 100644
--- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturnTest.java
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturnTest.java
@@ -25,12 +25,11 @@ public class ProxyPurchaseReturnTest {
     @Test
     public void startImplement() {
         try {
-            proxyPurchaseReturn.startImplement("LETS-SH2024091200027580");
+            proxyPurchaseReturn.startImplement("LETS-SH2025010800023052");
 
 
 //            proxyPurchaseReturn.startImplement("2024-01-01 00:00:00", "2024-08-07 23:59:59");
 
-
 //            proxyPurchaseReturn.u8cOperationFlow();
 
 //            proxyPurchaseReturn.startImplement("2024-09-24 13:49:15", "2024-09-24 13:49:17");