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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-12-02 11:12:00 +08:00
parent 350c71ede4
commit 76679ba2a2
17 changed files with 36 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java
View File

@@ -198,6 +198,9 @@ public class UserStorServiceImpl implements UserStorService {
}
}
if (ObjectUtil.isEmpty(in_stor_id)) {
in_stor_id = "('')";
}
return in_stor_id;
}

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

@@ -52,6 +52,7 @@
left join ST_IVT_BSRealStorAttr stor on sect.stor_id = stor.stor_id
WHERE
sect.is_delete = '0'
and sect.stor_id in 输入.in_stor_id
OPTION 输入.search <> ""
(
sect.sect_code like 输入.search
@@ -64,10 +65,6 @@
sect.stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.in_stor_id <> ""
sect.stor_id in 输入.in_stor_id
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

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

@@ -81,6 +81,9 @@
stor.is_delete = '0'
AND
stor.is_used = '1'
and
stor.stor_id in 输入.in_stor_id
OPTION 输入.is_virtualstore <> ""
stor.is_virtualstore = 输入.is_virtualstore
ENDOPTION
@@ -99,9 +102,6 @@
OPTION 输入.is_reversed <> ""
stor.is_reversed = 输入.is_reversed
ENDOPTION
OPTION 输入.in_stor_id <> ""
stor.stor_id in 输入.in_stor_id
ENDOPTION
OPTION 输入.stor_id <> ""
stor.stor_id = 输入.stor_id
ENDOPTION

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

@@ -65,6 +65,7 @@
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = ivt.pcsn AND attr.storagevehicle_code = sub.package_box_sn
WHERE
1 = 1
and attr.stor_id in 输入.in_stor_id
OPTION 输入.struct <> ""
(
@@ -90,10 +91,6 @@
attr.stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.in_stor_id <> ""
attr.stor_id in 输入.in_stor_id
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

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

@@ -54,6 +54,7 @@
st_ivt_structattr struct
WHERE
struct.is_delete = '0'
and struct.stor_id in 输入.in_stor_id
OPTION 输入.search <> ""
(
struct.struct_code like 输入.search
@@ -74,9 +75,6 @@
(struct.storagevehicle_code is null or struct.storagevehicle_code = '')
ENDOPTION
OPTION 输入.in_stor_id <> ""
struct.stor_id in 输入.in_stor_id
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

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

@@ -81,6 +81,7 @@
WHERE
is_delete = '0'
AND status in ('1','3')
and stor_id in 输入.in_stor_id
OPTION 输入.check_code <> ""
check_code like 输入.check_code
@@ -90,10 +91,6 @@
stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.in_stor_id <> ""
stor_id in 输入.in_stor_id
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF

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

@@ -71,6 +71,7 @@
AND mst.is_delete = '0'
AND mst.io_type = '1'
AND mst.bill_status <> '99'
and mst.stor_id in 输入.in_stor_id
OPTION 输入.box_no <> ""
dis.box_no = 输入.box_no
@@ -84,10 +85,6 @@
mst.bill_type = 输入.bill_type
ENDOPTION
OPTION 输入.in_stor_id <> ""
mst.stor_id in 输入.in_stor_id
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF

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

@@ -57,6 +57,7 @@
AND ios.bill_status = '99'
AND ios.is_writeoff = '0'
AND ios.bill_type = '0002'
and ios.stor_id in 输入.in_stor_id
OPTION 输入.bill_code <> ""
ios.bill_code like 输入.bill_code
@@ -82,10 +83,6 @@
ios.input_time <= 输入.end_time
ENDOPTION
OPTION 输入.in_stor_id <> ""
ios.stor_id in 输入.in_stor_id
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

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

@@ -65,6 +65,8 @@
ios.is_delete = '0'
AND
ios.io_type = '0'
AND ios.stor_id in 输入.in_stor_id
OPTION 输入.bill_code <> ""
ios.bill_code like 输入.bill_code
ENDOPTION
@@ -87,10 +89,6 @@
ios.input_time <= 输入.end_time
ENDOPTION
OPTION 输入.in_stor_id <> ""
ios.stor_id in 输入.in_stor_id
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF
@@ -580,6 +578,9 @@
ios.bill_status = '99'
AND
ios.bill_type = '1001'
AND
ios.stor_id in 输入.in_stor_id
OPTION 输入.bill_code <> ""
ios.bill_code like 输入.bill_code
ENDOPTION
@@ -602,10 +603,6 @@
ios.input_time <= 输入.end_time
ENDOPTION
OPTION 输入.in_stor_id <> ""
ios.stor_id in 输入.in_stor_id
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

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

@@ -72,6 +72,8 @@
WHERE
1 = 1
AND cg.is_delete = '0'
and cg.stor_id in 输入.in_stor_id
OPTION 输入.bill_code <> ""
cg.bill_code like 输入.bill_code
ENDOPTION
@@ -97,10 +99,6 @@
cg.input_time <= 输入.end_time
ENDOPTION
OPTION 输入.in_stor_id <> ""
cg.stor_id in 输入.in_stor_id
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

5
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql
View File

@@ -71,6 +71,7 @@
ST_IVT_CheckMst checkmst
WHERE
checkmst.is_delete = '0'
and checkmst.stor_id in 输入.in_stor_id
OPTION 输入.check_code <> ""
checkmst.check_code like 输入.check_code
@@ -104,10 +105,6 @@
checkmst.input_time <= 输入.end_time
ENDOPTION
OPTION 输入.in_stor_id <> ""
checkmst.stor_id in 输入.in_stor_id
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

12
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql
View File

@@ -85,6 +85,8 @@
(mb.material_code LIKE 输入.material_code OR mb.material_name LIKE 输入.material_code)
ENDOPTION
)
AND move.stor_id in 输入.in_stor_id
OPTION 输入.bill_code <> ""
move.bill_code like 输入.bill_code
ENDOPTION
@@ -113,10 +115,6 @@
move.input_time <= 输入.end_time
ENDOPTION
OPTION 输入.in_stor_id <> ""
move.stor_id in 输入.in_stor_id
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF
@@ -178,6 +176,8 @@
WHERE
1 = 1
AND struct.lock_type = '1'
and struct.stor_id in 输入.in_stor_id
OPTION 输入.material_id <> ""
ivt2.material_id = 输入.material_id
ENDOPTION
@@ -201,10 +201,6 @@
ivt2.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.in_stor_id <> ""
struct.stor_id in 输入.in_stor_id
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

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

@@ -82,6 +82,7 @@
WHERE
ios.io_type = '1'
and ios.is_delete='0'
and ios.stor_id in 输入.in_stor_id
OPTION 输入.bill_code <> ""
ios.bill_code like 输入.bill_code
@@ -115,10 +116,6 @@
ios.input_time <= 输入.end_time
ENDOPTION
OPTION 输入.in_stor_id <> ""
ios.stor_id in 输入.in_stor_id
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

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

@@ -70,6 +70,8 @@
INNER JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
WHERE
mst.is_delete = '0'
and mst.stor_id in 输入.in_stor_id
OPTION 输入.stor_id <> ""
mst.stor_id = 输入.stor_id
ENDOPTION
@@ -122,10 +124,6 @@
)
ENDOPTION
OPTION 输入.in_stor_id <> ""
mst.stor_id in 输入.in_stor_id
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

5
lms/nladmin-system/src/main/java/org/nl/wms/statistics/wql/SendReceiveQuery.wql
View File

@@ -91,6 +91,7 @@
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = mater.base_unit_id
LEFT JOIN st_ivt_bsrealstorattr stor ON stor.stor_id = da.stor_id
WHERE 1=1
and stor.stor_id in 输入.in_stor_id
OPTION 输入.stor_id <> ""
stor.stor_id = 输入.stor_id
@@ -118,10 +119,6 @@
class.class_id in 输入.classIds
ENDOPTION
OPTION 输入.in_stor_id <> ""
stor.stor_id in 输入.in_stor_id
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF