From c1d296f06cdb6e2f064cfbf36d140a332c6fb82b Mon Sep 17 00:00:00 2001 From: csx <1981897232@qq.com> Date: Fri, 9 Jan 2026 16:15:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=99=88?= =?UTF-8?q?=E7=BB=8D=E9=91=AB=20=E6=97=A5=E6=9C=9F=EF=BC=9A2025/01/09=2017?= =?UTF-8?q?=EF=BC=9A30=20=E5=86=85=E5=AE=B9:=E6=8E=A8=E9=80=81=E5=85=B1?= =?UTF-8?q?=E4=BA=AB=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/form/tsgxApiMappingBillPlugin.java | 16 ++++++++++++---- .../sys/sys/plugin/task/SharePushTaskPlugin.java | 9 ++++++--- 2 files changed, 18 insertions(+), 7 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 8a7495e..6543871 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 @@ -12,6 +12,8 @@ import kd.bos.logging.LogFactory; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; +import kd.bos.servicehelper.operation.SaveServiceHelper; +import shkd.sys.sys.mservice.ApiService; import java.text.ParseException; @@ -52,14 +54,14 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { if (sourcebillnumber.equals("bei_transdetail_cas")) {//交易明细 dzhdqFilter = new QFilter("bankdetailno", QCP.not_equals, null); dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_sfcgtsgx", QCP.equals, false)); - dzhdqFilter = dzhdqFilter.and(new QFilter("org.shkd_sfjcgx", QCP.equals, true)); + dzhdqFilter = dzhdqFilter.and(new QFilter("company.shkd_sfjcgx", QCP.equals, true)); } else if (sourcebillnumber.equals("bei_elecreceipt")) {//电子回单 dzhdqFilter = new QFilter("ismatch", QCP.equals, true); dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_sfcgtsgx", QCP.equals, false)); - dzhdqFilter = dzhdqFilter.and(new QFilter("org.shkd_sfjcgx", QCP.equals, true)); + dzhdqFilter = dzhdqFilter.and(new QFilter("company.shkd_sfjcgx", QCP.equals, true)); } else if (sourcebillnumber.equals("bei_bankbalance")) {//账号余额 dzhdqFilter = new QFilter("shkd_sfcgtsgx", QCP.equals, false); - dzhdqFilter = dzhdqFilter.and(new QFilter("org.shkd_sfjcgx", QCP.equals, true)); + dzhdqFilter = dzhdqFilter.and(new QFilter("company.shkd_sfjcgx", QCP.equals, true)); } else if (sourcebillnumber.equals("cas_paybill")) {//付款处理 dzhdqFilter = new QFilter("shkd_sfcgtsgx", QCP.equals, false); dzhdqFilter = dzhdqFilter.and(new QFilter("org.shkd_sfjcgx", QCP.equals, true)); @@ -95,7 +97,6 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { } DynamicObjectCollection shkd_mapping = shkd_apimapping.getDynamicObjectCollection("shkd_mapping"); - for (DynamicObject bei_elecreceiptid : bei_elecreceiptids) { DynamicObject bei_elecreceipt = BusinessDataServiceHelper.loadSingle(bei_elecreceiptid.getLong("id"), sourcebillnumber); String saveRequestBody = getJSON(bei_elecreceipt, shkd_mapping, sourcebillnumber);//请求json @@ -250,6 +251,13 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { // 单据类型 // 单据编码 + logger.info("resultMap:" + resultMap); + if (!tiaoguo) { + ApiService.saveThePushLog(resultMap); + } + bei_elecreceipt.set("shkd_tsgxrtime", new Date());//推送共享时间 + SaveServiceHelper.update(bei_elecreceipt); + } this.getView().showTipNotification("功能成功"); } 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 496db90..5e6220f 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 @@ -49,21 +49,24 @@ public class SharePushTaskPlugin extends AbstractTask { DynamicObject shkd_sourcebill = shkd_apimapping.getDynamicObject("shkd_sourcebill"); sourcebillnumber = shkd_sourcebill.getString("number"); QFilter dzhdqFilter = null; - //要推送单据的过滤 + //要推送单据的默认过滤 if (sourcebillnumber.equals("bei_transdetail_cas")) {//交易明细 dzhdqFilter = new QFilter("bankdetailno", QCP.not_equals, null); dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_sfcgtsgx", QCP.equals, false)); + dzhdqFilter = dzhdqFilter.and(new QFilter("company.shkd_sfjcgx", QCP.equals, true)); } else if (sourcebillnumber.equals("bei_elecreceipt")) {//电子回单 dzhdqFilter = new QFilter("ismatch", QCP.equals, true); dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_sfcgtsgx", QCP.equals, false)); + dzhdqFilter = dzhdqFilter.and(new QFilter("company.shkd_sfjcgx", QCP.equals, true)); } else if (sourcebillnumber.equals("bei_bankbalance")) {//账号余额 dzhdqFilter = new QFilter("shkd_sfcgtsgx", QCP.equals, false); + dzhdqFilter = dzhdqFilter.and(new QFilter("company.shkd_sfjcgx", QCP.equals, true)); } else if (sourcebillnumber.equals("cas_paybill")) {//付款处理 dzhdqFilter = new QFilter("shkd_sfcgtsgx", QCP.equals, false); dzhdqFilter = dzhdqFilter.and(new QFilter("org.shkd_sfjcgx", QCP.equals, true)); dzhdqFilter = dzhdqFilter.and(new QFilter("paymentidentify.number", QCP.equals, "FKBS01")); - dzhdqFilter = dzhdqFilter.and(new QFilter("billstatus", QCP.in,Arrays.asList("B","A"))); - }else { + dzhdqFilter = dzhdqFilter.and(new QFilter("billstatus", QCP.in, Arrays.asList("B", "A"))); + } else { logger.info("未找到匹配的单据类型"); return; }