From e9cced47d446c3d7fafcddc2f29d42ebfff18ce4 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Mon, 3 Apr 2023 19:42:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=90=88=E5=90=8C=E5=9C=A8=E9=80=94sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/wms/ql/wql/QL_ERP.wql | 8 ++++---- .../service/impl/StatisticalReportServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql index 98490d85..302d873c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql @@ -15,8 +15,8 @@ ################################################# 输入.flag TYPEAS s_string 输入.ext_id TYPEAS s_string - 输入.material_id TYPEAS s_string - 输入.source_name TYPEAS s_string + 输入.material_id TYPEAS s_string + 输入.source_name TYPEAS s_string 输入.hide TYPEAS s_string 输入.pcsn TYPEAS s_string 输入.mater_ids TYPEAS f_string @@ -165,8 +165,8 @@ OPTION 输入.mater_ids <> "" PURCHASE.ITEM_ID in 输入.mater_ids ENDOPTION - OPTION 输入.source_name <> "" - PURCHASE.NAME like 输入.source_name + OPTION 输入.source_name <> "" + PURCHASE.NAME like "%" 输入.source_name "%" ENDOPTION OPTION 输入.hide <> "" 1=1 HAVING sum( PURCHASE.QTY_ZT ) > 0 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java index e87291f1..01e70b6b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java @@ -579,7 +579,7 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { .setDbname("dataSource1") .addParam("flag", "6") .addParam("material_id", ext_id) - .addParam("source_name", "%" + sourceName + "%") + .addParam("source_name", sourceName) .addParam("hide", hide) .addParam("mater_ids", allmaterialId) .process().getResultJSONArray(0);