diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/operate/DepositpreintSapOperation.java b/main/java/shjh/jhzj7/fi/fi/plugin/operate/DepositpreintSapOperation.java index d3dda4c..2d79e7c 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/operate/DepositpreintSapOperation.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/operate/DepositpreintSapOperation.java @@ -180,7 +180,7 @@ public class DepositpreintSapOperation extends AbstractOperationServicePlugIn im IS_HEADER.put("BUKRS",companyCode);//公司代码 IS_HEADER.put("BLART","SA");//凭证类型-总账类凭证 IS_HEADER.put("BLDAT",sdf.format(prinfo.getDate("bizdate")));//凭证日期-业务日期 - IS_HEADER.put("BUDAT",sdf.format(prinfo.getDate("expiredate")));//过账日期-预提日期 + IS_HEADER.put("BUDAT",sdf.format(prinfo.getDate("bizdate")));//过账日期-业务日期 String isoCode = prinfo.getDynamicObject("currency").getString("number"); IS_HEADER.put("WAERS", JhzjUtils.getCurrencyCode(isoCode));//币种 IS_HEADER.put("XBLNR",prinfo.getString("billno"));//参考凭证号-单据编号 固定长度16位 diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/operate/PaybillPushSapOperation.java b/main/java/shjh/jhzj7/fi/fi/plugin/operate/PaybillPushSapOperation.java index c696f9c..2ef3a25 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/operate/PaybillPushSapOperation.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/operate/PaybillPushSapOperation.java @@ -850,10 +850,14 @@ public class PaybillPushSapOperation extends AbstractOperationServicePlugIn impl // if (null != acttradedate) { // acttradedate1 = format.format(acttradedate); // } -// IS_HEADER.put("BUDAT", acttradedate1);//todo:过账日期_实际交易日期(付款单acttradedate) +// IS_HEADER.put("BUDAT", acttradedate1);//过账日期_实际交易日期(付款单acttradedate) IS_HEADER.put("BUDAT", bizdate1);//过账日期_业务日期(付款单bizdate) String isoCode = bill.getDynamicObject("currency").getString("number"); IS_HEADER.put("WAERS", JhzjUtils.getCurrencyCode(isoCode));//币种_付款币种(付款单currency) + //如果(“异币种支付”=是 )使用异付款币种传值 + if(bill.getBoolean("isdiffcur")){ + IS_HEADER.put("WAERS", JhzjUtils.getCurrencyCode(bill.getString("dpcurrency.number"))); + } IS_HEADER.put("XBLNR", bill.getString("billno"));//参考凭证号_单据编号(付款单billno) IS_HEADER.put("BKTXT", bill.getString("payeename"));//凭证抬头文本_收款人名称(付款单payeename) //添加用户名过滤条件-操作审核按钮的用户(OA用户名) diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/operate/RevenueBillOperation.java b/main/java/shjh/jhzj7/fi/fi/plugin/operate/RevenueBillOperation.java index d50ef8f..21c6014 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/operate/RevenueBillOperation.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/operate/RevenueBillOperation.java @@ -187,7 +187,7 @@ public class RevenueBillOperation extends AbstractOperationServicePlugIn impleme IS_HEADER.put("BUKRS",companyCode);//公司代码 IS_HEADER.put("BLART","SA");//凭证类型-总账类凭证 IS_HEADER.put("BLDAT",sdf.format(prinfo.getDate("bizdate")));//凭证日期-业务日期 - IS_HEADER.put("BUDAT",sdf.format(prinfo.getDate("expiredate")));//过账日期-预提日期 + IS_HEADER.put("BUDAT",sdf.format(prinfo.getDate("bizdate")));//过账日期-业务日期 String isoCode = prinfo.getDynamicObject("currency").getString("number"); IS_HEADER.put("WAERS", JhzjUtils.getCurrencyCode(isoCode));//币种 IS_HEADER.put("XBLNR",prinfo.getString("billno"));//参考凭证号-单据编号 固定长度16位