From 26cd748b768e874f9e6211d60a9be97f160de558 Mon Sep 17 00:00:00 2001 From: "1981897232@qq.com" <1981897232@qq> Date: Mon, 19 Jan 2026 15:22:59 +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=8819=E6=97=A5=20=E6=8F=90=E4=BA=A4=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=9A=E6=8E=A8=E9=80=81=E5=85=B1=E4=BA=AB=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java | 6 ++++-- .../java/shkd/sys/sys/plugin/operation/ShareOPPlugin.java | 7 +++---- .../java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java | 3 ++- 3 files changed, 9 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 11f950e..c23ee7b 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 @@ -14,6 +14,7 @@ import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.operation.SaveServiceHelper; import shkd.sys.sys.mservice.ApiService; +import shkd.sys.sys.utils.EmptyUtil; import java.text.ParseException; @@ -67,8 +68,9 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { 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("A"))); + dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_businessname", QCP.equals, "")); } else if (shkd_djlxbm.equals("付款状态推送")) {//付款处理 - dzhdqFilter=new QFilter("shkd_lctszt", QCP.equals, "1");//浪潮推送状态推送成功 + dzhdqFilter=new QFilter("shkd_lctszt", QCP.equals, "1").or(new QFilter("shkd_lctszt", QCP.equals, "3"));//浪潮推送状态推送成功 dzhdqFilter = dzhdqFilter.and(new QFilter("org.shkd_sfjcgx", QCP.equals, true)); dzhdqFilter = dzhdqFilter.and(new QFilter("billstatus", QCP.in, Arrays.asList("D"))); }else { @@ -78,7 +80,7 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { //自定义过滤条件 String shkd_zdygltj = shkd_apimapping.getString("shkd_zdygltj"); - if (!shkd.sys.sys.utils.EmptyUtil.isEmpty(shkd_zdygltj)) { + if (!EmptyUtil.isEmpty(shkd_zdygltj)) { QFilter zdyqFilter = null; try { zdyqFilter = getqFilter(shkd_zdygltj); diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/ShareOPPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/ShareOPPlugin.java index bc286ce..85d6d8c 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/ShareOPPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/ShareOPPlugin.java @@ -46,7 +46,6 @@ public class ShareOPPlugin extends AbstractOperationServicePlugIn { e.addValidator(new AbstractValidator() { @Override public void validate() { - String operateKey = this.getOperateKey(); ExtendedDataEntity[] dataEntities = this.getDataEntities(); QFilter qFilter = new QFilter("shkd_djlxbm", QCP.equals, "查询付款单在共享系统是否存在"); DynamicObject shkd_apimappingid = BusinessDataServiceHelper.loadSingle("shkd_apimapping", "id", qFilter.toArray()); @@ -73,20 +72,20 @@ public class ShareOPPlugin extends AbstractOperationServicePlugIn { try { otherIsJsonRS = JSONObject.parseObject(res); } catch (Exception e) { - this.addMessage(dataEntity,"单据" + dynamicObject.getString("billno") + "返回res转换json出错：" + res, ErrorLevel.Error); + this.addMessage(dataEntity,"单据" + dynamicObject.getString("billno") + "接口返回res转换json出错：" + res, ErrorLevel.Error); continue; } String flag = otherIsJsonRS.getString("flag"); if (resError(flag)) {//失败 String msg = otherIsJsonRS.getString("msg"); - this.addMessage(dataEntity,"单据" + dynamicObject.getString("billno") + "返回接收失败原因：" + msg, ErrorLevel.Error); + this.addMessage(dataEntity,"单据" + dynamicObject.getString("billno") + "接口返回接收失败原因：" + msg, ErrorLevel.Error); } else { String status = otherIsJsonRS.getString("status"); /* * 0=共享不存在该单据,1=共享存在该单据,2=共享已删除 * */ if (!Arrays.asList("0","2").contains(status)){ - this.addMessage(dataEntity,"单据" + dynamicObject.getString("billno") + "共享存在对应单据不允许删除", ErrorLevel.Error); + this.addMessage(dataEntity,"单据" + dynamicObject.getString("billno") + "共享存在对应单据不允许操作", ErrorLevel.Error); } } } 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 557cd07..f31ad51 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 @@ -67,8 +67,9 @@ public class SharePushTaskPlugin extends AbstractTask { 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("A"))); + dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_businessname", QCP.equals, "")); } else if (shkd_djlxbm.equals("付款状态推送")) {//付款处理 - dzhdqFilter=new QFilter("shkd_lctszt", QCP.equals, "1");//浪潮推送状态推送成功 + dzhdqFilter=new QFilter("shkd_lctszt", QCP.equals, "1").or(new QFilter("shkd_lctszt", QCP.equals, "3"));//浪潮推送状态推送成功 dzhdqFilter = dzhdqFilter.and(new QFilter("org.shkd_sfjcgx", QCP.equals, true)); dzhdqFilter = dzhdqFilter.and(new QFilter("billstatus", QCP.in, Arrays.asList("D"))); } else {