From 7c7f15152d9172b90cfaac15852592afa53913c6 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Tue, 14 Jan 2025 09:40:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BB=85=E9=80=80=E6=AC=BE=E5=88=86=E7=BB=84=E9=97=B4=E9=9A=94?= =?UTF-8?q?=E7=AC=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lets/plugin/sales/RefundOnlyPluginInitializerToB.java | 4 ++-- .../lets/plugin/sales/RefundOnlyPluginInitializerToC.java | 5 +++-- 2 files changed, 5 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 c1b15acb..bcaf0f49 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 @@ -396,13 +396,13 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity { } //分组：公司+店铺+部门+单据日期(退款日期),仅退款没有仓库，固不去 - Map> collect = allHeader.stream().collect(Collectors.groupingBy(index -> index.getCompanyCode() + "_" + index.getStoreCode() + "_" + index.getSaleDeptCode() + "_" + index.getRefundedAt().substring(0, 10))); + 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]单据日期 + String[] split = entry.getKey().split(",#");//[0]公司 [1]店铺 [2]部门 [3]单据日期 //v:header列表, header.code == details.returnOrderCode String mapStr = ""; 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 cce0aa0d..6e7053fd 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 @@ -398,14 +398,15 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { allDetail.addAll(filterReturnGoodsOrder.getDetails()); } + //分组：公司+店铺+部门+单据日期(退款日期),仅退款没有仓库，固不去 - Map> collect = allHeader.stream().collect(Collectors.groupingBy(index -> index.getCompanyCode() + "_" + index.getStoreCode() + "_" + index.getSaleDeptCode() + "_" + index.getRefundedAt().substring(0, 10))); + 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]单据日期 + String[] split = entry.getKey().split(",#");//[0]公司 [1]店铺 [2]部门 [3]单据日期 //v:header列表, header.code == details.returnOrderCode String mapStr = "";