diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/form/ASParbillFormPlugin.java b/main/java/shjh/jhzj7/fi/fi/plugin/form/ASParbillFormPlugin.java index e29bbaa..7b3e30f 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/form/ASParbillFormPlugin.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/form/ASParbillFormPlugin.java @@ -218,26 +218,7 @@ public class ASParbillFormPlugin extends AbstractFormPlugin { } } -// private void parseQueryNumber(JSONArray IT_LIST, String field, String queryText) { -// // 1. 清理输入:去除空格、中文逗号,统一用英文逗号分隔 -// String cleanedText = queryText.replaceAll("\\s+", "") // 去空格 -// .replace(",", ","); // 中文逗号转英文 -// -// // 2. 按空格拆分 -// String[] numbers = cleanedText.split(","); -// -// // 3. 遍历处理每个凭证号 -// for (String number : numbers) { -// if (number.isEmpty()) continue; -// JSONObject eqQuery = new JSONObject(); -// eqQuery.put("FIELD", field); -// eqQuery.put("SIGN", "I"); -// eqQuery.put("OPTION", "EQ"); -// eqQuery.put("LOW", number); -// eqQuery.put("HIGH", number); -// IT_LIST.add(eqQuery); -// } -// } + private void parseQueryNumber(JSONArray IT_LIST, String field, String queryText) { // 1. 只保留数字 String digitsOnly = queryText.replaceAll("[^0-9]", ""); @@ -312,6 +293,8 @@ public class ASParbillFormPlugin extends AbstractFormPlugin { this.getModel().setValue("shjh_e_gzdate", detail.getDate("BUDAT"), i);// 过账日期 this.getModel().setValue("shjh_e_unsettle", detail.getBigDecimal("DMBTR"), i);//未核销金额 this.getModel().setValue("shjh_e_year", detail.getString("GJAHR"), i);//会计年度 + this.getModel().setValue("shjh_e_text", detail.getString("SGTXT"), i);//项目文本 + this.getModel().setValue("shjh_e_fpbh", detail.getString("ZUONR"), i);//分配编号 } catch (Exception e) { logger.error("分录赋值异常: " + e.getMessage()); this.getView().showMessage("分录赋值异常!" + e.getMessage()); diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/task/RecBillToClearBillTask.java b/main/java/shjh/jhzj7/fi/fi/plugin/task/RecBillToClearBillTask.java index 5c229fa..5055a64 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/task/RecBillToClearBillTask.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/task/RecBillToClearBillTask.java @@ -44,7 +44,7 @@ public class RecBillToClearBillTask extends AbstractTask implements Plugin { // DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); // String yesterdayStr = yesterday.format(formatter); - qFilter.and(KEY_AUDIT_DATE, QCP.less_than, yesterday);//TODO 【审核日期】T+1日下推T及T之前收款单 + qFilter.and(KEY_AUDIT_DATE, QCP.less_equals, yesterday);//TODO 【审核日期】T+1日下推T及T之前收款单 DynamicObject[] collection = BusinessDataServiceHelper.load(srcEntityName, "id", qFilter.toArray()); if (collection.length != 0){