diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java index 71ab7f9e..3b000ff4 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java @@ -301,17 +301,17 @@ public class TransferInPluginInitializer extends PluginBaseEntity { //pk_corp 公司 parentvo.setPk_corp(ofsTransferHeader.getCompanyCode()); //pk_defdoc19 自定义项19(ofs调拨订单号) - parentvo.setPk_defdoc19(ofsSourceOrderCode); + parentvo.setVuserdef19(ofsSourceOrderCode); //U8C调拨订单信息 // List toBillEntityList = queryToBillByPkVdefdoc19(ofsSourceOrderCode); //U8C调拨出库单主表信息 - List icGeneralHEntityList = queryIcGeneralHByPkVdefdoc19(ofsSourceOrderCode); + List icGeneralHEntityList = queryIcGeneralHByVdef19(ofsSourceOrderCode); if (icGeneralHEntityList == null) { - Assert.state(false, "在U8C内根据OFS调拨订单号(pk_vdefdoc19):{},没有查询到调拨出库单,请检查。", ofsSourceOrderCode); + Assert.state(false, "在U8C内根据OFS调拨订单号(vdefdoc19):{},没有查询到调拨出库单,请检查。", ofsSourceOrderCode); } if (icGeneralHEntityList.size() > 1) { - Assert.state(false, "在U8C内根据OFS调拨订单号(pk_vdefdoc19):{},查询到调拨出库单不唯一,请检查。", ofsSourceOrderCode); + Assert.state(false, "在U8C内根据OFS调拨订单号(vdefdoc19):{},查询到调拨出库单不唯一,请检查。", ofsSourceOrderCode); } IcGeneralHEntity icGeneralHEntity = icGeneralHEntityList.get(0); @@ -339,11 +339,11 @@ public class TransferInPluginInitializer extends PluginBaseEntity { for (IcGeneralBEntity icGeneralBEntity : icGeneralBEntityList) { System.out.println(icGeneralBEntity); //根据存货+行号匹配 - if (ofsTransferDetail.getRefOrderDetailId().equals(icGeneralBEntity.getPkDefdoc20().trim()) && ofsTransferDetail.getSkuCode().equals(icGeneralBEntity.getCinvbascode())) { + if (ofsTransferDetail.getRefOrderDetailId().equals(icGeneralBEntity.getVuserdef20().trim()) && ofsTransferDetail.getSkuCode().equals(icGeneralBEntity.getCinvbascode())) { //crowno 行号 childrenvo.setCrowno(i++ + "0"); //ofs来源单据行行号 - childrenvo.setPk_defdoc20(ofsTransferDetail.getRefOrderDetailId()); + childrenvo.setVuserdef20(ofsTransferDetail.getRefOrderDetailId()); //vsourcerowno 来源单据行号 childrenvo.setVsourcerowno(icGeneralBEntity.getCrowno()); break; @@ -506,10 +506,10 @@ public class TransferInPluginInitializer extends PluginBaseEntity { /** * 根据调拨出库单主表自定义项19(ofs调拨订单号)查询调拨出库单主表 */ - public List queryIcGeneralHByPkVdefdoc19(String pkDefdoc19) { + public List queryIcGeneralHByVdef19(String pkDefdoc19) { IcGeneralHEntity icGeneralHEntity = new IcGeneralHEntity(); icGeneralHEntity.setDr(0); - icGeneralHEntity.setPkDefdoc19(pkDefdoc19); + icGeneralHEntity.setVuserdef19(pkDefdoc19); icGeneralHEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE); List icGeneralHEntityList = icGeneralHDao.query(icGeneralHEntity); if (icGeneralHEntityList == null || icGeneralHEntityList.size() == 0) { 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 48ded0c9..4b355fdb 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 @@ -345,24 +345,19 @@ public class TransferOutPluginInitializer extends PluginBaseEntity { children.setNnum(BigDecimal.valueOf(Long.parseLong(ofsDetail.getShipQty()))); childrenvo.add(children); //ofs行id - children.setPk_defdoc20(ofsDetail.getId()); +// children.setPk_defdoc20(ofsDetail.getId()); children.setVbdef20(ofsDetail.getId()); - //nprice 单价,取上一次结账的单价 nmny金额 nnotaxmny无税金额 nnotaxprice 无税单价 + //nprice 单价(含税单价),取上一次结账的单价 nmny金额 nnotaxmny无税金额 nnotaxprice 无税单价 IaMonthledgerEntity iaMonthledgerEntity = queryIaMonthledger(ofsDetail, ofsTranseferOrder.getHeader().getCompanyCode()); System.out.println(iaMonthledgerEntity); if(iaMonthledgerEntity==null){ -// children.setNprice("0"); - children.setNmny("0"); + children.setNprice("0"); }else { -// children.setNprice(iaMonthledgerEntity.getNabprice()); - children.setNmny(iaMonthledgerEntity.getNabprice()); + children.setNprice(iaMonthledgerEntity.getNabprice()); } - //ntaxrate 税率 children.setNtaxrate("13"); - - } billVO.setParentvo(parentvo); billVO.setChildrenvo(childrenvo); diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java index b707cb52..3f9b8ddb 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java @@ -62,7 +62,7 @@ public class TransferTest { } @Test public void t21(){ - transferInPluginInitializer.start("LETS-RE2024091100000001"); + transferInPluginInitializer.start("LETS-RE2024090400000004"); }