From 74ac490c8b1007abc1d9f0a94e0f4424239bc1fb Mon Sep 17 00:00:00 2001 From: zhengyf Date: Fri, 13 Sep 2024 16:18:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E8=B0=83=E6=8B=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TransferOutPluginInitializer.java | 17 ++++---- .../hzya/frame/plugin/lets/u8cdto/BillVO.java | 23 ++++++++-- .../plugin/lets/u8cdto/GeneralBillVO.java | 42 +++++++++++++++++++ 3 files changed, 71 insertions(+), 11 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java index d184debd..48ded0c9 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java @@ -320,17 +320,17 @@ public class TransferOutPluginInitializer extends PluginBaseEntity { //vnote 备注 parentvo.setVnote(ofsTranseferOrder.getHeader().getNotes()); -// //pk_defdoc1 ofs调出店铺 +// //pk_defdoc1 ofs调出店铺 parentvo.setPk_defdoc1(ofsTranseferOrder.getHeader().getStoreCode()); -// //pk_defdoc4 ofs调入店铺 +// //pk_defdoc4 ofs调入店铺 parentvo.setPk_defdoc4(ofsTranseferOrder.getHeader().getToStoreCode()); - //pk_defdoc17 来源系统 - parentvo.setPk_defdoc17(ProfilesActiveConstant.sourceSystem1); + //vuserdef17 来源系统 + parentvo.setVdef17(ProfilesActiveConstant.sourceSystem1); - //pk_defdoc19 OFS调拨订单号 - parentvo.setPk_defdoc19(ofsTranseferOrder.getHeader().getCode()); - //pk_defdoc20 OFS调拨订单 id - parentvo.setPk_defdoc20(ofsTranseferOrder.getHeader().getId()); + //vuserdef19 OFS调拨订单号 + parentvo.setVdef19(ofsTranseferOrder.getHeader().getCode()); + //vuserdef20 OFS调拨订单 id + parentvo.setVdef20(ofsTranseferOrder.getHeader().getId()); //子表 List ofsDetails = ofsTranseferOrder.getDetails(); @@ -346,6 +346,7 @@ public class TransferOutPluginInitializer extends PluginBaseEntity { childrenvo.add(children); //ofs行id children.setPk_defdoc20(ofsDetail.getId()); + children.setVbdef20(ofsDetail.getId()); //nprice 单价，取上一次结账的单价 nmny金额 nnotaxmny无税金额 nnotaxprice 无税单价 IaMonthledgerEntity iaMonthledgerEntity = queryIaMonthledger(ofsDetail, ofsTranseferOrder.getHeader().getCompanyCode()); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/BillVO.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/BillVO.java index 5528a4f0..24686b75 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/BillVO.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/BillVO.java @@ -55,9 +55,26 @@ public class BillVO { private String ts;//ts private String vcode;//单据号 private String vnote;//备注 - - - private String vdef15;//自定义项15、、旺店通订单号 + private String vdef1; + private String vdef2; + private String vdef3; + private String vdef4; + private String vdef5; + private String vdef6; + private String vdef7; + private String vdef8; + private String vdef9; + private String vdef10; + private String vdef11; + private String vdef12; + private String vdef13; + private String vdef14; + private String vdef15; + private String vdef16; + private String vdef17; + private String vdef18; + private String vdef19; + private String vdef20; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/GeneralBillVO.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/GeneralBillVO.java index 2bed5099..179f5c2d 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/GeneralBillVO.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/GeneralBillVO.java @@ -74,6 +74,27 @@ public class GeneralBillVO { private String pk_defdoc7; private String pk_defdoc8; private String pk_defdoc9; + + private String vuserdef1; + private String vuserdef10; + private String vuserdef11; + private String vuserdef12; + private String vuserdef13; + private String vuserdef14; + private String vuserdef15; + private String vuserdef16; + private String vuserdef17; + private String vuserdef18; + private String vuserdef19; + private String vuserdef2; + private String vuserdef20; + private String vuserdef3; + private String vuserdef4; + private String vuserdef5; + private String vuserdef6; + private String vuserdef7; + private String vuserdef8; + private String vuserdef9; } @Data @@ -135,6 +156,27 @@ public class GeneralBillVO { */ private String pk_defdoc20; + private String vuserdef1; + private String vuserdef10; + private String vuserdef11; + private String vuserdef12; + private String vuserdef13; + private String vuserdef14; + private String vuserdef15; + private String vuserdef16; + private String vuserdef17; + private String vuserdef18; + private String vuserdef19; + private String vuserdef2; + private String vuserdef20; + private String vuserdef3; + private String vuserdef4; + private String vuserdef5; + private String vuserdef6; + private String vuserdef7; + private String vuserdef8; + private String vuserdef9; + } }