凭证同步 合同号

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/mservice/SyncSapFIUtils.java

@@ -89,7 +89,13 @@ public class SyncSapFIUtils {
             //上游单据编号
             DynamicObject sourcebillDyn = BusinessDataServiceHelper.loadSingle(sourcebill, billtype);
             BKTXT = sourcebillDyn.getString("billno");
-            ZUONR = BKTXT;
+            //如果有上游单据有合同号，需要取出合同号  当单据类型为对公报错单时
+            if (billtype.equals("er_publicreimbursebill")) {
+                String contractcode = sourcebillDyn.getString("contractsconn");
+                if(StringUtils.isNotEmpty(contractcode)) {
+                    ZUONR = contractcode;
+                }
+            }
         }
         String BUZEI = voucher.getString("entries.seq"); //凭证条目
         String HKONT = voucher.getString("entries.account.number"); //科目
@@ -112,7 +118,6 @@ public class SyncSapFIUtils {
         String SGTXT = StringUtils.isEmpty(voucher.getString("entries.edescription")) ? "" : voucher.getString("entries.edescription"); //凭证行项目文本
         String KOSTL = "";  //成本中心
         String PROJK = "";  //项目
-        //String KOSTL = ""; //部门  就是成本中心
         String KUNNR = "";  //客户
         String RSTGR = ""; //现金流量项目
         String LIFNR = ""; //供应商
@@ -132,9 +137,6 @@ public class SyncSapFIUtils {
         }
         //核算维度
         if(auxpropertiesMap != null && auxpropertiesMap.size() > 0){
-//            if(StringUtils.isNotEmpty(auxpropertiesMap.get("bos_adminorg"))){
-//                KOSTL = auxpropertiesMap.get("bos_adminorg");  //部门
-//            }
             if(StringUtils.isNotEmpty(auxpropertiesMap.get("bd_customer"))){
                 KUNNR = auxpropertiesMap.get("bd_customer");   //客户
             }
@@ -217,6 +219,7 @@ public class SyncSapFIUtils {
             //上游单据编号
             DynamicObject sourcebillDyn = BusinessDataServiceHelper.loadSingle(sourcebill, billtype);
             BKTXT = sourcebillDyn.getString("billno");
+
         }
 
         String XBLNR = StringUtils.isEmpty(voucher.getString("entries.edescription")) ? "" : voucher.getString("entries.edescription"); //凭证行项目文本
@@ -321,6 +324,7 @@ public class SyncSapFIUtils {
         return "0";
     }
 
+
     public static String getVoucherFieldForQuery() {
         StringBuilder sb = new StringBuilder();
         sb.append(GlVoucherConstantInfo.ID).append(",");  //  凭证号