From e3b8498afa479e8ea92bdbabd6e37635347a4f7f Mon Sep 17 00:00:00 2001 From: yuxueliang0813 <407010292@qq.com> Date: Tue, 10 Jun 2025 13:41:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E8=AE=A1=E5=88=92=E5=8F=82?= =?UTF-8?q?=E8=80=83=E6=95=B0=E5=92=8C=E5=AE=9E=E9=99=85=E6=95=B0=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E8=8C=83=E5=9B=B4=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=B8=89?= =?UTF-8?q?=E4=B8=AA=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fi/fi/plugin/task/FundPlanCollectionTask.java | 12 ++++++------ .../fi/fi/plugin/task/FundPlanPaymentTask.java | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/task/FundPlanCollectionTask.java b/main/java/shjh/jhzj7/fi/fi/plugin/task/FundPlanCollectionTask.java index e8afece..95d094d 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/task/FundPlanCollectionTask.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/task/FundPlanCollectionTask.java @@ -138,17 +138,17 @@ public class FundPlanCollectionTask extends AbstractTask implements Plugin { Calendar cal = Calendar.getInstance(); //设置日期为本月1号 cal.set(Calendar.DAY_OF_MONTH, 1); - //将日期减去一月份得到上月1号 - cal.add(Calendar.MONTH, -1); - //获取上月1号的日期 + //将日期减去二月份得到上上月1号 + cal.add(Calendar.MONTH, -2); + //获取上上月1号的日期 Date lastMonthFirstDay = cal.getTime(); //日期格式 SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); JSONArray IT_LIST = new JSONArray(); - String duedate_starts = sdf.format(lastMonthFirstDay);//TODO 上月1号-取出纳模块的当前期间的1号 + String duedate_starts = sdf.format(lastMonthFirstDay);//上月1号-后续考虑取出纳模块的当前期间的1号 String duedate_ends = sdf.format(new Date());//系统当前日期 -// addFilterCondition(IT_LIST, "BUDAT", duedate_starts, duedate_ends);//过账日期-上月和当前月 - addFilterCondition(IT_LIST, "BUDAT", "20240101", "20241231");//TODO 测试指定日期 + addFilterCondition(IT_LIST, "BUDAT", duedate_starts, duedate_ends);//过账日期-上月和当前月 +// addFilterCondition(IT_LIST, "BUDAT", "20240101", "20241231");//测试指定日期 JSONObject sapresult = SapUtils.sapARClearedDataAPI(IT_LIST, "FundPlanCollectionTask"); if(sapresult != null){ JSONObject data = sapresult.getJSONObject("data"); diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/task/FundPlanPaymentTask.java b/main/java/shjh/jhzj7/fi/fi/plugin/task/FundPlanPaymentTask.java index 263eb28..e6c3395 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/task/FundPlanPaymentTask.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/task/FundPlanPaymentTask.java @@ -82,11 +82,11 @@ public class FundPlanPaymentTask extends AbstractTask implements Plugin { //自动触发调用保存操作，现在测试出来，前台保存后，才会有这个维度分录 doinfo = BusinessDataServiceHelper.loadSingle(doinfo.getPkValue(),entityName); OperationServiceHelper.executeOperate("save", entityName, new DynamicObject[]{doinfo}, option); - try { - Thread.sleep(1000);//休眠1秒后再去加载对象 - } catch (InterruptedException e) { - throw new RuntimeException(e); - } +// try { +// Thread.sleep(1000);//休眠1秒后再去加载对象 +// } catch (InterruptedException e) { +// throw new RuntimeException(e); +// } doinfo = BusinessDataServiceHelper.loadSingle(doinfo.getPkValue(),entityName); maindimentrys = doinfo.getDynamicObjectCollection("maindimentry");//主维度分录 if(maindimentrys.isEmpty()){ @@ -165,8 +165,8 @@ public class FundPlanPaymentTask extends AbstractTask implements Plugin { //将日期加三月份得到一个季度后的1号 cal.add(Calendar.MONTH, 3); String duedate_ends = sdf.format(cal.getTime()); -// addFilterCondition(IT_LIST, "FAEDT", duedate_starts, duedate_ends);//到期日 - addFilterCondition(IT_LIST, "FAEDT", "20241101", duedate_ends);//到期日 + addFilterCondition(IT_LIST, "FAEDT", duedate_starts, duedate_ends);//到期日 +// addFilterCondition(IT_LIST, "FAEDT", "20241101", duedate_ends);//到期日 // addFilterCondition(IT_LIST, "BELNR", "1900000004", "1900000004");//测试debug 增加科目编号过滤 JSONObject sapresult = SapUtils.vouchers_payable(IT_LIST, "FundPlanPaymentTask"); if(sapresult != null){