refactor(sales): 重构销售出库和销售退货初始化逻辑- 在 SoSaleOutPluginInitializerToB 和 SoSaleReturnPluginInitializerToB 类中添加 replaceCompanyCode变量

- 使用 queryU8CEntityUtil.queryBdDefDocByPkDefDocList 方法获取替换后的公司代码
- 更新 BdCorpEntity 查询条件,使用替换后的公司代码
- 修改错误信息提示,使用替换后的公司代码
This commit is contained in:
liuy 2024-10-29 15:17:44 +08:00
parent cbaefcc1fb
commit ed21d4ce9d
2 changed files with 26 additions and 16 deletions

View File

@ -1017,15 +1017,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不能为空");
BdCorpEntity bdCorpEntity = new BdCorpEntity();
bdCorpEntity.setDr(0);
bdCorpEntity.setDataSourceCode("lets_u8c");
bdCorpEntity.setUnitcode(companyCode.trim());
bdCorpEntity.setUnitcode(replaceCompanyCode);
List<BdCorpEntity> bdCorpEntityList = iBdCorpDao.query(bdCorpEntity);
if (bdCorpEntityList.size() == 0) {
Assert.state(false, "根据O货主编码{}无法匹配到U8C销售公司", companyCode);
Assert.state(false, "根据O货主编码{}无法匹配到U8C销售公司", replaceCompanyCode);
} else if (bdCorpEntityList.size() >= 2) {
Assert.state(false, "根据O货主编码{}匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size());
Assert.state(false, "根据O货主编码{}匹配到U8C销售公司{}个", replaceCompanyCode, bdCorpEntityList.size());
}
// 发货库存组织
@ -1575,15 +1578,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不能为空");
BdCorpEntity bdCorpEntity = new BdCorpEntity();
bdCorpEntity.setDr(0);
bdCorpEntity.setDataSourceCode("lets_u8c");
bdCorpEntity.setUnitcode(companyCode.trim());
bdCorpEntity.setUnitcode(replaceCompanyCode);
List<BdCorpEntity> bdCorpEntityList = iBdCorpDao.query(bdCorpEntity);
if (bdCorpEntityList.size() == 0) {
Assert.state(false, "根据O货主编码{}无法匹配到U8C销售公司", companyCode);
Assert.state(false, "根据O货主编码{}无法匹配到U8C销售公司", replaceCompanyCode);
} else if (bdCorpEntityList.size() >= 2) {
Assert.state(false, "根据O货主编码{}匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size());
Assert.state(false, "根据O货主编码{}匹配到U8C销售公司{}个", replaceCompanyCode, bdCorpEntityList.size());
}
// 发货库存组织

View File

@ -963,18 +963,20 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
// 销售公司发货公司
String companyCode = header.getCompanyCode();
//测试
// companyCode = "SHLZ";
Assert.notNull(companyCode, "O表头公司不能为空");
String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim());
Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空");
BdCorpEntity bdCorpEntity = new BdCorpEntity();
bdCorpEntity.setDr(0);
bdCorpEntity.setDataSourceCode("lets_u8c");
bdCorpEntity.setUnitcode(companyCode.trim());
bdCorpEntity.setUnitcode(replaceCompanyCode);
List<BdCorpEntity> bdCorpEntityList = iBdCorpDao.query(bdCorpEntity);
if (bdCorpEntityList.size() == 0) {
Assert.state(false, "根据O货主编码{}无法匹配到U8C销售公司", companyCode);
Assert.state(false, "根据O货主编码{}无法匹配到U8C销售公司", replaceCompanyCode);
} else if (bdCorpEntityList.size() >= 2) {
Assert.state(false, "根据O货主编码{}匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size());
Assert.state(false, "根据O货主编码{}匹配到U8C销售公司{}个", replaceCompanyCode, bdCorpEntityList.size());
}
// 发货库存组织
@ -1276,18 +1278,20 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
// 销售公司发货公司
String companyCode = header.getCompanyCode();
//测试
// companyCode = "SHLZ";
Assert.notNull(companyCode, "O表头公司不能为空");
String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim());
Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空");
BdCorpEntity bdCorpEntity = new BdCorpEntity();
bdCorpEntity.setDr(0);
bdCorpEntity.setDataSourceCode("lets_u8c");
bdCorpEntity.setUnitcode(companyCode.trim());
bdCorpEntity.setUnitcode(replaceCompanyCode);
List<BdCorpEntity> bdCorpEntityList = iBdCorpDao.query(bdCorpEntity);
if (bdCorpEntityList.size() == 0) {
Assert.state(false, "根据O货主编码{}无法匹配到U8C销售公司", companyCode);
Assert.state(false, "根据O货主编码{}无法匹配到U8C销售公司", replaceCompanyCode);
} else if (bdCorpEntityList.size() >= 2) {
Assert.state(false, "根据O货主编码{}匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size());
Assert.state(false, "根据O货主编码{}匹配到U8C销售公司{}个", replaceCompanyCode, bdCorpEntityList.size());
}
// 发货库存组织