From 350c71ede4216ae61ed5690fa5e9695795aee8c8 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 2 Dec 2022 10:28:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../st/instor/service/impl/HandMoveStorServiceImpl.java | 7 +++++++ .../org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql | 8 +++++++- lms/nladmin-ui/src/views/wms/st/inStor/change/AddDtl.vue | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) 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_HANDMOVESTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql index e0f53f527..1316490fc 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 @@ -191,14 +191,20 @@ 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 + + OPTION 输入.in_stor_id <> "" + struct.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()