From 21fd2283b2ac867be718d2e1832e4da4618c632e Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Tue, 24 Sep 2024 10:01:24 +0800 Subject: [PATCH] =?UTF-8?q?```=E4=BF=AE=E5=A4=8D=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E5=85=A5=E5=BA=93=E5=92=8C=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E7=9A=84BOM=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E8=B5=8B=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 解决了外部加工入库和退货单据处理中BOM版本号未正确设置的问题。此更改确保了版本号与提供的BOM版本列表中的第一个元素匹配。 ``` --- .../frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java | 4 ++-- .../plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java | 4 ++-- .../lets/plugin/sales/SoSaleOutPluginInitializerToC.java | 2 +- .../cfgHome/plugin/lets/spring/spring-lets-plugin.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java index 4b5d806a..9a016855 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java @@ -424,9 +424,9 @@ public class ConsignmachiningIn extends PluginBaseEntity { scorderBodyDto.setNordernum(stockinB.getReceivedQty());//数量 scorderBodyDto.setNoriginalnetprice(noriginalcurprice.stripTrailingZeros().toPlainString());//净单价 scorderBodyDto.setCwarehouseid(bdStordocEntity.getPkStordoc());//仓库 -// scorderBodyDto.setBomversion(bomVersion.get(0).getVersion());//BOM版本 + scorderBodyDto.setBomversion(bomVersion.get(0).getVersion());//BOM版本 scorderBodyDto.setDplanarrvdate(generateBusinessDate);//计划到货日期 - scorderBodyDto.setVdef16(bomVersion.get(0).getVersion());//版本号 +// scorderBodyDto.setVdef16(bomVersion.get(0).getVersion());//版本号 scorderBodyDtoArrayList.add(scorderBodyDto); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java index 9a539fbb..eefd417d 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java @@ -398,7 +398,7 @@ public class ConsignmachiningInReturn extends PluginBaseEntity { BdInvbasdocEntity bdInvbasdocEntity = queryStockBasicArchives(bdInvmandocEntity.getPkInvmandoc(), bdCorpEntity.getPkCorp()); //BOM版本 //存货对应的BOM - List bomVersion = getBomVersion(bdCalbodyEntity.getPkCalbody(), bdInvbasdocEntity.getPkInvbasdoc(), bdInvbasdocEntity.getInvcode()); +// List bomVersion = getBomVersion(bdCalbodyEntity.getPkCalbody(), bdInvbasdocEntity.getPkInvbasdoc(), bdInvbasdocEntity.getInvcode()); //计算含税单价 BigDecimal noriginalcurprice = null; @@ -420,7 +420,7 @@ public class ConsignmachiningInReturn extends PluginBaseEntity { consignmachiningInBodyDto.setVsourcebillcode(scOrderEntity.getVordercode());//来源单据号 // consignmachiningInBodyDto.setWriteofftype("按备料发料核销");//核销方式，和妮姐已经确认，不用传递 consignmachiningInBodyDto.setDbizdate(generateBusinessDate);// 入库日期 - consignmachiningInBodyDto.setVdef16(bomVersion.get(0).getVersion());//BOM version +// consignmachiningInBodyDto.setVdef16(bomVersion.get(0).getVersion());//BOM version consignmachiningInBodyDtoArrayList.add(consignmachiningInBodyDto); } 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 5bc34073..d2bcc507 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 @@ -1268,7 +1268,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { summaryDimensionStr.append(NOTHING); } summaryDimensionStr.append(ADD); - + if (bdDeptdocEntity != null && bdDeptdocEntity.getDeptcode() != null) { summaryDimensionStr.append(bdDeptdocEntity.getDeptcode()); } else { diff --git a/buildpackage/src/main/resources/cfgHome/plugin/lets/spring/spring-lets-plugin.xml b/buildpackage/src/main/resources/cfgHome/plugin/lets/spring/spring-lets-plugin.xml index f816d83e..a38deef1 100644 --- a/buildpackage/src/main/resources/cfgHome/plugin/lets/spring/spring-lets-plugin.xml +++ b/buildpackage/src/main/resources/cfgHome/plugin/lets/spring/spring-lets-plugin.xml @@ -38,7 +38,7 @@ - +