From df352938b92cadd3bedba6225b61a093739d3a77 Mon Sep 17 00:00:00 2001 From: csx <1981897232@qq.com> Date: Mon, 12 Jan 2026 11:37:28 +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 --- .../java/shkd/sys/sys/mservice/ApiService.java | 2 ++ .../sys/plugin/form/tsgxApiMappingBillPlugin.java | 15 ++++++++++----- .../sys/sys/plugin/task/SharePushTaskPlugin.java | 14 ++++++++++---- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/ApiService.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/ApiService.java index 72bd255..6ff9045 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/ApiService.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/ApiService.java @@ -1462,6 +1462,8 @@ public class ApiService { String thirdparty = resultMap.get("shkd_thirdpartysys").toString();//第三方系统 String issuccess = resultMap.get("shkd_issuccess").toString();//是否成功 String shkd_calldescription = resultMap.get("shkd_calldescription").toString();//调用说明 + String shkd_djlx = resultMap.get("shkd_djlx").toString();//单据类型 + String shkd_djbm = resultMap.get("shkd_djbm").toString();//单据编号 DynamicObject dynamicObject = BusinessDataServiceHelper.newDynamicObject("shkd_thirdpartylog"); // 生成随机UUID UUID uuid = UUID.randomUUID(); 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 d741f5e..c033c7e 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 @@ -66,7 +66,7 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { 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"))); + dzhdqFilter = dzhdqFilter.and(new QFilter("billstatus", QCP.in, Arrays.asList("A"))); } else { this.getView().showTipNotification("未找到匹配的单据类型"); return; @@ -83,12 +83,12 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { } dzhdqFilter = dzhdqFilter.and(zdyqFilter); } - logger.info("dzhdqFilter:" + dzhdqFilter); //映射配置过滤条件 QFilter getpeizhiqFilter=getpeizhiqFilter(shkd_apimapping); if (getpeizhiqFilter!=null){ dzhdqFilter = dzhdqFilter.and(getpeizhiqFilter); } + logger.info("dzhdqFilter:" + dzhdqFilter); DynamicObject[] bei_elecreceiptids = BusinessDataServiceHelper.load(sourcebillnumber, "id", dzhdqFilter.toArray()); logger.info("符合推送条件数据有：{}条", bei_elecreceiptids.length); @@ -251,10 +251,15 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { resultMap.put("shkd_response", res);//响应数据 resultMap.put("shkd_thirdpartysys", "浪潮");//第三方系统 resultMap.put("shkd_calldescription", "司库->浪潮");//第三方系统 - + // 属性 + String shkd_ycsx = shkd_apimapping.getString("shkd_ycsx"); + JSONObject shkd_ycsxjsonObject = JSONObject.parseObject(shkd_ycsx); + String billnoValue = shkd_ycsxjsonObject.getString("billno"); + String dateValue = shkd_ycsxjsonObject.getString("date"); // 单据类型 - - // 单据编码 + resultMap.put("shkd_djlx", sourcebillnumber); + // 单据编码(编号+日期) + resultMap.put("shkd_djbm", bei_elecreceipt.getString(billnoValue)+"___"+bei_elecreceipt.getString(dateValue)); logger.info("resultMap:" + resultMap); if (!tiaoguo) { ApiService.saveThePushLog(resultMap); 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 977f8bd..6cf7fde 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 @@ -66,7 +66,7 @@ public class SharePushTaskPlugin extends AbstractTask { 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"))); + dzhdqFilter = dzhdqFilter.and(new QFilter("billstatus", QCP.in, Arrays.asList("A"))); } else { logger.info("未找到匹配的单据类型"); return; @@ -83,13 +83,12 @@ public class SharePushTaskPlugin extends AbstractTask { } dzhdqFilter = dzhdqFilter.and(zdyqFilter); } - logger.info("dzhdqFilter:" + dzhdqFilter); - //映射配置过滤条件 QFilter getpeizhiqFilter=getpeizhiqFilter(shkd_apimapping); if (getpeizhiqFilter!=null){ dzhdqFilter = dzhdqFilter.and(getpeizhiqFilter); } + logger.info("dzhdqFilter:" + dzhdqFilter); DynamicObject[] bei_elecreceiptids = BusinessDataServiceHelper.load(sourcebillnumber, "id", dzhdqFilter.toArray()); logger.info("符合推送条件数据有：{}条", bei_elecreceiptids.length); @@ -252,9 +251,16 @@ public class SharePushTaskPlugin extends AbstractTask { resultMap.put("shkd_response", res);//响应数据 resultMap.put("shkd_thirdpartysys", "浪潮");//第三方系统 resultMap.put("shkd_calldescription", "司库->浪潮");//第三方系统 - // 单据类型 + //属性 + String shkd_ycsx = shkd_apimapping.getString("shkd_ycsx"); + JSONObject shkd_ycsxjsonObject = JSONObject.parseObject(shkd_ycsx); + String billnoValue = shkd_ycsxjsonObject.getString("billno"); + String dateValue = shkd_ycsxjsonObject.getString("date"); + // 单据类型 + resultMap.put("shkd_djlx", sourcebillnumber); // 单据编码 + resultMap.put("shkd_djbm", bei_elecreceipt.getString(billnoValue)+"___"+bei_elecreceipt.getString(dateValue)); logger.info("resultMap:" + resultMap); if (!tiaoguo) { ApiService.saveThePushLog(resultMap);