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 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");