From c4458718ede3a09855c7cc2fdf0e257220e9ecfd Mon Sep 17 00:00:00 2001 From: zhengyf Date: Mon, 13 Jan 2025 17:23:09 +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=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sales/RefundOnlyPluginInitializerToB.java | 20 +++++++++++++------ .../sales/RefundOnlyPluginInitializerToC.java | 20 ++++++++++++------- 2 files changed, 27 insertions(+), 13 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 2ae6ec60..c1b15acb 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 @@ -429,12 +429,12 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity { parentvo.setLrr(OverallConstant.getOverAllValue("u8cApiZdrCode")); //wldx 往来对象标识 (0 客户 2部门 3业务员) parentvo.setWldx("0"); - //hbbm 客商==店铺,根据店铺区分tob、toc,,,编码需要转换，转换称自定义项。 - BdCubasdocEntity entity = queryU8CEntityUtil.getFuzzyQueryCustomers(split[1]); - if (entity == null) { - Assert.state(false, "根据客商自定义项1：{},未查询到客商基本档案，请假查。", split[1]); - } - parentvo.setHbbm(entity.getCustcode()); +// //hbbm 客商==店铺,根据店铺区分tob、toc,,,编码需要转换，转换称自定义项。 +// BdCubasdocEntity entity = queryU8CEntityUtil.getFuzzyQueryCustomers(split[1]); +// if (entity == null) { +// Assert.state(false, "根据客商自定义项1：{},未查询到客商基本档案，请假查。", split[1]); +// } +// parentvo.setHbbm(entity.getCustcode()); //根据店铺区分tob、toc,区分业务流程 String s = checkFlow(parentvo, split[1]); if ("TOC".equals(s)) { @@ -509,6 +509,14 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity { continue; } + //hbbm 客商==店铺,根据店铺区分tob、toc,,,编码需要转换，转换称自定义项。 + BdCubasdocEntity entity = queryU8CEntityUtil.getFuzzyQueryCustomers(split[1]); + if (entity == null) { + Assert.state(false, "根据客商自定义项1：{},未查询到客商基本档案，请假查。", split[1]); + } + parentvo.setHbbm(entity.getCustcode()); + + //按sku分组 Map> collectSKU = r1.stream().collect(Collectors.groupingBy(index -> index.getSkuCode())); 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 42735c30..cce0aa0d 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,6 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { public void implement(List filterReturnGoodsOrders) throws Exception { - //分摊分摊后的子表 List allDetail = new ArrayList<>(); List allHeader = new ArrayList<>(); @@ -433,12 +432,12 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { parentvo.setLrr(OverallConstant.getOverAllValue("u8cApiZdrCode")); //wldx 往来对象标识 (0 客户 2部门 3业务员) parentvo.setWldx("0"); - //hbbm 客商==店铺,根据店铺区分tob、toc,,,编码需要转换，转换称自定义项。 - BdCubasdocEntity entity = queryU8CEntityUtil.getFuzzyQueryCustomers(split[1]); - if (entity == null) { - Assert.state(false, "根据客商自定义项1：{},未查询到客商基本档案，请假查。", split[1]); - } - parentvo.setHbbm(entity.getCustcode()); +// //hbbm 客商==店铺,根据店铺区分tob、toc,,,编码需要转换，转换称自定义项。 +// BdCubasdocEntity entity = queryU8CEntityUtil.getFuzzyQueryCustomers(split[1]); +// if (entity == null) { +// Assert.state(false, "根据客商自定义项1：{},未查询到客商基本档案，请假查。", split[1]); +// } +// parentvo.setHbbm(entity.getCustcode()); //根据店铺区分tob、toc,区分业务流程 String s = checkFlow(parentvo, split[1]); if ("TOB".equals(s)) { @@ -511,6 +510,13 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { continue; } + //hbbm 客商==店铺,根据店铺区分tob、toc,,,编码需要转换，转换称自定义项。 + BdCubasdocEntity entity = queryU8CEntityUtil.getFuzzyQueryCustomers(split[1]); + if (entity == null) { + Assert.state(false, "根据客商自定义项1：{},未查询到客商基本档案，请假查。", split[1]); + } + parentvo.setHbbm(entity.getCustcode()); + //按sku分组 Map> collectSKU = r1.stream().collect(Collectors.groupingBy(index -> index.getSkuCode()));