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 b2d05bde..3718765b 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 @@ -594,12 +594,12 @@ public class ConsignmachiningIn extends PluginBaseEntity { //委外订单表头公司 String companyCode = header.getCompanyCode(); Assert.notNull(companyCode, "O表头公司不能为空(物理货主)"); - String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); +// String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); BdCorpEntity bdCorpEntity = new BdCorpEntity(); bdCorpEntity.setDr(0); bdCorpEntity.setDataSourceCode("lets_u8c"); - bdCorpEntity.setUnitcode(replaceCompanyCode); + bdCorpEntity.setUnitcode(companyCode); List bdCorpEntityList = iBdCorpDao.query(bdCorpEntity); if (bdCorpEntityList.size() == 0) { Assert.state(false, "根据O货主编码{}，无法匹配到U8C委外订单公司", companyCode); 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 92b862c5..39453c29 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 @@ -580,13 +580,13 @@ public class ConsignmachiningInReturn extends PluginBaseEntity { //得到原始的公司编码 BdCorpEntity bdCorpEntity1 = oldBdCorpEntityList.get(0); String unitcode = bdCorpEntity1.getUnitcode(); - String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(unitcode.trim()); - Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); +// String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(unitcode.trim()); +// Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); BdCorpEntity bdCorpEntity2 = new BdCorpEntity(); bdCorpEntity2.setDr(0); bdCorpEntity2.setDataSourceCode("lets_u8c"); - bdCorpEntity2.setUnitcode(replaceCompanyCode); + bdCorpEntity2.setUnitcode(unitcode); List bdCorpEntityList = iBdCorpDao.query(bdCorpEntity2); if (bdCorpEntityList.size() == 0) { Assert.state(false, "(原始公司替换之后)根据委外订单公司主键:{}，无法匹配到对应的公司", scOrderEntity.getPkCorp()); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java index 3e9bc337..09525b91 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java @@ -630,18 +630,18 @@ public class ProxyPurchaseReturn extends PluginBaseEntity { //采购公司 String companyCode = header.getCompanyCode(); Assert.notNull(companyCode, "O表头公司不能为空"); - String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); - Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); +// String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); +// Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); BdCorpEntity bdCorpEntity = new BdCorpEntity(); bdCorpEntity.setDr(0); bdCorpEntity.setDataSourceCode("lets_u8c"); - bdCorpEntity.setUnitcode(replaceCompanyCode); + bdCorpEntity.setUnitcode(companyCode); List bdCorpEntityList = iBdCorpDao.query(bdCorpEntity); if (bdCorpEntityList.size() == 0) { - Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", replaceCompanyCode); + Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", companyCode); } else if (bdCorpEntityList.size() >= 2) { - Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", replaceCompanyCode, bdCorpEntityList.size()); + Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size()); } //采购部门：业务部门 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java index 7c6ec951..db480c3c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java @@ -619,19 +619,19 @@ public class ProxyPurchaseWarehousOrder extends PluginBaseEntity { //先完成采购公司编码的转换逻辑 String companyCode = header.getCompanyCode(); Assert.notNull(companyCode, "O表头公司不能为空"); - String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); - Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); +// String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); +// Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); //采购公司 BdCorpEntity bdCorpEntity = new BdCorpEntity(); bdCorpEntity.setDr(0); bdCorpEntity.setDataSourceCode("lets_u8c"); - bdCorpEntity.setUnitcode(replaceCompanyCode); + bdCorpEntity.setUnitcode(companyCode); List bdCorpEntityList = iBdCorpDao.query(bdCorpEntity); if (bdCorpEntityList.size() == 0) { - Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", replaceCompanyCode); + Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", companyCode); } else if (bdCorpEntityList.size() >= 2) { - Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", replaceCompanyCode, bdCorpEntityList.size()); + Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size()); } //采购部门：业务部门 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 162f93df..5e8e46a2 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 @@ -634,18 +634,18 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { //采购公司 String companyCode = header.getCompanyCode(); Assert.notNull(companyCode, "O表头公司不能为空"); - String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); - Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); +// String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); +// Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); BdCorpEntity bdCorpEntity = new BdCorpEntity(); bdCorpEntity.setDr(0); bdCorpEntity.setDataSourceCode("lets_u8c"); - bdCorpEntity.setUnitcode(replaceCompanyCode); + bdCorpEntity.setUnitcode(companyCode); List bdCorpEntityList = iBdCorpDao.query(bdCorpEntity); if (bdCorpEntityList.size() == 0) { - Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", replaceCompanyCode); + Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", companyCode); } else if (bdCorpEntityList.size() >= 2) { - Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", replaceCompanyCode, bdCorpEntityList.size()); + Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size()); } //采购部门：业务部门 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java index 9871c421..9ddf3909 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java @@ -1067,18 +1067,18 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { // 销售公司、发货公司 String companyCode = header.getCompanyCode(); Assert.notNull(companyCode, "O表头公司不能为空"); - String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); - Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); +// String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); +// Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); BdCorpEntity bdCorpEntity = new BdCorpEntity(); bdCorpEntity.setDr(0); bdCorpEntity.setDataSourceCode("lets_u8c"); - bdCorpEntity.setUnitcode(replaceCompanyCode); + bdCorpEntity.setUnitcode(companyCode); List bdCorpEntityList = iBdCorpDao.query(bdCorpEntity); if (bdCorpEntityList.size() == 0) { - Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", replaceCompanyCode); + Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", companyCode); } else if (bdCorpEntityList.size() >= 2) { - Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", replaceCompanyCode, bdCorpEntityList.size()); + Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size()); } // 发货库存组织 @@ -1630,18 +1630,18 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { // header.setCompanyCode("SHLZ"); String companyCode = header.getCompanyCode(); Assert.notNull(companyCode, "O表头公司不能为空"); - String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); - Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); +// String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); +// Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); BdCorpEntity bdCorpEntity = new BdCorpEntity(); bdCorpEntity.setDr(0); bdCorpEntity.setDataSourceCode("lets_u8c"); - bdCorpEntity.setUnitcode(replaceCompanyCode); + bdCorpEntity.setUnitcode(companyCode); List bdCorpEntityList = iBdCorpDao.query(bdCorpEntity); if (bdCorpEntityList.size() == 0) { - Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", replaceCompanyCode); + Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", companyCode); } else if (bdCorpEntityList.size() >= 2) { - Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", replaceCompanyCode, bdCorpEntityList.size()); + Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size()); } // 发货库存组织 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 85ec12b3..c76b2021 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 @@ -1347,7 +1347,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { //计算OFS销售订单邮费分摊 ofsOrderSalePostageFeeAllocationUtil.batchTocSalesPostageFeeAllocation(headerDetailsDtos); //初始化公司档案对照关系 - Map comparisonCompanyArchives = queryU8CEntityUtil.queryBdDefDocByPkDefDocAll(); +// Map comparisonCompanyArchives = queryU8CEntityUtil.queryBdDefDocByPkDefDocAll(); for (int i = 0; i < headerDetailsDtoList.size(); i++) { HeaderDetailsDto headerDetailsDto = headerDetailsDtoList.get(i); @@ -1375,10 +1375,10 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { Assert.notNull(companyCode, "O出库单表头货主不能为空！"); //查找是否替换公司 - String targetCorp = comparisonCompanyArchives.get(companyCode); - if (targetCorp != null) { - companyCode = targetCorp; - } +// String targetCorp = comparisonCompanyArchives.get(companyCode); +// if (targetCorp != null) { +// companyCode = targetCorp; +// } BdCorpEntity bdCorpEntity = cacheTocMapVo.getStringBdCorpEntityMap().get(companyCode.trim()); Assert.notNull(bdCorpEntity, "根据公司编码({})没有匹配到U8C公司档案(公司编码=O货主)", companyCode); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java index 28f805be..c7c70958 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java @@ -1017,18 +1017,18 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { String companyCode = header.getCompanyCode(); Assert.notNull(companyCode, "O表头公司不能为空"); - String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); - Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); +// String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); +// Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); BdCorpEntity bdCorpEntity = new BdCorpEntity(); bdCorpEntity.setDr(0); bdCorpEntity.setDataSourceCode("lets_u8c"); - bdCorpEntity.setUnitcode(replaceCompanyCode); + bdCorpEntity.setUnitcode(companyCode); List bdCorpEntityList = iBdCorpDao.query(bdCorpEntity); if (bdCorpEntityList.size() == 0) { - Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", replaceCompanyCode); + Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", companyCode); } else if (bdCorpEntityList.size() >= 2) { - Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", replaceCompanyCode, bdCorpEntityList.size()); + Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size()); } // 发货库存组织 @@ -1334,18 +1334,18 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { String companyCode = header.getCompanyCode(); Assert.notNull(companyCode, "O表头公司不能为空"); - String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); - Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); +// String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); +// Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); BdCorpEntity bdCorpEntity = new BdCorpEntity(); bdCorpEntity.setDr(0); bdCorpEntity.setDataSourceCode("lets_u8c"); - bdCorpEntity.setUnitcode(replaceCompanyCode); + bdCorpEntity.setUnitcode(companyCode); List bdCorpEntityList = iBdCorpDao.query(bdCorpEntity); if (bdCorpEntityList.size() == 0) { - Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", replaceCompanyCode); + Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", companyCode); } else if (bdCorpEntityList.size() >= 2) { - Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", replaceCompanyCode, bdCorpEntityList.size()); + Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size()); } // 发货库存组织 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java index 3d38917f..f889584d 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java @@ -1294,7 +1294,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { //计算OFS销售订单优惠金额分摊到明细行 // ofsOrderAfterSalesAmountAllocationUtil.batchTocSalesAmountAllocation(rerturnGoodsOrderSearchData); //初始化公司档案对照关系 - Map comparisonCompanyArchives = queryU8CEntityUtil.queryBdDefDocByPkDefDocAll(); +// Map comparisonCompanyArchives = queryU8CEntityUtil.queryBdDefDocByPkDefDocAll(); //测试 // StockinOrderSearchResponse.StockinOrder stockinOrder1 = returnGoodHeaderDetailsDataDtoList1.get(0); @@ -1330,10 +1330,10 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { String companyCode = header.getCompanyCode(); Assert.notNull(companyCode, "O货主编码不能为空"); //查找是否替换公司 - String targetCorp = comparisonCompanyArchives.get(companyCode); - if (targetCorp != null) { - companyCode = targetCorp; - } +// String targetCorp = comparisonCompanyArchives.get(companyCode); +// if (targetCorp != null) { +// companyCode = targetCorp; +// } BdCorpEntity bdCorpEntity = cacheTocMapVoV2.getStringBdCorpEntityMap().get(companyCode.trim()); Assert.notNull(bdCorpEntity, "根据O公司编码(货主编码)({})没有匹配到U8C公司档案", header.getCompanyCode());