客户名称（khmc）会有重复，但是所属公司不同，所以匹配的时候需要将uf_jnzhmx和票据明细uf_pjskmx中的根据收款公司（skgs）、回款人（hkr）去匹配uf_hkrdzb表中的公司编码（gsbm）和客户名称（khmc）。

resource/WEB-INF/CBS2ECConfig.xml

@@ -7,6 +7,7 @@
         <field name="收款日期" key="skrq" ebsKey="bankTransactionDate"/>
         <field name="汇款人" key="hkr" ebsKey="unitName"/>
         <field name="对应客户" key="dykh" ebsKey="unitName"/>
+        <field name="收款公司" key="skgs" ebsKey="accountName"/>
         <field name="金额" key="je" ebsKey="incurredAmount"/>
     </table>
 
@@ -14,6 +15,7 @@
         <field name="收款日期" key="skrq" ebsKey="acceptorDate"/>
         <field name="汇款人" key="hkr" ebsKey="drawerName"/>
         <field name="对应客户" key="dykh" ebsKey="drawerName"/>
+        <field name="收款公司" key="skgs" ebsKey="holdOrganizationName"/>
         <field name="金额" key="je" ebsKey="billAmount"/>
         <field name="票据编号" key="pjbh" ebsKey="billNbr" unique="true"/>
         <field name="出票日期" key="cprq" ebsKey="issueDate"/>

src/com/engine/salary/timer/SyncCBSAccountDetailsJob.java

@@ -186,7 +186,7 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob {
 
             //获取汇款人与办事处的对照数据
             List<UfHkrdzbPO> ufHkrdzbPOS = getUfHkrdzbMapper().listAll();
-            Map<String, UfHkrdzbPO> customerDepartmentMap = SalaryEntityUtil.convert2Map(ufHkrdzbPOS, UfHkrdzbPO::getKhmc);
+            Map<String, UfHkrdzbPO> customerDepartmentMap = SalaryEntityUtil.convert2Map(ufHkrdzbPOS, p -> p.getGsbm() + "_" + p.getKhmc());
             List<DepartmentPO> departmentPOS = getUfHkrdzbMapper().listDepartment();
             Map<String, String> departmentMap = SalaryEntityUtil.convert2Map(departmentPOS, DepartmentPO::getCode, DepartmentPO::getId);
 
@@ -222,6 +222,7 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob {
                     add(String.format("'%s'", currTime));
                 }};
 
+                String skgs = "";
                 String hkr = "";
                 String je = "";
                 for (EBS2ECConfig.Table.Field field : table.getFields()) {
@@ -232,6 +233,11 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob {
                     String value = detailMap.getOrDefault(field.getEbsKey(), "");
                     values.add(String.format("'%s'", value));
 
+                    //收款公司
+                    if ("skgs".equals(fieldName)) {
+                        skgs = value;
+                    }
+
                     //汇款人
                     if ("hkr".equals(fieldName)) {
                         hkr = value;
@@ -254,7 +260,7 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob {
                  * 如果能匹配到数据，则状态改为已自动认领，同时把办事处（部门）的值同步到办事处字段中，是否系统自动认领同步为是；
                  * 如对照标准无数据，则状态为：未认领；
                  */
-                UfHkrdzbPO ufHkrdzbPO = customerDepartmentMap.get(hkr);
+                UfHkrdzbPO ufHkrdzbPO = customerDepartmentMap.get(skgs + "_" + hkr);
                 //币种不是人名币，国际部认领
                 String currency = detailMap.get("currency");
                 if (!"10".equals(currency)) {

src/com/engine/salary/timer/SyncCBSPayDetailsJob.java

@@ -245,7 +245,7 @@ public class SyncCBSPayDetailsJob extends BaseCronJob {
 
             //获取汇款人与办事处的对照数据
             List<UfHkrdzbPO> ufHkrdzbPOS = getUfHkrdzbMapper().listAll();
-            Map<String, UfHkrdzbPO> customerDepartmentMap = SalaryEntityUtil.convert2Map(ufHkrdzbPOS, UfHkrdzbPO::getKhmc);
+            Map<String, UfHkrdzbPO> customerDepartmentMap = SalaryEntityUtil.convert2Map(ufHkrdzbPOS, p -> p.getGsbm() + "_" + p.getKhmc());
             List<DepartmentPO> departmentPOS = getUfHkrdzbMapper().listDepartment();
             Map<String, String> departmentMap = SalaryEntityUtil.convert2Map(departmentPOS, DepartmentPO::getCode, DepartmentPO::getId);
 
@@ -280,6 +280,7 @@ public class SyncCBSPayDetailsJob extends BaseCronJob {
                     add(String.format("'%s'", currTime));
                 }};
 
+                String skgs = "";
                 String hkr = "";
                 String je = "";
                 for (EBS2ECConfig.Table.Field field : table.getFields()) {
@@ -290,6 +291,11 @@ public class SyncCBSPayDetailsJob extends BaseCronJob {
                     String value = detailMap.getOrDefault(field.getEbsKey(), "");
                     values.add(String.format("'%s'", value));
 
+                    //收款公司
+                    if ("skgs".equals(fieldName)) {
+                        skgs = value;
+                    }
+
                     //汇款人
                     if ("hkr".equals(fieldName)) {
                         hkr = value;
@@ -312,7 +318,7 @@ public class SyncCBSPayDetailsJob extends BaseCronJob {
                  * 如果能匹配到数据，则状态改为已自动认领，同时把办事处（部门）的值同步到办事处字段中，是否系统自动认领同步为是；
                  * 如对照标准无数据，则状态为：未认领；
                  */
-                UfHkrdzbPO ufHkrdzbPO = customerDepartmentMap.get(hkr);
+                UfHkrdzbPO ufHkrdzbPO = customerDepartmentMap.get(skgs + "_" + hkr);
                 if (ufHkrdzbPO != null) {
 
                     //客户属性