From 313ecc7597e7755897ced3c4bd7e3bae2bb9d12a Mon Sep 17 00:00:00 2001 From: "1981897232@qq.com" <1981897232@qq> Date: Sun, 4 Jan 2026 16:55:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9Acsx=20?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E9=97=B4=EF=BC=9A2025=E5=B9=B401?= =?UTF-8?q?=E6=9C=8804=E6=97=A5=20=E6=8F=90=E4=BA=A4=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=9A=E4=BA=A4=E6=98=93=E6=98=8E=E7=BB=86=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=85=B1=E4=BA=AB=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/sys/plugin/form/tsgxApiMappingBillPlugin.java | 11 +++++++++-- .../shkd/sys/sys/plugin/task/SharePushTaskPlugin.java | 10 +++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java index fd3557a..36b232c 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java @@ -68,7 +68,7 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { sourcebillnumber = shkd_sourcebill.getString("number"); QFilter dzhdqFilter=null; //要推送单据的过滤（查询单子回单默认过滤条件） - if (sourcebillnumber.equals("bei_transdetail")){//交易明细 + if (sourcebillnumber.equals("bei_transdetail_cas")){//交易明细 dzhdqFilter = new QFilter("bankdetailno", QCP.not_equals,null); }else if (sourcebillnumber.equals("sourcebillnumber")){//电子回单 dzhdqFilter = new QFilter("ismatch", QCP.equals,true); @@ -115,8 +115,9 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { res = doPost(shkd_url,headMap,saveRequestBody,null); JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 String flag = otherIsJsonRS.getString("flag"); - if ("0".equals(flag)){//失败 + if ("0".equals(flag)||"null".equals(flag)||flag==null){//失败 resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); }else { JSONArray datas = otherIsJsonRS.getJSONArray("data"); JSONObject data = datas.getJSONObject(0); @@ -132,6 +133,8 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { break; case "5": res=""; + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); break; default: System.out.println("无效的选项"); @@ -360,6 +363,10 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { value="2"; } break; + case "settlementAmount": + BigDecimal add = bei_elecreceipt.getBigDecimal("debitamount").add(bei_elecreceipt.getBigDecimal("creditamount"));//付款金额+收款金额 + value=add.toPlainString(); + break; default: break; } diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java index 8243fe3..242c174 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java @@ -50,8 +50,9 @@ public class SharePushTaskPlugin extends AbstractTask { String sourcebillnumber = ""; @Override public void execute(RequestContext requestContext, Map map) throws KDException { + Object type = map.get("type"); //获取司库电子回单推送共享系统的对应映射 - QFilter qFilter = new QFilter("shkd_name", QCP.equals,"司库电子回单推送共享系统"); + QFilter qFilter = new QFilter("shkd_name", QCP.equals,type); DynamicObject shkd_apimappingid = BusinessDataServiceHelper.loadSingle("shkd_apimapping", "id", qFilter.toArray()); if (shkd_apimappingid==null){ logger.info("未找到对应的推送接口映射"); @@ -63,7 +64,7 @@ public class SharePushTaskPlugin extends AbstractTask { sourcebillnumber = shkd_sourcebill.getString("number"); QFilter dzhdqFilter=null; //要推送单据的过滤（查询单子回单默认过滤条件） - if (sourcebillnumber.equals("bei_transdetail")){//交易明细 + if (sourcebillnumber.equals("bei_transdetail_cas")){//交易明细 dzhdqFilter = new QFilter("bankdetailno", QCP.not_equals,null); }else if (sourcebillnumber.equals("sourcebillnumber")){//电子回单 dzhdqFilter = new QFilter("ismatch", QCP.equals,true); @@ -110,7 +111,7 @@ public class SharePushTaskPlugin extends AbstractTask { res = doPost(shkd_url,headMap,saveRequestBody,null); JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 String flag = otherIsJsonRS.getString("flag"); - if ("0".equals(flag)){//失败 + if ("0".equals(flag)||"null".equals(flag)||flag==null){//失败 resultMap.put("shkd_issuccess",false);//是否成功 }else { JSONArray datas = otherIsJsonRS.getJSONArray("data"); @@ -127,6 +128,8 @@ public class SharePushTaskPlugin extends AbstractTask { break; case "5": res=""; + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); break; default: System.out.println("无效的选项"); @@ -326,6 +329,7 @@ public class SharePushTaskPlugin extends AbstractTask { "fileflag,filepath,biztype,bankcheckflag,fileserverurl,tcpurl,uploadfilename,username,password," + "bank.bank_cate bankcate", new QFilter[]{new QFilter("id", QCP.equals, bei_elecreceipt.getPkValue())}); value = ApiService.getPdfUrl(viewByDynamicObj.getPageId(), receipts, errMsgList); + value="https://www.baidu.com/";//测试链接 logger.info("单据编号："+bei_elecreceipt.getString("billno")+"对应url："+value); } break;