From 687fa75c6548adb8f8b6a9b8e31584ca41dc5c05 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Mon, 7 Apr 2025 10:44:50 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sales):=20=E4=BC=98=E5=8C=96=E8=A2=AB?= =?UTF-8?q?=E5=8A=A8=E4=BB=93=E5=BA=93=E6=94=B6=E6=8D=AE=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=B9=B6=E6=9B=B4=E6=96=B0=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 PassiveWarehouseReceiptToC 类中添加注释标记- 更新 ProxyPurchaseWarehousOrderTest 测试用例中的订单编号 --- .../plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java | 1 + .../lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java index af8a43db..9cc521e8 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java @@ -2929,6 +2929,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity { if (merchantDiscounts == null || "".equals(merchantDiscounts.trim())) { merchantDiscounts = "0"; } + //git if (expertDiscounts == null || "".equals(expertDiscounts.trim())) { expertDiscounts = "0"; } 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 ec2ebd53..fff9e817 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,7 @@ public class ProxyPurchaseWarehousOrderTest { @Test public void startImplementByCode() { try { - proxyPurchaseWarehousOrder.startImplementByCode("LETS-PO2025030400000134"); + proxyPurchaseWarehousOrder.startImplementByCode("LETS-PO2025032500000001"); // proxyPurchaseWarehousOrder.startImplementByTime("2025-01-21 17:38:26", "2025-01-21 17:38:26"); } catch (Exception e) { e.printStackTrace();