代码更新

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");

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

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()