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

代码更新

Browse Source
This commit is contained in:
liuxy
2023-01-04 14:55:31 +08:00
parent 1e66a048f9
commit dda6e6d464
15 changed files with 41 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEEXT.wql
View File

@@ -65,7 +65,7 @@
FROM FROM
md_pb_storagevehicleinfo info md_pb_storagevehicleinfo info
LEFT JOIN md_pb_storagevehicleext ext ON info.storagevehicle_id = ext.storagevehicle_id LEFT JOIN md_pb_storagevehicleext ext ON info.storagevehicle_id = ext.storagevehicle_id
LEFT JOIN sys_dict_detail d ON info.storagevehicle_type = d.value and d.name = 'storagevehicle_type' LEFT JOIN sys_dict d ON info.storagevehicle_type = d.value and d.code = 'storagevehicle_type'
LEFT JOIN MD_ME_MaterialBase mdb ON ext.material_id = mdb.material_id LEFT JOIN MD_ME_MaterialBase mdb ON ext.material_id = mdb.material_id
LEFT JOIN MD_ME_ProducMaterialExt mdp ON mdb.material_id = mdp.material_id LEFT JOIN MD_ME_ProducMaterialExt mdp ON mdb.material_id = mdp.material_id
LEFT JOIN sch_base_point point ON info.storagevehicle_code = point.vehicle_code LEFT JOIN sch_base_point point ON info.storagevehicle_code = point.vehicle_code
@@ -102,9 +102,9 @@
dict.label, dict.label,
dict.value dict.value
FROM FROM
sys_dict_detail dict sys_dict dict
WHERE WHERE
dict.name = 'storagevehicle_type' dict.code = 'storagevehicle_type'
AND dict.value in (30,31,32,33) AND dict.value in (30,31,32,33)
ENDSELECT ENDSELECT
ENDPAGEQUERY ENDPAGEQUERY

2
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEINFO.wql
View File

@@ -52,7 +52,7 @@
point.point_name point.point_name
FROM FROM
md_pb_storagevehicleinfo s md_pb_storagevehicleinfo s
LEFT JOIN sys_dict_detail d ON s.storagevehicle_type = d.value and d.dict_id = '32' LEFT JOIN sys_dict d ON s.storagevehicle_type = d.value and d.code = 'storagevehicle_type'
LEFT JOIN sch_base_point point ON point.vehicle_code = s.storagevehicle_code LEFT JOIN sch_base_point point ON point.vehicle_code = s.storagevehicle_code
LEFT JOIN ST_IVT_StructIvt ivt ON point.source_id = ivt.struct_id LEFT JOIN ST_IVT_StructIvt ivt ON point.source_id = ivt.struct_id
LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id

10
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEPOINT.wql
View File

@@ -52,7 +52,7 @@
FROM FROM
sch_base_point point sch_base_point point
LEFT JOIN md_pb_storagevehiclepoint svp ON point.point_id = svp.point_id and svp.set_type <>'02' LEFT JOIN md_pb_storagevehiclepoint svp ON point.point_id = svp.point_id and svp.set_type <>'02'
LEFT JOIN sys_dict_detail d ON svp.set_type = d.value and d.name = 'set_type' LEFT JOIN sys_dict d ON svp.set_type = d.value and d.code = 'set_type'
WHERE WHERE
point.is_delete = '0' point.is_delete = '0'
AND point.is_used = '1' AND point.is_used = '1'
@@ -77,9 +77,9 @@
dict.label, dict.label,
dict.value dict.value
FROM FROM
sys_dict_detail dict sys_dict dict
WHERE WHERE
dict.name = 'storagevehicle_type' dict.code = 'storagevehicle_type'
AND dict.value in (30,31,32,33) AND dict.value in (30,31,32,33)
ENDSELECT ENDSELECT
ENDPAGEQUERY ENDPAGEQUERY
@@ -91,9 +91,9 @@
dict.label, dict.label,
dict.value dict.value
FROM FROM
sys_dict_detail dict sys_dict dict
WHERE WHERE
dict.name = 'sch_area_type' dict.code = 'sch_area_type'
AND dict.value in (25,26,32,28) AND dict.value in (25,26,32,28)
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY

6
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_STORAGEVEHICLECLEANING.wql
View File

@@ -55,7 +55,7 @@
md_pb_storagevehicleinfo info md_pb_storagevehicleinfo info
LEFT JOIN md_pb_storagevehiclepoint svp ON info.storagevehicle_id = svp.storagevehicle_id and svp.set_type <>'01' LEFT JOIN md_pb_storagevehiclepoint svp ON info.storagevehicle_id = svp.storagevehicle_id and svp.set_type <>'01'
LEFT JOIN sch_base_point point ON point.point_id = svp.point_id LEFT JOIN sch_base_point point ON point.point_id = svp.point_id
LEFT JOIN sys_dict_detail d ON info.storagevehicle_type = d.value and d.name = 'storagevehicle_type' LEFT JOIN sys_dict d ON info.storagevehicle_type = d.value and d.code = 'storagevehicle_type'
WHERE WHERE
info.is_delete = '0' info.is_delete = '0'
AND info.is_used = '1' AND info.is_used = '1'
@@ -99,9 +99,9 @@
dict.label, dict.label,
dict.value dict.value
FROM FROM
sys_dict_detail dict sys_dict dict
WHERE WHERE
dict.name = 'storagevehicle_type' dict.code = 'storagevehicle_type'
AND dict.value in (30,31,32,33) AND dict.value in (30,31,32,33)
ENDSELECT ENDSELECT
ENDPAGEQUERY ENDPAGEQUERY

14
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql
View File

@@ -94,13 +94,13 @@
LEFT JOIN md_me_stockmaterialext s ON m.material_id = s.material_id LEFT JOIN md_me_stockmaterialext s ON m.material_id = s.material_id
LEFT JOIN md_me_producmaterialext p ON m.material_id = p.material_id LEFT JOIN md_me_producmaterialext p ON m.material_id = p.material_id
LEFT JOIN md_pb_classstandard b ON m.material_type_id = b.class_id LEFT JOIN md_pb_classstandard b ON m.material_type_id = b.class_id
LEFT JOIN sys_dict_detail d1 ON d1.value = p.product_mode and d1.name = 'product_mode' LEFT JOIN sys_dict d1 ON d1.value = p.product_mode and d1.code = 'product_mode'
LEFT JOIN sys_dict_detail d2 ON d2.value = s.is_need_plan and d2.name = 'IS_OR_NOT' LEFT JOIN sys_dict d2 ON d2.value = s.is_need_plan and d2.code = 'IS_OR_NOT'
LEFT JOIN sys_dict_detail d3 ON d3.value = s.is_report and d3.name = 'IS_OR_NOT' LEFT JOIN sys_dict d3 ON d3.value = s.is_report and d3.code = 'IS_OR_NOT'
LEFT JOIN sys_dict_detail d7 ON d7.value = p.is_report and d7.name = 'IS_OR_NOT' LEFT JOIN sys_dict d7 ON d7.value = p.is_report and d7.code = 'IS_OR_NOT'
LEFT JOIN sys_dict_detail d4 ON d4.value = p.is_auto_open and d4.name = 'IS_OR_NOT' LEFT JOIN sys_dict d4 ON d4.value = p.is_auto_open and d4.code = 'IS_OR_NOT'
LEFT JOIN sys_dict_detail d5 ON d5.value = p.is_again_put and d5.name = 'IS_OR_NOT' LEFT JOIN sys_dict d5 ON d5.value = p.is_again_put and d5.code = 'IS_OR_NOT'
LEFT JOIN sys_dict_detail d6 ON d6.value = p.product_series and d6.name = 'product_series' LEFT JOIN sys_dict d6 ON d6.value = p.product_series and d6.code = 'product_series'
LEFT JOIN md_pb_measureunit u ON u.measure_unit_id = m.base_unit_id LEFT JOIN md_pb_measureunit u ON u.measure_unit_id = m.base_unit_id
WHERE WHERE
m.is_delete = '0' m.is_delete = '0'

2
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql
View File

@@ -55,7 +55,7 @@
detail.label detail.label
FROM FROM
st_ivt_bsrealstorattr stor st_ivt_bsrealstorattr stor
LEFT JOIN sys_dict_detail detail ON detail.value = stor.stor_type_scode AND detail.dict_id = '30' LEFT JOIN sys_dict detail ON detail.value = stor.stor_type_scode AND detail.code = 'st_stor_type'
WHERE WHERE
stor.is_delete = '0' stor.is_delete = '0'
OPTION 输入.search <> "" OPTION 输入.search <> ""

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql
View File

@@ -119,9 +119,9 @@
label AS text, label AS text,
value value
FROM FROM
sys_dict_detail sys_dict
WHERE WHERE
name = 'product_area' code = 'product_area'
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY

8
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLIN.wql
View File

@@ -87,9 +87,9 @@
label AS text, label AS text,
value value
FROM FROM
sys_dict_detail sys_dict
WHERE WHERE
dict_id = '115' code = 'sch_cool_ivt_status'
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
@@ -100,9 +100,9 @@
SELECT SELECT
* *
FROM FROM
sys_dict_detail sys_dict
WHERE WHERE
name = 'task_priority' code = 'task_priority'
AND AND
label = 输入.task_type label = 输入.task_type

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLOUT.wql
View File

@@ -87,9 +87,9 @@
value, value,
label label
FROM FROM
sys_dict_detail sys_dict
WHERE WHERE
name = 'product_area' code = 'product_area'
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql
View File

@@ -149,9 +149,9 @@
label AS text, label AS text,
value value
FROM FROM
sys_dict_detail sys_dict
WHERE WHERE
name = 'ST_INV_OUT_TYPE' code = 'ST_INV_OUT_TYPE'
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql
View File

@@ -53,7 +53,7 @@
FROM FROM
sch_base_point point sch_base_point point
LEFT JOIN SCH_BASE_Region region ON point.region_id = region.region_id LEFT JOIN SCH_BASE_Region region ON point.region_id = region.region_id
LEFT JOIN sys_dict_detail d3 ON point.lock_type = d3.value and d3.name='d_lock_type' LEFT JOIN sys_dict d3 ON point.lock_type = d3.value and d3.code='d_lock_type'
WHERE WHERE
point.is_delete = '0' point.is_delete = '0'
OPTION 输入.region_id <> "" OPTION 输入.region_id <> ""

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql
View File

@@ -56,7 +56,7 @@
FROM FROM
sch_base_task task sch_base_task task
LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
LEFT JOIN sys_dict_detail dict ON dict.`value` = task.task_status AND dict.`name` = 'task_status' LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status'
WHERE WHERE
task.is_delete = '0' task.is_delete = '0'
OPTION 输入.task_type <> "" OPTION 输入.task_type <> ""

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

@@ -251,7 +251,7 @@
FROM FROM
st_ivt_iostorinvdisdtl disdtl st_ivt_iostorinvdisdtl disdtl
LEFT JOIN md_pb_bucketrecord bucket ON bucket.bucketunique = disdtl.bucketunique LEFT JOIN md_pb_bucketrecord bucket ON bucket.bucketunique = disdtl.bucketunique
LEFT JOIN sys_dict_detail detail ON detail.`value` = bucket.storagevehicle_type LEFT JOIN sys_dict detail ON detail.`value` = bucket.storagevehicle_type
INNER JOIN sys_dict dict ON dict.dict_id = detail.dict_id INNER JOIN sys_dict dict ON dict.dict_id = detail.dict_id
AND dict.`name` LIKE 'MD_BUCKET_TYPE%' AND dict.`name` LIKE 'MD_BUCKET_TYPE%'
INNER JOIN md_me_materialbase mb ON mb.material_id = bucket.material_id INNER JOIN md_me_materialbase mb ON mb.material_id = bucket.material_id
@@ -374,9 +374,7 @@
st_ivt_iostorinvdisdtl disdtl st_ivt_iostorinvdisdtl disdtl
INNER JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = disdtl.iostorinv_id INNER JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = disdtl.iostorinv_id
LEFT JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = disdtl.iostorinvdtl_id LEFT JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = disdtl.iostorinvdtl_id
LEFT JOIN sys_dict_detail detail ON detail.`value` = mst.bill_type LEFT JOIN sys_dict detail ON detail.`value` = mst.bill_type AND detail.code LIKE 'ST_INV_TYPE%'
LEFT JOIN sys_dict dict ON dict.dict_id = detail.dict_id
AND dict.`name` LIKE 'ST_INV_TYPE%'
INNER JOIN md_me_materialbase mb ON mb.material_id = disdtl.material_id INNER JOIN md_me_materialbase mb ON mb.material_id = disdtl.material_id
INNER JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id INNER JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id
WHERE WHERE

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

@@ -112,33 +112,15 @@
IF 输入.flag = "4" IF 输入.flag = "4"
QUERY QUERY
SELECT SELECT
max(detail.VALUE) AS CODE, max(value) AS CODE,
max(detail.label) AS NAME max(label) AS NAME
FROM FROM
sys_dict_detail detail sys_dict
LEFT JOIN sys_dict dict ON dict.dict_id = detail.dict_id
WHERE WHERE
1 = 1 1 = 1
AND dict. NAME LIKE '%INV_TYPE%' AND CODE LIKE '%INV_TYPE%'
group by detail.VALUE
group by value
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF
IF 输入.flag = "5"
QUERY
SELECT
detail.VALUE,
detail.label
FROM
sys_dict_detail detail
inner JOIN sys_dict dict ON dict.dict_id = detail.dict_id and dict.dict_id='6'
WHERE
1 = 1
OPTION 输入.ids <> ""
detail.VALUE in (输入.ids)
ENDOPTION
order by detail.dict_sort
ENDSELECT
ENDQUERY
ENDIF

15
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
View File

@@ -700,21 +700,6 @@
ENDQUERY ENDQUERY
ENDIF ENDIF
IF 输入.flag = "11"
QUERY
SELECT
detail.value AS code,
detail.label AS name
FROM
sys_dict_detail detail
INNER JOIN sys_dict dict ON detail.dict_id = dict.dict_id
WHERE
dict.name = 'ST_INV_TYPE_IO'
AND detail.name = 'IO_BUSS_TYPE'
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "12" IF 输入.flag = "12"
PAGEQUERY PAGEQUERY
SELECT SELECT