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 a1d4e4ce..12382c4e 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 @@ -357,39 +357,38 @@ public class TransferInPluginInitializer extends PluginBaseEntity { //dbilldate 单据日期 parentvo.setDbilldate(format.substring(0, 10)); - -// //pk_defdoc4 ofs调入店铺 -// if (isReturn) {//需要反转 -// String inShop = locateShop(ofsTranseferOrder.getHeader().getCompanyCode()); -// if (inShop == null) { -// Assert.state(false, "根据调入公司:{},未查询到对应的店铺,请维护(BDDP,调拨公司对应店铺)自定义项档案。", ofsTranseferOrder.getHeader().getCompanyCode()); -// } else { -// parentvo.setPk_defdoc4(inShop); -// } -// } else { -// String inShop = locateShop(ofsTranseferOrder.getHeader().getToCompanyCode()); -// if (inShop == null) { -// Assert.state(false, "根据调入公司:{},未查询到对应的店铺,请维护(BDDP,调拨公司对应店铺)自定义项档案。", ofsTranseferOrder.getHeader().getCompanyCode()); -// } else { -// parentvo.setPk_defdoc4(inShop); -// } -// } - - //pk_defdoc1 ofs调入店铺 + //pk_defdoc1 ofs调出店铺 + //pk_defdoc4 ofs调入店铺 if (isReturn) {//需要反转 - String inShop = locateShop(ofsTranseferOrder.getHeader().getCompanyCode()); - if (inShop == null) { + String outShop = locateShop(ofsTranseferOrder.getHeader().getCompanyCode()); + if (outShop == null) { Assert.state(false, "根据调入公司:{},未查询到对应的店铺,请维护(BDDP,调拨公司对应店铺)自定义项档案。", ofsTranseferOrder.getHeader().getCompanyCode()); } else { - parentvo.setPk_defdoc1(inShop); + parentvo.setPk_defdoc4(outShop);//调入 } - } else { + String inShop = locateShop(ofsTranseferOrder.getHeader().getToCompanyCode()); if (inShop == null) { + Assert.state(false, "根据调入公司:{},未查询到对应的店铺,请维护(BDDP,调拨公司对应店铺)自定义项档案。", ofsTranseferOrder.getHeader().getToCompanyCode()); + } else { + parentvo.setPk_defdoc1(inShop);//调出 + } + + } else { + String outShop = locateShop(ofsTranseferOrder.getHeader().getCompanyCode()); + if (outShop == null) { Assert.state(false, "根据调入公司:{},未查询到对应的店铺,请维护(BDDP,调拨公司对应店铺)自定义项档案。", ofsTranseferOrder.getHeader().getCompanyCode()); } else { - parentvo.setPk_defdoc1(inShop); + parentvo.setPk_defdoc1(outShop);//调出 } + + String inShop = locateShop(ofsTranseferOrder.getHeader().getToCompanyCode()); + if (inShop == null) { + Assert.state(false, "根据调入公司:{},未查询到对应的店铺,请维护(BDDP,调拨公司对应店铺)自定义项档案。", ofsTranseferOrder.getHeader().getToCompanyCode()); + } else { + parentvo.setPk_defdoc4(inShop);//调入 + } + } //freplenishflag 销售调拨出库退回使用