From 9d4447ae7adb1237425b2f4eb962ca3a6b8dd806 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Tue, 24 Sep 2024 14:11:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96=E4=B8=8E?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E6=97=B6=E9=97=B4=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 扩展日志信息，使其包含插件名称、O接口返回行数及时间范围。 - 将现有测试代码中的硬编码时间替换为参数，以便于灵活测试。 - 通过这些改动，提高了日志的可读性，并使测试用例更加通用。 --- .../plugin/lets/plugin/outsourc/ConsignmachiningIn.java | 2 +- .../lets/plugin/outsourc/ConsignmachiningInReturn.java | 2 +- .../plugin/lets/plugin/purchase/ProxyPurchaseReturn.java | 6 +++--- .../lets/plugin/purchase/ProxyPurchaseWarehousOrder.java | 2 +- .../plugin/purchase/ProxyPurchaseWarehousWarehouse.java | 2 +- .../lets/plugin/sales/SoSaleOutPluginInitializerToB.java | 4 ++-- .../lets/plugin/sales/SoSaleReturnPluginInitializerToB.java | 4 ++-- .../plugin/lets/plugin/outsourc/ConsignmachiningInTest.java | 6 ++++-- .../lets/plugin/purchase/ProxyPurchaseReturnTest.java | 2 ++ .../plugin/purchase/ProxyPurchaseWarehousOrderTest.java | 4 +++- 10 files changed, 20 insertions(+), 14 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java index 15787181..21404bbe 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java @@ -192,7 +192,7 @@ public class ConsignmachiningIn extends PluginBaseEntity { queryOfsSoSaleOutVo.setInternalInstructionType("PURCHASE"); queryOfsSoSaleOutVo.setStatus(900L); ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search"); - logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size()); + logger.info("插件：{} O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime); if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) { getSet(returnGoodHeaderDetailsDataDtoArrayList); } else { diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java index b797c1fb..d069dfda 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java @@ -195,7 +195,7 @@ public class ConsignmachiningInReturn extends PluginBaseEntity { queryOfsSoSaleOutVo.setInternalInstructionType("PURCHASE_RETURN"); queryOfsSoSaleOutVo.setStatus(900L); ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.shipment.search"); - logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size()); + logger.info("插件：{} O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime); if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) { getSet(returnGoodHeaderDetailsDataDtoArrayList); } else { 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 f2cd0bae..77d94cef 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 @@ -184,15 +184,15 @@ public class ProxyPurchaseReturn extends PluginBaseEntity { //OFS采退出库 List returnGoodHeaderDetailsDataDtoArrayList = new ArrayList<>(); QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo(); - queryOfsSoSaleOutVo.setAuditAt_start(startTime); - queryOfsSoSaleOutVo.setAuditAt_end(endTime); + queryOfsSoSaleOutVo.setShipAt_start(startTime); + queryOfsSoSaleOutVo.setShipAt_end(endTime); queryOfsSoSaleOutVo.setClientCode("LETS"); queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageSize(50L); queryOfsSoSaleOutVo.setInternalInstructionType("PURCHASE_RETURN"); queryOfsSoSaleOutVo.setStatus(900L); ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.shipment.search"); - logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size()); + logger.info("插件：{} O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime); if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) { getSet(returnGoodHeaderDetailsDataDtoArrayList); } else { diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java index b1a0910e..9083bce0 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java @@ -188,7 +188,7 @@ public class ProxyPurchaseWarehousOrder extends PluginBaseEntity { queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setStatus(900L); ofsStandardUtil.queryOfsPoOrder(queryOfsSoSaleOutVo, allOfsPoOrderList, 1L); - logger.info("数据返回行数：{}", allOfsPoOrderList.size()); + logger.info("插件：{} O接口返回行数：{} 时间段：{} {}", getPluginName(), allOfsPoOrderList.size(), startTime, endTime); if (allOfsPoOrderList.size() > 0) { getSet(allOfsPoOrderList); } 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 94c4d206..1e3d8655 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 @@ -188,7 +188,7 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { queryOfsSoSaleOutVo.setInternalInstructionType("PURCHASE"); queryOfsSoSaleOutVo.setStatus(900L); ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search"); - logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size()); + logger.info("插件：{} O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime); if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) { getSet(returnGoodHeaderDetailsDataDtoArrayList); } else { diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java index d23ab528..f2a4d270 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java @@ -243,7 +243,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { queryOfsSoSaleOutVo.setStoreCode(tobShop); // queryOfsSoSaleOutVo.setCode("LETS-SH2024010200000004"); ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, headerDetailsDtoList, 1L, "ofs.shipment.search"); - logger.info("数据返回行数：{}", headerDetailsDtoList.size()); + logger.info("插件：{} (库存)O接口返回行数：{} 时间段：{} {}", getPluginName(), headerDetailsDtoList.size(), startTime, endTime); if (headerDetailsDtoList.size() > 0) { getSetStock(headerDetailsDtoList); } else { @@ -298,7 +298,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { queryOfsSoSaleOutVo.setPageSize(50L); queryOfsSoSaleOutVo.setStoreCode(tobShop); ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, headerDetailsDtoList, 1L, "ofs.shipment.search"); - logger.info("数据返回行数：{}", headerDetailsDtoList.size()); + logger.info("插件：{} (确认收入)O接口返回行数：{} 时间段：{} {}", getPluginName(), headerDetailsDtoList.size(), startTime, endTime); if (headerDetailsDtoList.size() > 0) { getSetStockTran(headerDetailsDtoList); } else { diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java index 97d1b6a1..0b65503b 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java @@ -247,7 +247,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { queryOfsSoSaleOutVo.setInternalInstructionType("RETURN"); // queryOfsSoSaleOutVo.setCode("LETS-RE2024081900000001"); ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search"); - logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size()); + logger.info("插件：{} (库存)O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime); if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) { getSetStock(returnGoodHeaderDetailsDataDtoArrayList); } else { @@ -303,7 +303,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { queryOfsSoSaleOutVo.setRefundStatus("900"); // queryOfsSoSaleOutVo.setCode("LETS-RE2024081900000001"); ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search"); - logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size()); + logger.info("插件：{} (确认收入)O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime); if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) { getSetTrade(returnGoodHeaderDetailsDataDtoArrayList); } else { diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInTest.java index d8926eba..1b598899 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInTest.java @@ -27,7 +27,9 @@ public class ConsignmachiningInTest { @Test public void startImplement() { // String code = "LETS-RE2024082300000007"; - String code = "LETS-RE2024090300000001"; - consignmachiningIn.startImplement(code); +// String code = "LETS-RE2024090300000001"; +// consignmachiningIn.startImplement(code); + + consignmachiningIn.startImplement("2024-09-24 13:49:15", "2024-09-24 13:49:17"); } } \ No newline at end of file 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 0e022b35..1002b40e 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 @@ -32,6 +32,8 @@ public class ProxyPurchaseReturnTest { // proxyPurchaseReturn.u8cOperationFlow(); + + proxyPurchaseReturn.startImplement("2024-09-24 13:49:15", "2024-09-24 13:49:17"); } catch (Exception e) { e.printStackTrace(); } diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java index fba65e3a..44396c90 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java @@ -27,7 +27,9 @@ public class ProxyPurchaseWarehousOrderTest { @Test public void startImplementByCode() { try { - proxyPurchaseWarehousOrder.startImplementByCode("LETS-PO2024091800000002"); +// proxyPurchaseWarehousOrder.startImplementByCode("LETS-PO2024091800000002"); + + proxyPurchaseWarehousOrder.startImplementByTime("2024-09-24 13:49:15", "2024-09-24 13:49:17"); } catch (Exception e) { e.printStackTrace(); }