diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java index 668a65aa1..6ce64ad23 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java @@ -198,6 +198,9 @@ public class UserStorServiceImpl implements UserStorService { } } + if (ObjectUtil.isEmpty(in_stor_id)) { + in_stor_id = "('')"; + } return in_stor_id; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_SECT_ATTR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_SECT_ATTR.wql index 9826ba6be..a9b96246e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_SECT_ATTR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_SECT_ATTR.wql @@ -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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql index c22c7b2f6..c0c1c7389 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql @@ -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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql index 45c6c51ac..502a122e7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql @@ -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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql index 0e106e00f..0dc567b28 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql @@ -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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql index c76fc2724..015c20d80 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql @@ -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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql index f73316c19..b9a8c489a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql @@ -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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql index 427620dd2..fe4291b93 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql @@ -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 \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql index dd7d0466f..49633ecf6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql @@ -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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java index 967104ac3..350efd464 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java @@ -637,6 +637,13 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { if (StrUtil.isNotEmpty(map.get("pcsn"))) { map.put("pcsn", "%" + map.get("pcsn") + "%"); } + + //获取人员对应的仓库 + UserStorServiceImpl userStorService = new UserStorServiceImpl(); + String in_stor_id = userStorService.getInStor(); + + if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id",in_stor_id); + JSONObject jo = WQL.getWO("QST_IVT_HANDMOVESTOR") .addParam("flag", "3") .addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ivt2.struct_id"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHANGE.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHANGE.wql index 4031790a4..d9114ff71 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHANGE.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHANGE.wql @@ -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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql index 68557b7bf..a7d5ab395 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql @@ -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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql index e0f53f527..ea5c17f2a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql @@ -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 @@ -191,14 +191,16 @@ struct.struct_code like 输入.struct_code ENDOPTION OPTION 输入.stor_id <> "" - ivt2.stor_id = 输入.stor_id + struct.stor_id = 输入.stor_id ENDOPTION OPTION 输入.sect_id <> "" struct.sect_id = 输入.sect_id ENDOPTION + OPTION 输入.pcsn <> "" ivt2.pcsn like 输入.pcsn ENDOPTION + ENDSELECT ENDPAGEQUERY ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql index ac77fb75b..bcf93e5fc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql @@ -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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql index 283dcc434..219f0eee3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql @@ -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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/statistics/wql/SendReceiveQuery.wql b/lms/nladmin-system/src/main/java/org/nl/wms/statistics/wql/SendReceiveQuery.wql index 6aacbf200..af8b92317 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/statistics/wql/SendReceiveQuery.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/statistics/wql/SendReceiveQuery.wql @@ -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 diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDtl.vue b/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDtl.vue index da3c0a993..3162edb38 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDtl.vue +++ b/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDtl.vue @@ -95,6 +95,7 @@ import CRUD, { header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import pagination from '@crud/Pagination' import crudSectattr from '@/views/wms/basedata/st/sect/sectattr' +import crudUserStor from '@/views/wms/basedata/st/userStor/userStor' export default { name: 'AddDtl', @@ -148,7 +149,7 @@ export default { }, methods: { open() { - crudSectattr.getSect({ is_materialstore: '1' }).then(res => { + crudUserStor.getSect({ 'stor_id': '' }).then(res => { this.sects = res.content }) this.crud.toQuery() diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/change/index.vue b/lms/nladmin-ui/src/views/wms/st/inStor/change/index.vue index 33e2336bb..0f3f1e597 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/change/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/inStor/change/index.vue @@ -143,7 +143,7 @@ @select-all="onSelectAll" > { this.billtypelist = res - }), - // 查询原材料库的仓库 - crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => { - this.storlist = res.content + }) + crudUserStor.getUserStor().then(res => { + this.storlist = res }) }, methods: { diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue index 39235e149..9ab00559a 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue @@ -155,6 +155,7 @@ import { crud } from '@crud/crud' import checkoutbill from '@/views/wms/st/outbill/checkoutbill' import crudStorattr from '@/views/wms/basedata/st/stor/storattr' import crudRawAssist from '@/views/wms/st/inbill/rawassist' +import crudUserStor from '@/views/wms/basedata/st/userStor/userStor' export default { name: 'ViewDialog', @@ -196,10 +197,9 @@ export default { created() { checkoutbill.getInvTypes().then(res => { this.billtypelist = res - }), - // 查询原材料库的仓库 - crudStorattr.getStor({ 'is_productstore': '1' }).then(res => { - this.storlist = res.content + }) + crudUserStor.getUserStor().then(res => { + this.storlist = res }) }, methods: {