fix(purchase): 修复代理品牌采购退订单只处理代理品牌逻辑

- 查询 OFS 采购订单以确认采购类型
- 更新采退订单查询方法名称
- 修改测试用例中的订单号
This commit is contained in:
liuy 2025-01-09 17:47:38 +08:00
parent 71bd31ba47
commit 8bf32a7126
3 changed files with 9 additions and 5 deletions

View File

@ -631,10 +631,14 @@ public class ProxyPurchaseReturn extends PluginBaseEntity {
generateBusinessDate = createGenerateBusinessDate(header); generateBusinessDate = createGenerateBusinessDate(header);
//2024年8月22日 15:30:09 如果purchaseReturnOrder为null那么在queryPurchaseReturnOrder会抛出异常此处不需要验证purchaseReturnOrder是否为null //2024年8月22日 15:30:09 如果purchaseReturnOrder为null那么在queryPurchaseReturnOrder会抛出异常此处不需要验证purchaseReturnOrder是否为null
//查询OFS采退订单
PurchaseReturnOrder purchaseReturnOrder = queryPurchaseReturnOrder(header.getRefOrderCode()); PurchaseReturnOrder purchaseReturnOrder = queryPurchaseReturnOrder(header.getRefOrderCode());
PurchaseReturnOrderHeader header1 = purchaseReturnOrder.getHeader(); PurchaseReturnOrderHeader header1 = purchaseReturnOrder.getHeader();
List<PurchaseReturnOrderDetails> details1 = purchaseReturnOrder.getDetails(); 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) { if (!checkResult) {
continue; continue;
} }
@ -997,7 +1001,7 @@ public class ProxyPurchaseReturn extends PluginBaseEntity {
} }
/** /**
* 查询采退订单 * 查询OFS采退订单
* *
* @param code 采退订单号 * @param code 采退订单号
* @author liuyang * @author liuyang
@ -1017,6 +1021,7 @@ public class ProxyPurchaseReturn extends PluginBaseEntity {
return null; return null;
} }
/** /**
* 2024年8月23日 10:21:50 只保留代理品牌采购入库单 * 2024年8月23日 10:21:50 只保留代理品牌采购入库单
* *

View File

@ -27,7 +27,7 @@ public class ConsignmachiningInReturnTest {
@Test @Test
public void startImplement() { public void startImplement() {
try { try {
consignmachiningInReturn.startImplement("LETS-SH2024082300017733"); consignmachiningInReturn.startImplement("LETS-SH2025010800023052");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

View File

@ -25,12 +25,11 @@ public class ProxyPurchaseReturnTest {
@Test @Test
public void startImplement() { public void startImplement() {
try { try {
proxyPurchaseReturn.startImplement("LETS-SH2024091200027580"); proxyPurchaseReturn.startImplement("LETS-SH2025010800023052");
// proxyPurchaseReturn.startImplement("2024-01-01 00:00:00", "2024-08-07 23:59:59"); // proxyPurchaseReturn.startImplement("2024-01-01 00:00:00", "2024-08-07 23:59:59");
// proxyPurchaseReturn.u8cOperationFlow(); // proxyPurchaseReturn.u8cOperationFlow();
// proxyPurchaseReturn.startImplement("2024-09-24 13:49:15", "2024-09-24 13:49:17"); // proxyPurchaseReturn.startImplement("2024-09-24 13:49:15", "2024-09-24 13:49:17");