admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GOKO#73550: Zoeken op bestelaanvragen via kenmerken werkt niet goed.

Browse Source 
svn path=/Website/trunk/; revision=56786
This commit is contained in:
Maykel Geerdink
2022-08-08 09:07:21 +00:00
parent 0bf7a7c040
commit b39da6e359
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
APPL/Shared/getkenmerksql.inc
View File

@@ -256,20 +256,23 @@ function getKenmerkSql(pmodule, pkeyColumn, prequestForm)
sql_k +=((add_b || add_c) ? " OR " : "")
+ " " + tableref + "." + tablekey + (negate ? " NOT" : "") + " IN (SELECT " + tablekey2
+ " FROM " + ktable
+ (pmodule == "BES"? ", bes_kenmerk bk":"")
+ (pmodule == "CNT"? ", cnt_kenmerk ck":"")
+ (pmodule == "INS"? ", ins_kenmerk ik":"")
+ (pmodule == "MLD"? ", mld_kenmerk mk":"")
+ (pmodule == "CNT"? ", cnt_kenmerk ck":"")
+ (pmodule == "RES"? ", res_kenmerk rk":"")
+ " WHERE "
+ (pmodule == "BES"? " bk.bes_srtkenmerk_key = " + kk + " AND bk.bes_kenmerk_key = "+ktable+".bes_kenmerk_key":"")
+ (pmodule == "CNT"? " ck.cnt_srtkenmerk_key = " + kk + " AND ck.cnt_kenmerk_key = "+ktable+".cnt_kenmerk_key":"")
+ (pmodule == "INS"? " ik.ins_srtkenmerk_key = " + kk + " AND ik.ins_kenmerk_key = ins_kenmerkdeel.ins_kenmerk_key":"")
+ (pmodule == "MLD"? " mk.mld_srtkenmerk_key = " + kk + " AND mk.mld_kenmerk_key = "+ktable+".mld_kenmerk_key":"")
+ (pmodule == "CNT"? " ck.cnt_srtkenmerk_key = " + kk + " AND ck.cnt_kenmerk_key = "+ktable+".cnt_kenmerk_key":"")
+ (pmodule == "RES"? " rk.res_srtkenmerk_key = " + kk + " AND rk.res_kenmerk_key = "+ktable+".res_kenmerk_key":"")
+ (pmodule != "INS" && pmodule != "MLD" && pmodule != "CNT" && pmodule != "RES" ? pmodule.toLowerCase() + "_kenmerk_key = " + kk:"")
+ (pmodule != "BES" && pmodule != "CNT" && pmodule != "INS" && pmodule != "MLD" && pmodule != "RES" ? pmodule.toLowerCase() + "_kenmerk_key = " + kk:"")
+ " AND " + where1 + " " + where2
+ (pmodule == "BES"? " AND (bk.bes_kenmerk_omschrijving = " + safe.quoted_sql(komsch) + " OR bk.bes_kenmerk_omschrijving IS NULL)" : "")
+ (pmodule == "CNT"? " AND (ck.cnt_kenmerk_omschrijving = " + safe.quoted_sql(komsch) + " OR ck.cnt_kenmerk_omschrijving IS NULL)" : "")
+ (pmodule == "INS"? " AND (ik.ins_kenmerk_omschrijving = " + safe.quoted_sql(komsch) + " OR ik.ins_kenmerk_omschrijving IS NULL)" : "")
+ (pmodule == "MLD"? " AND (mk.mld_kenmerk_omschrijving = " + safe.quoted_sql(komsch) + " OR mk.mld_kenmerk_omschrijving IS NULL)" : "")
+ (pmodule == "CNT"? " AND (ck.cnt_kenmerk_omschrijving = " + safe.quoted_sql(komsch) + " OR ck.cnt_kenmerk_omschrijving IS NULL)" : "")
+ (pmodule == "RES"? " AND (rk.res_kenmerk_omschrijving = " + safe.quoted_sql(komsch) + " OR rk.res_kenmerk_omschrijving IS NULL)" : "")
+ andALG + andPRS
+ where3 + where4