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

rev：WQL DISTINCT优化

Browse Source
This commit is contained in:
liuxy
2025-02-13 10:37:58 +08:00
parent c3367a6af1
commit 9357451b18
5 changed files with 334 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java
View File

@@ -96,6 +96,10 @@ public class OutChargeServiceImpl implements OutChargeService {
map.put("end_time", end_time); map.put("end_time", end_time);
} }
if (ObjectUtil.isNotEmpty(map.get("sap_pcsn"))) {
map.put("flag", "151");
}
JSONObject json = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ios.iostorinv_id DESC"); JSONObject json = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ios.iostorinv_id DESC");
return json; return json;
} }

6
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
View File

@@ -75,7 +75,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
@Override @Override
public Map<String, Object> pageQuery(Map whereJson, Pageable page) { public Map<String, Object> pageQuery(Map whereJson, Pageable page) {
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = new HashMap<>();
map.put("flag", "1"); map.put("flag", "30");
map.put("buss_type", (String) whereJson.get("buss_type")); map.put("buss_type", (String) whereJson.get("buss_type"));
map.put("stor_id", (String) whereJson.get("stor_id")); map.put("stor_id", (String) whereJson.get("stor_id"));
map.put("bill_type", (String) whereJson.get("bill_type")); map.put("bill_type", (String) whereJson.get("bill_type"));
@@ -172,6 +172,10 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
map.put("in_stor_id", in_stor_id); map.put("in_stor_id", in_stor_id);
} }
if (ObjectUtil.isNotEmpty(map.get("sap_pcsn_in"))) {
map.put("flag", "29");
}
JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "iostorinv_id desc"); JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "iostorinv_id desc");
return jo; return jo;
} }

363
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
View File

@@ -72,7 +72,7 @@
IF 输入.flag = "1" IF 输入.flag = "1"
PAGEQUERY PAGEQUERY
SELECT DISTINCT SELECT
ios.*, ios.*,
IFNULL(dtl.vbeln,'') as vbeln IFNULL(dtl.vbeln,'') as vbeln
FROM FROM
@@ -150,6 +150,203 @@
ENDPAGEQUERY ENDPAGEQUERY
ENDIF ENDIF
IF 输入.flag = "29"
PAGEQUERY
SELECT
ios2.*,
IFNULL(dtl2.vbeln,'') as vbeln
FROM
(
SELECT
ios.*
FROM
ST_IVT_IOStorInv ios
WHERE
ios.is_delete = '0'
AND ios.io_type = '0'
AND ios.stor_id in 输入.in_stor_id
OPTION 输入.stor_id <> ""
ios.stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.bill_type <> ""
ios.bill_type = 输入.bill_type
ENDOPTION
OPTION 输入.bill_code <> ""
ios.bill_code like 输入.bill_code
ENDOPTION
OPTION 输入.create_mode <> ""
ios.create_mode = 输入.create_mode
ENDOPTION
OPTION 输入.bill_status <> ""
ios.bill_status = 输入.bill_status
ENDOPTION
OPTION 输入.begin_time <> ""
ios.input_time >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
ios.input_time <= 输入.end_time
ENDOPTION
) ios2
INNER JOIN (
SELECT
dis.iostorinv_id
FROM
st_ivt_iostorinvdis dis
LEFT JOIN pdm_bi_subpackagerelationrecord sub ON sub.container_name = dis.pcsn
WHERE
1 = 1
OPTION 输入.box_no <> ""
dis.box_no like 输入.box_no
ENDOPTION
OPTION 输入.box_no_in <> ""
dis.box_no IN 输入.box_no_in
ENDOPTION
OPTION 输入.pcsn <> ""
dis.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.pcsn_in <> ""
dis.pcsn IN 输入.pcsn_in
ENDOPTION
OPTION 输入.sap_pcsn <> ""
sub.sap_pcsn like 输入.sap_pcsn
ENDOPTION
OPTION 输入.sap_pcsn_in <> ""
sub.sap_pcsn IN 输入.sap_pcsn_in
ENDOPTION
GROUP BY dis.iostorinv_id
) dis2 ON dis2.iostorinv_id = ios2.iostorinv_id
INNER JOIN (
SELECT
dtl.iostorinv_id,
MAX( vbeln ) AS vbeln
FROM
st_ivt_iostorinvdtl dtl
WHERE
1 = 1
OPTION 输入.vbeln <> ""
dtl.vbeln like 输入.vbeln
ENDOPTION
OPTION 输入.vbeln_in <> ""
dtl.vbeln IN 输入.vbeln_in
ENDOPTION
GROUP BY
dtl.iostorinv_id
) dtl2 ON ios2.iostorinv_id = dtl2.iostorinv_id
ENDSELECT
ENDPAGEQUERY
ENDIF
IF 输入.flag = "30"
PAGEQUERY
SELECT
ios2.*,
IFNULL(dtl2.vbeln,'') as vbeln
FROM
(
SELECT
ios.*
FROM
ST_IVT_IOStorInv ios
WHERE
ios.is_delete = '0'
AND ios.io_type = '0'
AND ios.stor_id in 输入.in_stor_id
OPTION 输入.stor_id <> ""
ios.stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.bill_type <> ""
ios.bill_type = 输入.bill_type
ENDOPTION
OPTION 输入.bill_code <> ""
ios.bill_code like 输入.bill_code
ENDOPTION
OPTION 输入.create_mode <> ""
ios.create_mode = 输入.create_mode
ENDOPTION
OPTION 输入.bill_status <> ""
ios.bill_status = 输入.bill_status
ENDOPTION
OPTION 输入.begin_time <> ""
ios.input_time >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
ios.input_time <= 输入.end_time
ENDOPTION
) ios2
INNER JOIN (
SELECT
dis.iostorinv_id
FROM
st_ivt_iostorinvdis dis
WHERE
1 = 1
OPTION 输入.box_no <> ""
dis.box_no like 输入.box_no
ENDOPTION
OPTION 输入.box_no_in <> ""
dis.box_no IN 输入.box_no_in
ENDOPTION
OPTION 输入.pcsn <> ""
dis.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.pcsn_in <> ""
dis.pcsn IN 输入.pcsn_in
ENDOPTION
OPTION 输入.sap_pcsn <> ""
sub.sap_pcsn like 输入.sap_pcsn
ENDOPTION
OPTION 输入.sap_pcsn_in <> ""
sub.sap_pcsn IN 输入.sap_pcsn_in
ENDOPTION
GROUP BY dis.iostorinv_id
) dis2 ON dis2.iostorinv_id = ios2.iostorinv_id
INNER JOIN (
SELECT
dtl.iostorinv_id,
MAX( vbeln ) AS vbeln
FROM
st_ivt_iostorinvdtl dtl
WHERE
1 = 1
OPTION 输入.vbeln <> ""
dtl.vbeln like 输入.vbeln
ENDOPTION
OPTION 输入.vbeln_in <> ""
dtl.vbeln IN 输入.vbeln_in
ENDOPTION
GROUP BY
dtl.iostorinv_id
) dtl2 ON ios2.iostorinv_id = dtl2.iostorinv_id
ENDSELECT
ENDPAGEQUERY
ENDIF
IF 输入.flag = "2" IF 输入.flag = "2"
PAGEQUERY PAGEQUERY
SELECT SELECT
@@ -715,52 +912,128 @@
IF 输入.flag = "15" IF 输入.flag = "15"
PAGEQUERY PAGEQUERY
SELECT DISTINCT SELECT
ios.* ios2.*
FROM FROM
ST_IVT_IOStorInv ios (
LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinv_id = ios.iostorinv_id SELECT
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn ios.*
WHERE FROM
ios.is_delete = '0' ST_IVT_IOStorInv ios
AND WHERE
ios.io_type = '1' ios.is_delete = '0'
AND AND
ios.is_writeoff = '0' ios.io_type = '1'
AND AND
ios.bill_status = '99' ios.is_writeoff = '0'
AND AND
ios.bill_type in ('1001','1009') ios.bill_status = '99'
AND AND
ios.stor_id in 输入.in_stor_id ios.bill_type in ('1001','1009')
AND
ios.stor_id in 输入.in_stor_id
OPTION 输入.bill_code <> ""
ios.bill_code like 输入.bill_code
ENDOPTION
OPTION 输入.stor_id <> ""
ios.stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.bill_type <> ""
ios.bill_type = 输入.bill_type
ENDOPTION
OPTION 输入.create_mode <> ""
ios.create_mode = 输入.create_mode
ENDOPTION
OPTION 输入.bill_status <> ""
ios.bill_status = 输入.bill_status
ENDOPTION
OPTION 输入.begin_time <> ""
ios.input_time >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
ios.input_time <= 输入.end_time
ENDOPTION
) ios2
INNER JOIN (
SELECT
dis.iostorinv_id
FROM
st_ivt_iostorinvdis dis
WHERE
1 = 1
OPTION 输入.pcsn <> ""
dis.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.sap_pcsn <> ""
sub.sap_pcsn like 输入.sap_pcsn
ENDOPTION
GROUP BY dis.iostorinv_id
) dis2 ON dis2.iostorinv_id = ios2.iostorinv_id
OPTION 输入.bill_code <> "" ENDSELECT
ios.bill_code like 输入.bill_code ENDPAGEQUERY
ENDOPTION ENDIF
OPTION 输入.stor_id <> ""
ios.stor_id = 输入.stor_id IF 输入.flag = "151"
ENDOPTION PAGEQUERY
OPTION 输入.pcsn <> "" SELECT
dis.pcsn like 输入.pcsn ios2.*
ENDOPTION FROM
OPTION 输入.sap_pcsn <> "" (
sub.sap_pcsn like 输入.sap_pcsn SELECT
ENDOPTION ios.*
OPTION 输入.bill_type <> "" FROM
ios.bill_type = 输入.bill_type ST_IVT_IOStorInv ios
ENDOPTION WHERE
OPTION 输入.create_mode <> "" ios.is_delete = '0'
ios.create_mode = 输入.create_mode AND
ENDOPTION ios.io_type = '1'
OPTION 输入.bill_status <> "" AND
ios.bill_status = 输入.bill_status ios.is_writeoff = '0'
ENDOPTION AND
OPTION 输入.begin_time <> "" ios.bill_status = '99'
ios.input_time >= 输入.begin_time AND
ENDOPTION ios.bill_type in ('1001','1009')
OPTION 输入.end_time <> "" AND
ios.input_time <= 输入.end_time ios.stor_id in 输入.in_stor_id
ENDOPTION OPTION 输入.bill_code <> ""
ios.bill_code like 输入.bill_code
ENDOPTION
OPTION 输入.stor_id <> ""
ios.stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.bill_type <> ""
ios.bill_type = 输入.bill_type
ENDOPTION
OPTION 输入.create_mode <> ""
ios.create_mode = 输入.create_mode
ENDOPTION
OPTION 输入.bill_status <> ""
ios.bill_status = 输入.bill_status
ENDOPTION
OPTION 输入.begin_time <> ""
ios.input_time >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
ios.input_time <= 输入.end_time
ENDOPTION
) ios2
INNER JOIN (
SELECT
dis.iostorinv_id
FROM
st_ivt_iostorinvdis dis
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn
WHERE
1 = 1
OPTION 输入.pcsn <> ""
dis.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.sap_pcsn <> ""
sub.sap_pcsn like 输入.sap_pcsn
ENDOPTION
GROUP BY dis.iostorinv_id
) dis2 ON dis2.iostorinv_id = ios2.iostorinv_id
ENDSELECT ENDSELECT
ENDPAGEQUERY ENDPAGEQUERY

12
lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql
View File

@@ -53,7 +53,7 @@
IF 输入.flag = "1" IF 输入.flag = "1"
PAGEQUERY PAGEQUERY
SELECT DISTINCT SELECT
mst.stor_name, mst.stor_name,
dis.sect_name, dis.sect_name,
dis.struct_code, dis.struct_code,
@@ -212,7 +212,7 @@
IF 输入.flag = "2" IF 输入.flag = "2"
PAGEQUERY PAGEQUERY
SELECT DISTINCT SELECT
MAX(mst.stor_name) AS stor_name, MAX(mst.stor_name) AS stor_name,
MAX(dis.sect_name) AS sect_name, MAX(dis.sect_name) AS sect_name,
MAX(dis.struct_code) AS struct_code, MAX(dis.struct_code) AS struct_code,
@@ -340,7 +340,7 @@
IF 输入.flag = "3" IF 输入.flag = "3"
PAGEQUERY PAGEQUERY
SELECT DISTINCT SELECT
mst.stor_name, mst.stor_name,
dis.sect_name, dis.sect_name,
dis.struct_code, dis.struct_code,
@@ -501,7 +501,7 @@
IF 输入.flag = "4" IF 输入.flag = "4"
PAGEQUERY PAGEQUERY
SELECT DISTINCT SELECT
MAX(mst.stor_name) AS stor_name, MAX(mst.stor_name) AS stor_name,
MAX(dis.sect_name) AS sect_name, MAX(dis.sect_name) AS sect_name,
MAX(dis.struct_code) AS struct_code, MAX(dis.struct_code) AS struct_code,
@@ -631,7 +631,7 @@
IF 输入.flag = "5" IF 输入.flag = "5"
PAGEQUERY PAGEQUERY
SELECT DISTINCT SELECT
mst.stor_name, mst.stor_name,
dis.sect_name, dis.sect_name,
dis.struct_code, dis.struct_code,
@@ -832,7 +832,7 @@
IF 输入.flag = "6" IF 输入.flag = "6"
PAGEQUERY PAGEQUERY
SELECT DISTINCT SELECT
MAX(mst.stor_name) AS stor_name, MAX(mst.stor_name) AS stor_name,
MAX(dis.sect_name) AS sect_name, MAX(dis.sect_name) AS sect_name,
MAX(dis.struct_code) AS struct_code, MAX(dis.struct_code) AS struct_code,

2
lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql
View File

@@ -150,7 +150,7 @@
IF 输入.flag = "2" IF 输入.flag = "2"
PAGEQUERY PAGEQUERY
SELECT DISTINCT SELECT
mst.stor_name, mst.stor_name,
dis.sect_name, dis.sect_name,
mst.bill_type, mst.bill_type,