From d57b18be5cbc6e2c2c02325944b0cfbe146dbfae Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Sun, 12 Jan 2025 14:54:55 +0800 Subject: [PATCH] =?UTF-8?q?refactor(purchase):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E4=BB=A3=E7=90=86=E9=87=87=E8=B4=AD=E4=BB=93=E5=BA=93=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 注释掉原有的固定业务流程和收发类别查询代码 - 根据采购订单类型动态查询对应的 U8C 业务流程和收发类别 - 更新了测试用例中的订单编号 --- .../plugin/purchase/ProxyPurchaseWarehousWarehouse.java | 9 +++++++-- .../purchase/ProxyPurchaseWarehousWarehouseTest.java | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) 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 4abcabd6..ed11d569 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 @@ -442,9 +442,9 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { // 查询基本档案 List poOrderSonDtos = queryBasicArchives(returnGoodHeaderDetailsDataDtoList); // 代理品牌采购业务流程 - BdBusitypeEntity bdBusitypeEntity = u8cOperationFlow(); +// BdBusitypeEntity bdBusitypeEntity = u8cOperationFlow(); // 查询采购收发类别 - BdRdclEntity bdRdclEntity = rdclUtil.queryRdClObject("102"); +// BdRdclEntity bdRdclEntity = rdclUtil.queryRdClObject("102"); if (poOrderSonDtos != null && poOrderSonDtos.size() > 0) { for (int i = 0; i < poOrderSonDtos.size(); i++) { @@ -471,6 +471,11 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { PoOrderEntity poOrderEntity = poOrderSonDto.getPoOrderEntity();//U8C采购订单 List poOrderBEntityList = poOrderSonDto.getPoOrderBEntityList();//U8C采购订单明细 + //查询对应的U8C业务流程 + BdBusitypeEntity bdBusitypeEntity = queryU8CEntityUtil.queryU8cPoOrderOperationFlow(ofsPoOrderDataHeader.getPurchaseOrderType()); + //查询对应的U8C收发类别 + BdRdclEntity bdRdclEntity = queryU8CEntityUtil.queryU8cPoOrderRertunSendingReceivCategory(ofsPoOrderDataHeader.getPurchaseOrderType()); + //采购订单表头 PurchaseReceiptHeadDto poOrderParentDto = new PurchaseReceiptHeadDto(); poOrderParentDto.setCbiztype(bdBusitypeEntity.getPkBusitype());//业务流程 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 783c5b6c..2f93aa18 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-RE2024123100000770"); + proxyPurchaseWarehousWarehouse.startImplementByCode("LETS-RE2025010200000596"); } } \ No newline at end of file