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 99f37869..73f0d561 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
@@ -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());
                         }
 
                         // 发货库存组织
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 1f5bbd7b..5c71e4cf 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
@@ -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());
                     }
 
                     // 发货库存组织