From c15e08f9af10c9f8600b6fb1746a471e3344a2ea Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Wed, 8 Jan 2025 11:01:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(buildpackage):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E7=B3=BB=E7=BB=9F=E5=92=8C=E5=8E=9F=E5=8D=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ConsignmachiningInReturn 和 ProxyPurchaseWarehousWarehouse 类中添加来源系统、原单单号和原单主键字段 - 更新 ConsignmachiningInHeadDto 和 PurchaseReceiptHeadDto 数据传输对象以包含新字段 - 修改字段名称以符合 U8C 系统的要求 --- .../lets/plugin/outsourc/ConsignmachiningInReturn.java | 4 ++++ .../purchase/ProxyPurchaseWarehousWarehouse.java | 10 +++++----- .../plugin/lets/u8cdto/ConsignmachiningInHeadDto.java | 4 ++++ .../plugin/lets/u8cdto/PurchaseReceiptHeadDto.java | 4 ++++ 4 files changed, 17 insertions(+), 5 deletions(-) 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 bbcb0e26..ed7e4852 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 @@ -427,6 +427,10 @@ public class ConsignmachiningInReturn extends PluginBaseEntity { poOrderParentDto.setDbilldate(generateBusinessDate);//入库日期 poOrderParentDto.setFreplenishflag(true);//是否退货 + poOrderParentDto.setVuserdef17(ProfilesActiveConstant.sourceSystem1);//来源系统 + poOrderParentDto.setVuserdef19(returnOrderHeaderDto.getCode());//原单单号 + poOrderParentDto.setVuserdef20(returnOrderHeaderDto.getId());//原单主键 + //委外入库表头明细行 List consignmachiningInBodyDtoArrayList = new ArrayList<>(); for (int j = 0; j < details.size(); j++) { diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java index f3cc9cad..a67d49d3 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java @@ -127,12 +127,12 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { @Override public String getPluginName() { - return "OFS采购入库单生成U8C采购订单(代理品牌)"; + return "OFS采购入库单生成U8C采购入库单(代理品牌)"; } @Override public String getPluginLabel() { - return "OFS采购入库单生成U8C采购订单(代理品牌)"; + return "OFS采购入库单生成U8C采购入库单(代理品牌)"; } @Override @@ -486,9 +486,9 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { poOrderParentDto.setPk_calbody(bdCalbodyEntity.getPkCalbody());//库存组织 poOrderParentDto.setCdispatcherid(bdRdclEntity.getPkRdcl());//收发类别 - poOrderParentDto.setVdef17(ProfilesActiveConstant.sourceSystem1);//来源系统 - poOrderParentDto.setVdef19(poOrderSonDto.getCode());//原单单号 - poOrderParentDto.setVdef20(poOrderSonDto.getId());//原单主键 + poOrderParentDto.setVuserdef17(ProfilesActiveConstant.sourceSystem1);//来源系统 + poOrderParentDto.setVuserdef19(poOrderSonDto.getCode());//原单单号 + poOrderParentDto.setVuserdef20(poOrderSonDto.getId());//原单主键 //采购入库单明细行 List purchaseReceiptBodyDtos = new ArrayList<>(); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/ConsignmachiningInHeadDto.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/ConsignmachiningInHeadDto.java index 4e14cd47..816be1c9 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/ConsignmachiningInHeadDto.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/ConsignmachiningInHeadDto.java @@ -20,4 +20,8 @@ public class ConsignmachiningInHeadDto { private String cdispatcherid; private String dbilldate; private Boolean freplenishflag; + private String vuserdef17; + private String vuserdef18; + private String vuserdef19; + private String vuserdef20; } \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PurchaseReceiptHeadDto.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PurchaseReceiptHeadDto.java index 209b79a6..d606fa8b 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PurchaseReceiptHeadDto.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PurchaseReceiptHeadDto.java @@ -54,4 +54,8 @@ public class PurchaseReceiptHeadDto { private String vdef17; private String vdef19; private String vdef20; + private String vuserdef17; + private String vuserdef18; + private String vuserdef19; + private String vuserdef20; } \ No newline at end of file