From d01ee3eac335c67bb2add7cd7c8983c5c42b9f78 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Thu, 27 Feb 2025 16:49:24 +0800 Subject: [PATCH] =?UTF-8?q?fix(buildpackage):=20=E4=BF=AE=E5=A4=8D=20TOC?= =?UTF-8?q?=20=E5=86=B2=E5=8F=91=E5=87=BA=E5=95=86=E5=93=81=E7=BA=A2?= =?UTF-8?q?=E8=93=9D=E5=8D=95=E6=8D=AE=E6=A0=87=E8=AF=86=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 u8cOperationFlowV2 方法，将红字标识从 N 改为 Y - 更新销售订单父对象的红字标识设置 - 注释掉销售订单子对象的红字标识设置 - 优化采购订单类型的判断逻辑 - 删除测试代码中的无用注释 --- .../plugin/sales/SoSaleOutPluginInitializerToC.java | 11 +++++++---- .../frame/plugin/lets/util/QueryU8CEntityUtil.java | 4 ++-- .../sales/SoSaleOutPluginInitializerToCTest.java | 8 ++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java index 5f88d3f4..f95a1e04 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java @@ -1833,7 +1833,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { * * @author liuyang */ - private BdBusitypeEntity u8cOperationFlowV2() throws Exception { + public BdBusitypeEntity u8cOperationFlowV2() throws Exception { String processName = "TOC冲发出商品"; BdBusitypeEntity bdBusitypeEntity = queryBdBusitypeUtil.queryBdBusitype(processName); Assert.notNull(bdBusitypeEntity, "根据业务流程名称({})没有查询到业务流程", processName); @@ -2272,8 +2272,8 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { saleorderRequestParentDto.setVdef1(shopArchives.getDocname());//店铺 saleorderRequestParentDto.setPk_defdoc3(bdRdclEntity.getPkRdcl());//收发类别 saleorderRequestParentDto.setVdef3(bdRdclEntity.getRdname()); - saleorderRequestParentDto.setPk_defdoc16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N主键")); - saleorderRequestParentDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N名称")); + saleorderRequestParentDto.setPk_defdoc16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-Y主键")); + saleorderRequestParentDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-Y名称")); saleorderRequestDto.setParentvo(saleorderRequestParentDto); List saleorderRequestChildrenDtoList = new ArrayList<>(); @@ -2336,6 +2336,8 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { // saleorderRequestChildrenDto.setVdef2(bdCostsubjEntity.getCostname());//收支项目 // saleorderRequestChildrenDto.setPk_defdoc2(bdCostsubjEntity.getPkCostsubj()); +// saleorderRequestChildrenDto.setPk_defdoc16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N主键")); +// saleorderRequestChildrenDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N名称")); //如果优惠金额为0，则传0 if (sonDetailsDto.getVdef4() != null) { saleorderRequestChildrenDto.setVdef4("-" + new BigDecimal(sonDetailsDto.getVdef4()).stripTrailingZeros().toPlainString()); @@ -2559,6 +2561,8 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { saleorderRequestParentDto.setVdef1(shopArchives.getDocname());//店铺 saleorderRequestParentDto.setPk_defdoc3(bdRdclEntity.getPkRdcl());//收发类别 saleorderRequestParentDto.setVdef3(bdRdclEntity.getRdname()); + saleorderRequestParentDto.setPk_defdoc16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N主键"));//单据红字标识=N + saleorderRequestParentDto.setVdef16(OverallConstant.getOverAllValue("u8c自定义项档案-单据红字标识-N名称")); saleorderRequestDto.setParentvo(saleorderRequestParentDto); List saleorderRequestChildrenDtoList = new ArrayList<>(); @@ -2609,7 +2613,6 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { // saleorderRequestChildrenDto.setNoriginalcurprice(noriginalcurprice.stripTrailingZeros().toPlainString());//无税单价 // saleorderRequestChildrenDto.setNoriginalcursummny(noriginalcursummny.stripTrailingZeros().toPlainString());//价税合计 saleorderRequestChildrenDto.setNoriginalcursummny(sonDetailsDto.getGroupTotalPayAmount().setScale(2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString());//价税合计 新逻辑 - // saleorderRequestChildrenDto.setNoriginalcurtaxmny(noriginalcurtaxmny.stripTrailingZeros().toPlainString());//税额 // saleorderRequestChildrenDto.setNoriginalcurtaxnetprice(noriginalcurtaxprice.stripTrailingZeros().toPlainString());//含税净价 // saleorderRequestChildrenDto.setNoriginalcurtaxprice(noriginalcurtaxprice.stripTrailingZeros().toPlainString());//含税单价 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/QueryU8CEntityUtil.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/QueryU8CEntityUtil.java index b7fc1796..c634ae12 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/QueryU8CEntityUtil.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/QueryU8CEntityUtil.java @@ -700,10 +700,10 @@ public class QueryU8CEntityUtil { String busicode = null; if ("DLCG".equals(purchaseOrderType)) { - //O 代理采购 -> 渠道品牌采购 + //O 代理采购 -> U渠道品牌采购 busicode = "DLCG"; } else if ("CPCG".equals(purchaseOrderType)) { - //O 成品采购 -> 自主品牌采购 + //O 成品采购 -> U自主品牌采购 busicode = "ZZCG"; } else { Assert.state(false, "无法识别的O采购类型{}", purchaseOrderType); diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java index 4562bce2..9a65003b 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java @@ -111,7 +111,7 @@ class SoSaleOutPluginInitializerToCTest { // soSaleOutPluginInitializerToC.startImplementStockByCode(s, "tran"); try { - soSaleOutPluginInitializerToC.startImplementStockByTime("2025-02-18 11:54:18", "2025-02-18 11:54:18", "0"); +// soSaleOutPluginInitializerToC.startImplementStockByTime("2025-02-18 11:54:18", "2025-02-18 11:54:18", "0"); // String code = "LETS-SH2024052100015139"; // soSaleOutPluginInitializerToC.startImplementStockByCode(code, "tran"); @@ -139,9 +139,9 @@ class SoSaleOutPluginInitializerToCTest { // soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2025012300026949", "tran"); -// String processName = "TOC确认收入"; -// BdBusitypeEntity bdBusitypeEntity = queryBdBusitypeUtil.queryBdBusitype(processName); -// System.out.println(bdBusitypeEntity.getPkBusitype()); + String processName = "TOC确认收入"; + BdBusitypeEntity bdBusitypeEntity = queryBdBusitypeUtil.queryBdBusitype(processName); + System.out.println(bdBusitypeEntity.getPkBusitype()); } catch (Exception e) { e.printStackTrace(); }