|
@@ -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 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(",");
|
|
|
sb.append("entries,");
|
|
|
sb.append("entries.seq,");
|
|
|
sb.append("entries.").append(GlVoucherConstantInfo.CURRENCY).append(",");
|