root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:合同在途sql

Browse Source
This commit is contained in:
zhangzhiqiang
2023-04-03 19:42:33 +08:00
parent db4ba29b36
commit e9cced47d4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql
View File

@@ -15,8 +15,8 @@
################################################# #################################################
输入.flag TYPEAS s_string 输入.flag TYPEAS s_string
输入.ext_id TYPEAS s_string 输入.ext_id TYPEAS s_string
输入.material_id TYPEAS s_string 输入.material_id TYPEAS s_string
输入.source_name TYPEAS s_string 输入.source_name TYPEAS s_string
输入.hide TYPEAS s_string 输入.hide TYPEAS s_string
输入.pcsn TYPEAS s_string 输入.pcsn TYPEAS s_string
输入.mater_ids TYPEAS f_string 输入.mater_ids TYPEAS f_string
@@ -165,8 +165,8 @@
OPTION 输入.mater_ids <> "" OPTION 输入.mater_ids <> ""
PURCHASE.ITEM_ID in 输入.mater_ids PURCHASE.ITEM_ID in 输入.mater_ids
ENDOPTION ENDOPTION
OPTION 输入.source_name <> "" OPTION 输入.source_name <> ""
PURCHASE.NAME like 输入.source_name PURCHASE.NAME like "%" 输入.source_name "%"
ENDOPTION ENDOPTION
OPTION 输入.hide <> "" OPTION 输入.hide <> ""
1=1 HAVING sum( PURCHASE.QTY_ZT ) > 0 1=1 HAVING sum( PURCHASE.QTY_ZT ) > 0

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java
View File

@@ -579,7 +579,7 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
.setDbname("dataSource1") .setDbname("dataSource1")
.addParam("flag", "6") .addParam("flag", "6")
.addParam("material_id", ext_id) .addParam("material_id", ext_id)
.addParam("source_name", "%" + sourceName + "%") .addParam("source_name", sourceName)
.addParam("hide", hide) .addParam("hide", hide)
.addParam("mater_ids", allmaterialId) .addParam("mater_ids", allmaterialId)
.process().getResultJSONArray(0); .process().getResultJSONArray(0);