From 84fd0241d317d4276e357999ec76e86e76ede79c Mon Sep 17 00:00:00 2001 From: zhengyf Date: Mon, 13 Jan 2025 15:30:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E4=BB=85=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E4=BC=98=E5=8C=96=E5=8C=BA=E5=88=86=E5=BA=97=E9=93=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lets/plugin/sales/RefundOnlyPluginInitializerToB.java | 5 +++-- .../lets/plugin/sales/RefundOnlyPluginInitializerToC.java | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java index 3b6018b9..2ae6ec60 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java @@ -374,7 +374,6 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity { */ public void implement(List filterReturnGoodsOrders) throws Exception { - boolean isReferenceShop = false; //分摊分摊后的子表 List allDetail = new ArrayList<>(); List allHeader = new ArrayList<>(); @@ -400,7 +399,9 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity { Map> collect = allHeader.stream().collect(Collectors.groupingBy(index -> index.getCompanyCode() + "_" + index.getStoreCode() + "_" + index.getSaleDeptCode() + "_" + index.getRefundedAt().substring(0, 10))); for (Map.Entry> entry : collect.entrySet()) { - ; + + boolean isReferenceShop = false; + String[] split = entry.getKey().split("_");//[0]公司 [1]店铺 [2]部门 [3]单据日期 //v:header列表, header.code == details.returnOrderCode diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java index 6d874209..42735c30 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java @@ -377,7 +377,7 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { public void implement(List filterReturnGoodsOrders) throws Exception { - boolean isReferenceShop = false; + //分摊分摊后的子表 List allDetail = new ArrayList<>(); List allHeader = new ArrayList<>(); @@ -403,7 +403,9 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { Map> collect = allHeader.stream().collect(Collectors.groupingBy(index -> index.getCompanyCode() + "_" + index.getStoreCode() + "_" + index.getSaleDeptCode() + "_" + index.getRefundedAt().substring(0, 10))); for (Map.Entry> entry : collect.entrySet()) { - ; + + boolean isReferenceShop = false; + String[] split = entry.getKey().split("_");//[0]公司 [1]店铺 [2]部门 [3]单据日期 //v:header列表, header.code == details.returnOrderCode