From 68dd80d891442b79e75e54e78ce911aa31698457 Mon Sep 17 00:00:00 2001 From: weiyunlong Date: Thu, 22 May 2025 18:09:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96:=E7=94=B3=E8=AF=B7=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E6=8A=98=E7=BB=93=E7=AE=97=E5=B8=81=E4=B8=8D=E5=BA=94?= =?UTF-8?q?=E7=AD=89=E4=BA=8E0(=E5=8A=A8=E6=80=81=E6=8B=89=E5=8F=96SAP,?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8D=95,=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/shjh/jhzj7/fi/fi/plugin/form/SappzFormPlugin.java | 6 ++++-- .../fi/fi/plugin/task/QuerySapCreatePayApplyTask.java | 2 ++ .../shjh/jhzj7/fi/fi/webapi/ApplyAdjustBillControler.java | 7 +++++-- main/java/shjh/jhzj7/fi/fi/webapi/AspAccountControler.java | 2 ++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/form/SappzFormPlugin.java b/main/java/shjh/jhzj7/fi/fi/plugin/form/SappzFormPlugin.java index a2fd645..273ab75 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/form/SappzFormPlugin.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/form/SappzFormPlugin.java @@ -416,8 +416,8 @@ public class SappzFormPlugin extends AbstractFormPlugin { if (null != ap_payapplys) { boolean shjhSapwhetherlocking = ap_payapplys.getBoolean("shjh_sapwhetherlocking");//SAP是否锁定 if (shjhSapwhetherlocking) { - handleError("同步失败,凭证号:" + fkBillNum + "的费控单据已锁定", fkBillNum, apimenthod, null); - this.getView().showMessage("同步失败,凭证号:" + fkBillNum + "的费控单据已锁定"); + handleError("同步失败,凭证号:" + fkBillNum + "已锁定", fkBillNum, apimenthod, null); + this.getView().showMessage("同步失败,凭证号:" + fkBillNum + "已锁定"); return; } else { //存在且单据中SAP锁定状态为未锁定,更新数据 @@ -612,6 +612,8 @@ public class SappzFormPlugin extends AbstractFormPlugin { ap_payapply_entry.set("e_duedate", duedate); //分录申请金额 ap_payapply_entry.set("e_applyamount", amount); + //分录申请金额折结算币 + ap_payapply_entry.set("e_appseleamount", applyforconversionof); //表头申请金额 ap_payapply.set("applyamount", amount); diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/task/QuerySapCreatePayApplyTask.java b/main/java/shjh/jhzj7/fi/fi/plugin/task/QuerySapCreatePayApplyTask.java index 575ba30..8eaf62c 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/task/QuerySapCreatePayApplyTask.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/task/QuerySapCreatePayApplyTask.java @@ -346,6 +346,8 @@ public class QuerySapCreatePayApplyTask extends AbstractTask { ap_payapply_entry.set("e_duedate", FAEDTs); //分录申请金额 ap_payapply_entry.set("e_applyamount", amount); + //分录申请金额折结算币 + ap_payapply_entry.set("e_appseleamount", dmbtr); //表头申请金额 ap_payapply.set("applyamount", amount); diff --git a/main/java/shjh/jhzj7/fi/fi/webapi/ApplyAdjustBillControler.java b/main/java/shjh/jhzj7/fi/fi/webapi/ApplyAdjustBillControler.java index 26000d6..3d10fe9 100644 --- a/main/java/shjh/jhzj7/fi/fi/webapi/ApplyAdjustBillControler.java +++ b/main/java/shjh/jhzj7/fi/fi/webapi/ApplyAdjustBillControler.java @@ -545,7 +545,7 @@ public class ApplyAdjustBillControler { } // 设置明细信息 - String s1 = setEntryInfo(ap_payapply, asstacttype, asstact, assacct, duedate, outstandingamount, fkBillNum,org,it_list); + String s1 = setEntryInfo(ap_payapply, asstacttype, asstact, assacct, duedate, outstandingamount, fkBillNum,org,it_list,applyforconversionof); if (StringUtils.isNotEmpty(s1)) { return s1; } @@ -627,9 +627,10 @@ public class ApplyAdjustBillControler { * @param outstandingamount 未清金额 * @param fkBillNum 费控调整单号 * 付款方式 _结算 + * @param applyforconversionof * @return 操作是否成功 */ - private String setEntryInfo(DynamicObject ap_payapply, String asstacttype, String asstact, String assacct, Date duedate, BigDecimal outstandingamount, String fkBillNum,DynamicObject org,JSONObject it_list) { + private String setEntryInfo(DynamicObject ap_payapply, String asstacttype, String asstact, String assacct, Date duedate, BigDecimal outstandingamount, String fkBillNum,DynamicObject org,JSONObject it_list,BigDecimal applyforconversionof) { DynamicObjectCollection entry = ap_payapply.getDynamicObjectCollection("entry"); entry.clear(); DynamicObject ap_payapply_entry = entry.addNew(); @@ -773,6 +774,8 @@ public class ApplyAdjustBillControler { ap_payapply_entry.set("e_duedate", duedate); //分录申请金额 ap_payapply_entry.set("e_applyamount", outstandingamount); + //分录申请金额折结算币 + ap_payapply_entry.set("e_appseleamount", applyforconversionof); //表头申请金额 ap_payapply.set("applyamount", outstandingamount); diff --git a/main/java/shjh/jhzj7/fi/fi/webapi/AspAccountControler.java b/main/java/shjh/jhzj7/fi/fi/webapi/AspAccountControler.java index 262e6d6..bca345d 100644 --- a/main/java/shjh/jhzj7/fi/fi/webapi/AspAccountControler.java +++ b/main/java/shjh/jhzj7/fi/fi/webapi/AspAccountControler.java @@ -12,6 +12,7 @@ import kd.bos.context.RequestContext; import kd.bos.dataentity.OperateOption; import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObjectCollection; +import kd.bos.entity.operate.OperateOptionConst; import kd.bos.entity.operate.result.OperationResult; import kd.bos.id.ID; import kd.bos.logging.Log; @@ -89,6 +90,7 @@ public class AspAccountControler { DynamicObject parentAcctInfo; JSONObject json_body; OperateOption oop = OperateOption.create(); + oop.setVariableValue(OperateOptionConst.IGNOREWARN, String.valueOf(false)); // 不执行警告级别校验器 OperationResult operResult; Map acctids = new HashMap<>();//科目编号和ID对应关系 Map accountMaps = new HashMap<>();//将科目编号与对象关联