From 19f01080a659a4730e02c23f7f59d7f69e46611b Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Mon, 13 Jan 2025 18:19:31 +0800 Subject: [PATCH] =?UTF-8?q?refactor(purchase):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=97=A5=E6=9C=9F=E7=94=9F=E6=88=90=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改了 ConsignmachiningIn 和 ProxyPurchaseWarehousWarehouse 类中的 createGenerateBusinessDate 方法 - 将 checkInFrom 或 checkInTo 字段替换为 closedAt 字段 -优化了日期解析和格式化的代码结构 - 更新了相关测试用例中的输入参数 --- .../plugin/lets/plugin/outsourc/ConsignmachiningIn.java | 6 +++--- .../plugin/purchase/ProxyPurchaseWarehousWarehouse.java | 8 ++++---- .../lets/plugin/purchase/ProxyPurchaseReturnTest.java | 2 +- .../purchase/ProxyPurchaseWarehousWarehouseTest.java | 2 +- 4 files changed, 9 insertions(+), 9 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 ba19fd30..aa43b36c 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 @@ -815,12 +815,12 @@ public class ConsignmachiningIn extends PluginBaseEntity { * @author liuyang */ private String createGenerateBusinessDate(ConsignmachiningInSonDto consignmachiningInSonDto) { - if (consignmachiningInSonDto != null && consignmachiningInSonDto.getCheckInFrom() != null) { - String checkInFrom = consignmachiningInSonDto.getCheckInFrom(); + if (consignmachiningInSonDto != null && consignmachiningInSonDto.getClosedAt() != null) { + String closedAt = consignmachiningInSonDto.getClosedAt(); String businessFormat = null; try { - Date dbill = DateUtil.parse(checkInFrom); + Date dbill = DateUtil.parse(closedAt); businessFormat = DateUtil.format(dbill, "yyyy-MM-dd"); } catch (Exception e) { logger.error("业务日期生成失败", e); 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 069d08a2..f5def824 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 @@ -848,10 +848,10 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { */ private String createGenerateBusinessDate(PoOrderSonDto poOrderSonDto) { if (poOrderSonDto != null && poOrderSonDto.getClosedAt() != null) { - String checkInTo = poOrderSonDto.getClosedAt(); + String closedAt = poOrderSonDto.getClosedAt(); String businessFormat = null; try { - Date dbill = DateUtil.parse(checkInTo); + Date dbill = DateUtil.parse(closedAt); businessFormat = DateUtil.format(dbill, "yyyy-MM-dd"); } catch (Exception e) { logger.error("业务日期生成失败", e); @@ -873,10 +873,10 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { private String createGenerateBusinessDate(StockinOrderSearchResponse.StockinOrder stockinOrder) { if (stockinOrder != null) { StockinOrderSearchResponse.StockinOrder.StockinH header = stockinOrder.getHeader(); - String checkInFrom = header.getCheckInFrom(); + String closedAt = header.getClosedAt(); String businessFormat = null; try { - Date dbill = DateUtil.parse(checkInFrom); + Date dbill = DateUtil.parse(closedAt); businessFormat = DateUtil.format(dbill, "yyyy-MM-dd"); } catch (Exception e) { logger.error("业务日期生成失败", e); 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 8ac53f4c..64694b2e 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,7 +25,7 @@ public class ProxyPurchaseReturnTest { @Test public void startImplement() { try { - proxyPurchaseReturn.startImplement("LETS-SH2025010600023310"); + proxyPurchaseReturn.startImplement("LETS-SH2025010700024055"); // proxyPurchaseReturn.startImplement("2024-01-01 00:00:00", "2024-08-07 23:59:59"); 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 4c64b443..87415fa5 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-RE2024110500014600"); + proxyPurchaseWarehousWarehouse.startImplementByCode("LETS-RE2024120300000525"); } } \ No newline at end of file