调整凭证参数

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

@@ -95,7 +95,7 @@ public class SyncSapFIUtils {
             DMBTR = voucher.getBigDecimal("entries.creditlocal"); //本币金额
         }
 
-        String SGTXT = voucher.getString("entries.edescription");
+        String SGTXT = StringUtils.isEmpty(voucher.getString("entries.edescription")) ? "" : voucher.getString("entries.edescription"); //凭证行项目文本
         String PRCTR = "";  //成本中心
         String PROJK = "";  //项目
         String KOSTL = ""; //部门
@@ -177,7 +177,7 @@ public class SyncSapFIUtils {
         //账套代码
         String ZZTM = "FDZT";  //法定账套
         //公司代码
-        String BUKRS = voucher.getString("org.number");
+        String BUKRS = voucher.getString("org.name");
         //币制代码
         String WAERS = StringUtils.isEmpty(voucher.getString("entries.currency.number")) ? "" : voucher.getString("entries.currency.number");
         //制单人
@@ -187,7 +187,7 @@ public class SyncSapFIUtils {
         //凭证日期
         String BUDAT = sdf.format(voucher.getDate(GlVoucherConstantInfo.BOOKEDDATE));
         //凭证摘要
-        String BKTXT = StringUtils.isEmpty(voucher.getString("description")) ?  "" :  voucher.getString("description");
+        //String BKTXT = StringUtils.isEmpty(voucher.getString("description")) ?  "" :  voucher.getString("description");
         //业务类型
         String BLART = "";
         String billtype = voucher.getString("sourcebilltype");
@@ -199,15 +199,26 @@ public class SyncSapFIUtils {
                 BLART = "BX";
                 break;
         }
+        String sourcebill = voucher.getString("sourcebill");
+
+        DynamicObject sourcebillDyn = BusinessDataServiceHelper.loadSingle(sourcebill, billtype);
+        String BKTXT = sourcebillDyn.getString("billno");
+
+        String XBLNR = StringUtils.isEmpty(voucher.getString("entries.edescription")) ? "" : voucher.getString("entries.edescription"); //凭证行项目文本
+
+        String VOUCHERID = voucher.getString("id");
 
         HEADERITEMINFO.put(SAPParamHelper.ZZTM, ZZTM);  //账套代码
-        HEADERITEMINFO.put(SAPParamHelper.BUKRS, BUKRS); //公司代码
+        HEADERITEMINFO.put(SAPParamHelper.BUKRS, BUKRS); //公司名称
         HEADERITEMINFO.put(SAPParamHelper.WAERS, WAERS); //币种
         HEADERITEMINFO.put(SAPParamHelper.BLDAT, BLDAT); //业务日期
         HEADERITEMINFO.put(SAPParamHelper.BUDAT, BUDAT); //凭证日期
         HEADERITEMINFO.put(SAPParamHelper.BKTXT, BKTXT); //凭证摘要
         HEADERITEMINFO.put(SAPParamHelper.USNAM, USNAM); //创建人
         HEADERITEMINFO.put(SAPParamHelper.BLART, BLART); //业务类型
+        HEADERITEMINFO.put(SAPParamHelper.XBLNR, XBLNR); //外部凭证编号
+        HEADERITEMINFO.put("BILLID", sourcebill); 
+        HEADERITEMINFO.put("VOUCHERID", VOUCHERID); 
 
         return HEADERITEMINFO;
     }
@@ -305,9 +316,11 @@ public class SyncSapFIUtils {
         sb.append(GlVoucherConstantInfo.VOUCHERTYPE).append(",");  //   凭证类型
         sb.append(GlVoucherConstantInfo.ORG).append(",");  //  公司
         sb.append(GlVoucherConstantInfo.ORG).append(".number").append(",");  //   公司编码
+        sb.append(GlVoucherConstantInfo.ORG).append(".name").append(",");  //   公司名称
         sb.append(GlVoucherConstantInfo.SUBMITTER).append(",");  //   制单人
         sb.append(GlVoucherConstantInfo.SUBMITTER).append(".number").append(",");  //   制单人编码
         sb.append(GlVoucherConstantInfo.SOURCEBILLTYPE).append(",");  //   来源单据类型
+        sb.append(GlVoucherConstantInfo.SOURCEBILL).append(",");  //   来源单据ID
         sb.append("entries,"); //  凭证行
         sb.append("entries.seq,");
         sb.append("entries.").append(GlVoucherConstantInfo.CURRENCY).append(",");  //  凭证行币种