代码合并-多仓库

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserStorController.java

@@ -52,4 +52,18 @@ public class UserStorController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    @PostMapping("/getUserStor")
+    @Log("获取人员对应下拉框-普通下拉框")
+    @ApiOperation("获取人员对应下拉框-普通下拉框")
+    public ResponseEntity<Object> getUserStor() {
+        return new ResponseEntity<>(userStorService.getUserStor(),HttpStatus.OK);
+    }
+
+    @PostMapping("/getSect")
+    @Log("获取人员对应下拉框-多级下拉框")
+    @ApiOperation("获取人员对应下拉框-多级下拉框")
+    public ResponseEntity<Object> getSect() {
+        return new ResponseEntity<>(userStorService.getSect(),HttpStatus.OK);
+    }
+
 }

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/UserStorService.java

@@ -34,4 +34,13 @@ public interface UserStorService {
      */
     void save(JSONObject whereJson);
 
+    /**
+     * 获取人员对应下拉框 普通下拉框
+     */
+    JSONArray getUserStor();
+
+    /**
+     * 获取人员对应下拉框 多级下拉框
+     */
+    JSONObject getSect();
 }

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/SectattrServiceImpl.java

@@ -51,6 +51,13 @@ public class SectattrServiceImpl implements SectattrService {
         }
         map.put("flag", "1");
         map.put("stor_id", (String) whereJson.get("stor_id"));
+
+        //获取人员对应的仓库
+        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_SECT_ATTR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc");
         return jo;
     }
@@ -254,5 +261,4 @@ public class SectattrServiceImpl implements SectattrService {
         json.put("update_time", now);
         WQLObject.getWQLObject("st_ivt_structattr").update(json," sect_id = '" + sect_id + "'");
     }
-
 }

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java

@@ -57,6 +57,13 @@ public class StructattrServiceImpl implements StructattrService {
         map.put("stor_id", (String) whereJson.get("stor_id"));
         map.put("sect_id", (String) whereJson.get("sect_id"));
         map.put("lock_type", (String) whereJson.get("lock_type"));
+
+        //获取人员对应的仓库
+        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_STRUCT_ATTR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "struct_code asc");
         return jo;
     }

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java

@@ -60,6 +60,13 @@ public class StructivtServiceImpl implements StructivtService {
         if (StrUtil.isNotEmpty(sap_pcsn)) {
             map.put("sap_pcsn", "%" + sap_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 jsonObject = WQL.getWO("QST_STRUCTIVT001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ivt.instorage_time desc");
         return jsonObject;
     }

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

@@ -76,4 +76,128 @@ public class UserStorServiceImpl implements UserStorService {
             WQLObject.getWQLObject("st_ivt_userstor").insert(user_stor);
         }
     }
+
+    @Override
+    public JSONArray getUserStor() {
+        /*
+         * 获取人员对应仓库下拉框公共方法 普通下拉框
+         */
+        String currentUserId = SecurityUtils.getCurrentUserId().toString();
+
+        WQLObject userStorTab = WQLObject.getWQLObject("st_ivt_userstor");
+        WQLObject storTab = WQLObject.getWQLObject("st_ivt_bsrealstorattr");
+
+        JSONArray userStorArr = userStorTab.query("user_id = '" + currentUserId + "'").getResultJSONArray(0);
+        int size = userStorArr.size();
+        // 将仓库id拼成字符串
+        String stor_id = "";
+
+        for (int i = 0; i < userStorArr.size(); i++) {
+            JSONObject json = userStorArr.getJSONObject(i);
+
+            if (size == 1) {
+                // 如果只有一条记录
+                stor_id = "('"+json.getString("stor_id")+"')";
+            } else {
+                if (i == 0) {
+                    // 第一条记录拼接
+                    stor_id = "('"+ json.getString("stor_id")+ "','";
+                } else {
+                    if ((size -1 ) == i) {
+                        // 最后一条记录拼接
+                        stor_id += json.getString("stor_id") + "')";
+                    } else {
+                        stor_id += json.getString("stor_id") + "','";
+                    }
+                }
+            }
+        }
+
+        // 查询仓库下拉框
+        JSONArray resultJSONArray = new JSONArray();
+        if (ObjectUtil.isNotEmpty(userStorArr)) {
+            resultJSONArray = storTab.query("is_delete = '0' and is_used = '1' and stor_id in" + stor_id).getResultJSONArray(0);
+        }
+        return resultJSONArray;
+    }
+
+    @Override
+    public JSONObject getSect() {
+        /*
+         *  获取人员对应仓库下拉框公共方法 多级下拉框
+         */
+        JSONArray new_ja = new JSONArray();
+        HashMap<String, String> stor_map = new HashMap<>();
+        stor_map.put("flag", "2");
+
+        //获取人员对应的仓库
+        String in_stor_id = this.getInStor();
+        if (ObjectUtil.isNotEmpty(in_stor_id)) stor_map.put("in_stor_id",in_stor_id);
+
+        JSONArray stor_ja = WQL.getWO("QST_STOR_ATTR").addParamMap(stor_map).process().getResultJSONArray(0);
+        for (int i = 0; i < stor_ja.size(); i++) {
+            JSONObject stor_jo = stor_ja.getJSONObject(i);
+            JSONObject stor_cas = new JSONObject();
+            stor_cas.put("value", stor_jo.getString("stor_id"));
+            stor_cas.put("label", stor_jo.getString("stor_name"));
+            HashMap<String, String> map = new HashMap<>();
+            map.put("flag", "2");
+            map.put("stor_id", stor_jo.getString("stor_id"));
+//            map.put("sect_type_attr", (String) whereJson.get("sect_type_attr"));
+            JSONArray ja = WQL.getWO("QST_SECT_ATTR").addParamMap(map).process().getResultJSONArray(0);
+            if (ja.size() > 0) {
+                JSONArray sect_ja = new JSONArray();
+                for (int j = 0; j < ja.size(); j++) {
+                    JSONObject sect_jo = ja.getJSONObject(j);
+                    JSONObject sect_cas = new JSONObject();
+                    sect_cas.put("value", sect_jo.getString("sect_id"));
+                    sect_cas.put("label", sect_jo.getString("sect_name"));
+                    sect_ja.add(sect_cas);
+                }
+                stor_cas.put("children", sect_ja);
+            }
+            new_ja.add(stor_cas);
+        }
+        JSONObject jo = new JSONObject();
+        jo.put("content", new_ja);
+        return jo;
+    }
+
+    /**
+     * 获取仓库拼接公共方法
+     * @return in_stor_id /
+     */
+    public String getInStor() {
+        String currentUserId = SecurityUtils.getCurrentUserId().toString();
+        WQLObject userStorTab = WQLObject.getWQLObject("st_ivt_userstor");
+
+        JSONArray userStorArr = userStorTab.query("user_id = '" + currentUserId + "'").getResultJSONArray(0);
+        int size = userStorArr.size();
+        // 将仓库id拼成字符串
+        String in_stor_id = "";
+
+        for (int i = 0; i < userStorArr.size(); i++) {
+            JSONObject json = userStorArr.getJSONObject(i);
+
+            if (size == 1) {
+                // 如果只有一条记录
+                in_stor_id = "('"+json.getString("stor_id")+"')";
+            } else {
+                if (i == 0) {
+                    // 第一条记录拼接
+                    in_stor_id = "('"+ json.getString("stor_id")+ "','";
+                } else {
+                    if ((size -1 ) == i) {
+                        // 最后一条记录拼接
+                        in_stor_id += json.getString("stor_id") + "')";
+                    } else {
+                        in_stor_id += json.getString("stor_id") + "','";
+                    }
+                }
+            }
+        }
+
+        return in_stor_id;
+    }
+
 }

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

@@ -13,10 +13,11 @@
 	#################################################
 	##			表字段对应输入参数
 	#################################################
-	输入.flag					        TYPEAS s_string
+	输入.flag					    TYPEAS s_string
-	输入.search					        TYPEAS s_string
+	输入.search					    TYPEAS s_string
 	输入.stor_id					    TYPEAS s_string
-	输入.sect_type_attr					TYPEAS s_string
+	输入.sect_type_attr				TYPEAS s_string
+	输入.in_stor_id					TYPEAS f_string
 
 
 [临时表]
@@ -58,9 +59,15 @@
                             sect.sect_name like 输入.search
                             )
                     ENDOPTION
+
                     OPTION 输入.stor_id <> ""
                            sect.stor_id = 输入.stor_id
                     ENDOPTION
+
+                    OPTION 输入.in_stor_id <> ""
+                           sect.stor_id in 输入.in_stor_id
+                    ENDOPTION
+
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF

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

@@ -22,6 +22,7 @@
 	输入.is_attachment					            TYPEAS s_string
 	输入.is_reversed					            TYPEAS s_string
 	输入.blurry					            TYPEAS s_string
+	输入.in_stor_id					            TYPEAS f_string
 
 
 [临时表]
@@ -96,6 +97,9 @@
                         ENDOPTION
                         OPTION 输入.is_reversed <> ""
                             stor.is_reversed = 输入.is_reversed
+                        ENDOPTION
+                        OPTION 输入.in_stor_id <> ""
+                            stor.stor_id in 输入.in_stor_id
                         ENDOPTION
         			ENDSELECT
         		ENDQUERY

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

@@ -19,6 +19,7 @@
 	输入.stor_id					            TYPEAS s_string
 	输入.pcsn					            TYPEAS s_string
 	输入.sap_pcsn					        TYPEAS s_string
+	输入.in_stor_id					        TYPEAS f_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -49,6 +50,7 @@
                 attr.sect_id,
                 attr.sect_code,
                 attr.sect_name,
+                attr.stor_name,
                 point.point_code,
                 point.point_name,
                 mater.material_code,
@@ -90,6 +92,11 @@
                 OPTION 输入.stor_id <> ""
                         attr.stor_id = 输入.stor_id
                 ENDOPTION
+
+                OPTION 输入.in_stor_id <> ""
+                    attr.stor_id in 输入.in_stor_id
+                ENDOPTION
+
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF

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

@@ -22,6 +22,7 @@
     输入.is_used					            TYPEAS s_string
     输入.is_delete					        TYPEAS s_string
     输入.have_vehicle					    TYPEAS s_string
+    输入.in_stor_id					        TYPEAS f_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -72,6 +73,10 @@
                     OPTION 输入.lock_type = "1"
                            (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

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java

@@ -19,6 +19,7 @@ import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.modules.wql.util.WqlUtil;
+import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
 import org.nl.wms.sch.service.PointService;
 import org.nl.wms.st.inbill.service.InchargeService;
 import org.nl.wms.st.inbill.service.StorPublicService;
@@ -57,6 +58,12 @@ public class InchargeServiceImpl implements InchargeService {
         map.put("bill_type", MapUtil.getStr(whereJson, "bill_type"));
         if (ObjectUtil.isNotEmpty(bill_code)) map.put("bill_code","%"+bill_code + "%");
 
+        //获取人员对应的仓库
+        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 json = WQL.getWO("QST_IVT_INCHARGE").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ios.input_time DESC");
         return json;
     }

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java

@@ -18,6 +18,7 @@ import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.modules.wql.util.WqlUtil;
+import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
 import org.nl.wms.pdm.service.DeviceService;
 import org.nl.wms.pdm.service.dto.DeviceDto;
 import org.nl.wms.st.inbill.service.OutChargeService;
@@ -55,6 +56,7 @@ public class OutChargeServiceImpl implements OutChargeService {
         HashMap<String, String> map = new HashMap<>();
         map.put("flag", "15");
         map.put("bill_status", MapUtil.getStr(whereJson, "bill_status"));
+        map.put("stor_id", MapUtil.getStr(whereJson, "stor_id"));
         if (ObjectUtil.isNotEmpty(bill_code)) map.put("bill_code", bill_code + "%");
         if (ObjectUtil.isNotEmpty(vehicle_code)) map.put("vehicle_code", vehicle_code + "%");
         if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code", material_code + "%");
@@ -64,6 +66,12 @@ public class OutChargeServiceImpl implements OutChargeService {
         if (ObjectUtil.isNotEmpty(start_region_code)) map.put("start_region_code", start_region_code + "%");
         if (ObjectUtil.isNotEmpty(end_region_code)) map.put("end_region_code", end_region_code + "%");
 
+        //获取人员对应的仓库
+        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 json = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ios.bill_code DESC");
         return json;
     }

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java

@@ -23,6 +23,7 @@ import org.nl.wms.basedata.st.service.StorattrService;
 import org.nl.wms.basedata.st.service.StructattrService;
 import org.nl.wms.basedata.st.service.dto.StorattrDto;
 import org.nl.wms.basedata.st.service.dto.StructattrDto;
+import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.service.PointService;
 import org.nl.wms.sch.service.TaskService;
@@ -83,6 +84,12 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
             map.put("end_time", end_time);
         }
 
+        //获取人员对应的仓库
+        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_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "bill_code desc");
         return jo;
     }

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

@@ -20,6 +20,7 @@
     输入.stor_id					        TYPEAS s_string
     输入.create_mode					    TYPEAS s_string
     输入.bill_type					    TYPEAS s_string
+    输入.in_stor_id					    TYPEAS f_string
 
 
 [临时表]
@@ -81,6 +82,10 @@
                 ios.input_time <= 输入.end_time
             ENDOPTION
 
+            OPTION 输入.in_stor_id <> ""
+                ios.stor_id in 输入.in_stor_id
+            ENDOPTION
+
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF

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

@@ -30,6 +30,7 @@
     输入.material_code   			    TYPEAS s_string
     输入.sect_id         			    TYPEAS s_string
     输入.sql_str    			            TYPEAS f_string
+    输入.in_stor_id    			        TYPEAS f_string
 
 
 [临时表]
@@ -85,6 +86,11 @@
             OPTION 输入.end_time <> ""
                 ios.input_time <= 输入.end_time
             ENDOPTION
+
+              OPTION 输入.in_stor_id <> ""
+                ios.stor_id in 输入.in_stor_id
+              ENDOPTION
+
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF
@@ -595,6 +601,11 @@
                   OPTION 输入.end_time <> ""
                       ios.input_time <= 输入.end_time
                   ENDOPTION
+
+                  OPTION 输入.in_stor_id <> ""
+                    ios.stor_id in 输入.in_stor_id
+                  ENDOPTION
+
                 ENDSELECT
             ENDPAGEQUERY
         ENDIF

lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java

@@ -15,6 +15,7 @@ import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
+import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.nl.wms.st.inbill.service.StorPublicService;
 import org.nl.wms.st.instor.service.ChangeService;
@@ -50,6 +51,13 @@ public class ChangeServiceImpl implements ChangeService {
         if (StrUtil.isNotEmpty(map.get("buss_type"))) {
             map.put("buss_type", whereJson.get("buss_type") + "%");
         }
+
+        //获取人员对应的仓库
+        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_CHANGE").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "bill_code desc");
         return jo;
     }

lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java

@@ -15,6 +15,7 @@ import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
+import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
 import org.nl.wms.st.inbill.service.StorPublicService;
 import org.nl.wms.st.instor.service.CheckService;
 import org.nl.wms.st.instor.task.HandMoveStorAcsTask;
@@ -47,6 +48,13 @@ public class CheckServiceImpl implements CheckService {
         if (StrUtil.isNotEmpty(map.get("buss_type"))) {
             map.put("buss_type", whereJson.get("buss_type") + "%");
         }
+
+        //获取人员对应的仓库
+        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_CHECK").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "check_code desc");
         return jo;
     }

lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java

@@ -15,6 +15,7 @@ import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
+import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.nl.wms.sch.tasks.OutTask;
 import org.nl.wms.st.inbill.service.CheckOutBillService;
@@ -52,6 +53,13 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
         if (StrUtil.isNotEmpty(map.get("buss_type"))) {
             map.put("buss_type", whereJson.get("buss_type") + "%");
         }
+
+        //获取人员对应的仓库
+        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").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "bill_code desc");
         return jo;
     }

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

@@ -39,6 +39,7 @@
     输入.struct_code				        TYPEAS s_string
     输入.ids				        TYPEAS f_string
     输入.deptIds                           TYPEAS f_string
+    输入.in_stor_id                           TYPEAS f_string
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
 
@@ -95,6 +96,11 @@
                OPTION 输入.end_time <> ""
                    cg.input_time <= 输入.end_time
                ENDOPTION
+
+                OPTION 输入.in_stor_id <> ""
+                    cg.stor_id in 输入.in_stor_id
+                ENDOPTION
+
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF

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

@@ -39,6 +39,7 @@
     输入.ids				        TYPEAS f_string
     输入.storagevehicle_code				        TYPEAS s_string
     输入.deptIds                           TYPEAS f_string
+    输入.in_stor_id                           TYPEAS f_string
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
 
@@ -103,6 +104,10 @@
                    checkmst.input_time <= 输入.end_time
                ENDOPTION
 
+               OPTION 输入.in_stor_id <> ""
+                   checkmst.stor_id in 输入.in_stor_id
+               ENDOPTION
+
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF

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

@@ -40,6 +40,7 @@
     输入.struct_code				        TYPEAS s_string
     输入.ids				        TYPEAS f_string
     输入.deptIds                           TYPEAS f_string
+    输入.in_stor_id					    TYPEAS f_string
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
 
@@ -111,6 +112,11 @@
                OPTION 输入.end_time <> ""
                    move.input_time <= 输入.end_time
                ENDOPTION
+
+                OPTION 输入.in_stor_id <> ""
+                   move.stor_id in 输入.in_stor_id
+                ENDOPTION
+
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java

@@ -22,6 +22,7 @@ import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.modules.wql.util.WqlUtil;
+import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
 import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl;
 import org.nl.wms.ext.sap.service.impl.LmsToSapServiceImpl;
 import org.nl.wms.pda.mps.eum.RegionTypeEnum;
@@ -78,6 +79,13 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         if (StrUtil.isNotEmpty(map.get("material_code"))) {
             map.put("material_code", "%" + map.get("material_code") + "%");
         }
+
+        //获取人员对应的仓库
+        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_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "bill_code desc");
         return jo;
     }

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

@@ -46,6 +46,7 @@
     输入.box_no                           TYPEAS s_string
     输入.canuse_qty                           TYPEAS s_string
     输入.sap_pcsn                           TYPEAS s_string
+    输入.in_stor_id                           TYPEAS f_string
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
 
@@ -114,6 +115,10 @@
                    ios.input_time <= 输入.end_time
                ENDOPTION
 
+               OPTION 输入.in_stor_id <> ""
+                  ios.stor_id in 输入.in_stor_id
+               ENDOPTION
+
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF

lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java

@@ -15,6 +15,7 @@ import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.modules.wql.util.WqlUtil;
+import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
 import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl;
 import org.nl.wms.ext.sap.service.impl.LmsToSapServiceImpl;
 import org.nl.wms.st.returns.service.InAndOutReturnService;
@@ -53,6 +54,12 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
         if (!ObjectUtil.isEmpty(material_search)) map.put("material_search", "%" + material_search + "%");
         if (!ObjectUtil.isEmpty(box_no)) map.put("box_no", "%" + box_no + "%");
 
+        //获取人员对应的仓库
+        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_INANDOUTRETRUN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time desc");
         return jo;
         

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

@@ -31,9 +31,7 @@
 	输入.iostorinv_id			        TYPEAS s_string
 	输入.ids			                    TYPEAS f_string
 	输入.box_no			                TYPEAS s_string
-
+	输入.in_stor_id			            TYPEAS f_string
-
-
 
 
 [临时表]
@@ -124,6 +122,10 @@
                    )
                ENDOPTION
 
+               OPTION 输入.in_stor_id <> ""
+                    mst.stor_id in 输入.in_stor_id
+               ENDOPTION
+
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF

lms/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java

@@ -14,6 +14,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.basedata.master.service.ClassstandardService;
 import org.nl.wms.basedata.master.service.MaterialbaseService;
+import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
 import org.nl.wms.statistics.service.IostordailyService;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -42,6 +43,7 @@ public class IostordailyServiceImpl implements IostordailyService {
         String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
         HashMap<String, String> map = new HashMap<>(whereJson);
         map.put("flag", "1");
+        map.put("stor_id", MapUtil.getStr(whereJson, "stor_id"));
         //处理物料当前节点的所有子节点
         if (!StrUtil.isEmpty(material_type_id)) {
             map.put("material_type_id", material_type_id);
@@ -57,6 +59,13 @@ public class IostordailyServiceImpl implements IostordailyService {
             map.put("material_code", "%" + material_code + "%");
         }
         if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn", "%" + 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 json = WQL.getWO("SendReceiveQuery").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "da.sect_date desc");
 
         return json;

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

@@ -20,6 +20,7 @@
 	输入.material_code				    	     TYPEAS s_string
 	输入.classIds			                     TYPEAS f_string
 	输入.pcsn			                         TYPEAS s_string
+	输入.in_stor_id			                     TYPEAS f_string
 
 
 [临时表]
@@ -117,6 +118,10 @@
                          class.class_id in 输入.classIds
                 ENDOPTION
 
+                OPTION 输入.in_stor_id <> ""
+                        stor.stor_id in 输入.in_stor_id
+                 ENDOPTION
+
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF

lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue

@@ -19,6 +19,7 @@
               size="mini"
               class="filter-item"
               style="width: 200px;"
+              @change="hand"
             >
               <el-option
                 v-for="item in storlist"
@@ -77,6 +78,7 @@
         <el-table-column type="selection" width="55" />
         <el-table-column prop="point_code" label="仓位编码" min-width="120" show-overflow-tooltip />
         <el-table-column prop="point_name" label="仓位名称" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="stor_name" label="仓库" min-width="120" show-overflow-tooltip />
         <el-table-column prop="sect_name" label="库区" min-width="120" show-overflow-tooltip />
 <!--        <el-table-column prop="region_name" label="下料区域" min-width="120" show-overflow-tooltip />-->
         <el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip />
@@ -110,6 +112,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import crudPoint from '@/views/wms/sch/point/point'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 const defaultForm = { stockrecord_id: null, cascader: null, struct_id: null, struct_code: null, struct_name: null, workprocedure_id: null, material_id: null, material_code: null, quality_scode: null, pcsn: null, canuse_qty: null, frozen_qty: null, ivt_qty: null, warehousing_qty: null, qty_unit_id: null, instorage_time: null, sale_id: null }
 export default {
@@ -138,8 +141,8 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
+    crudUserStor.getUserStor().then(res => {
-      this.storlist = res.content
+      this.storlist = res
     })
   },
   methods: {
@@ -150,6 +153,9 @@ export default {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
+    },
+    hand(value) {
+      this.crud.toQuery()
     }
   }
 }

lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue

@@ -182,6 +182,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import { isvalidPhone } from '@/utils/validate'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 const defaultForm = {
   sect_id: null,
@@ -283,8 +284,8 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor().then(res => {
+    crudUserStor.getUserStor().then(res => {
-      this.stors = res.content
+      this.stors = res
     })
   },
   methods: {

lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue

@@ -262,6 +262,7 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
+import crudUserStor, { getSect } from '@/views/wms/basedata/st/userStor/userStor'
 /* import checkoutbill from "@/api/wms/st/core/outbill/checkoutbill";*/
 
 const defaultForm = {
@@ -384,12 +385,9 @@ export default {
     }
   },
   created() {
-    crudSectattr.getSect().then(res => {
+    crudUserStor.getSect().then(res => {
       this.sects = res.content
     })
-    /*    checkoutbill.getInvTypes().then(res => {
-      this.invtypelist = res
-    })*/
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据

lms/nladmin-ui/src/views/wms/basedata/st/userStor/userStor.js

@@ -24,4 +24,19 @@ export function save(data) {
   })
 }
 
-export default { queryUserStor, queryStor, save }
+export function getUserStor(data) {
+  return request({
+    url: '/api/userStor/getUserStor',
+    method: 'post',
+    data
+  })
+}
+
+export function getSect() {
+  return request({
+    url: '/api/userStor/getSect',
+    method: 'post'
+  })
+}
+
+export default { queryUserStor, queryStor, save, getUserStor, getSect }

lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue

@@ -246,6 +246,7 @@ import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import ViewDialog from '@/views/wms/st/outbill/ViewDialog'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'Return',
@@ -284,8 +285,8 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
+    crudUserStor.getUserStor().then(res => {
-      this.storlist = res.content
+      this.storlist = res
     })
     debugger
     this.billtypelist = this.dict.ST_INV_IN_TYPE

lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue

@@ -265,6 +265,7 @@ import AddDtl from '@/views/wms/st/inStor/change/AddDtl'
 import handmovestor from '@/views/wms/st/inStor/change/change'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import StructDiv from '@/views/wms/pub/StructDialog'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 const defaultForm = {
   bill_code: '',
@@ -325,9 +326,8 @@ export default {
   methods: {
     open() {
       debugger
-      // 查询原材料库的仓库
+      crudUserStor.getUserStor().then(res => {
-      crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
+        this.storlist = res
-        this.storlist = res.content
       })
     },
     close() {

lms/nladmin-ui/src/views/wms/st/inStor/change/index.vue

@@ -188,6 +188,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import AddDialog from '@/views/wms/st/inStor/change/AddDialog'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'Change',
@@ -227,8 +228,8 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
+    crudUserStor.getUserStor().then(res => {
-      this.storlist = res.content
+      this.storlist = res
     })
   },
   methods: {

lms/nladmin-ui/src/views/wms/st/inStor/check/AddDialog.vue

@@ -138,6 +138,7 @@ import CRUD, { crud, form } from '@crud/crud'
 import AddDtl from '@/views/wms/st/inStor/check/AddDtl'
 import check from '@/views/wms/st/inStor/check/check'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 const defaultForm = {
   check_code: '',
@@ -189,9 +190,8 @@ export default {
   },
   methods: {
     open() {
-      // 查询原材料库的仓库
+      crudUserStor.getUserStor().then(res => {
-      crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
+        this.storlist = res
-        this.storlist = res.content
       })
     },
     close() {

lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue

@@ -206,6 +206,7 @@ import ProcessDialog from '@/views/wms/st/inStor/check/ProcessDialog'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import { download } from '@/api/data'
 import { downloadFile } from '@/utils'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'Check',
@@ -245,8 +246,8 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
+    crudUserStor.getUserStor().then(res => {
-      this.storlist = res.content
+      this.storlist = res
     })
   },
   methods: {

lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDialog.vue

@@ -239,6 +239,7 @@ import AddDtl from '@/views/wms/st/inStor/moveStor/AddDtl'
 import handmovestor from '@/views/wms/st/inStor/moveStor/handmovestor'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import StructDiv from '@/views/wms/pub/StructDialog'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 const defaultForm = {
   bill_code: '',
@@ -298,10 +299,8 @@ export default {
   },
   methods: {
     open() {
-      debugger
+      crudUserStor.getUserStor().then(res => {
-      // 查询原材料库的仓库
+        this.storlist = res
-      crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
-        this.storlist = res.content
       })
     },
     close() {

lms/nladmin-ui/src/views/wms/st/inStor/moveStor/index.vue

@@ -199,6 +199,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import AddDialog from '@/views/wms/st/inStor/moveStor/AddDialog'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'Handmovestor',
@@ -238,8 +239,8 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
+    crudUserStor.getUserStor().then(res => {
-      this.storlist = res.content
+      this.storlist = res
     })
   },
   methods: {

lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue

@@ -172,6 +172,7 @@ import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import crudRawAssist from '@/views/wms/st/inbill/rawassist'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
 import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 const defaultForm = {
   bill_code: '',
@@ -236,9 +237,8 @@ export default {
   },
   methods: {
     open() {
-      // 查询原材料库的仓库
+      crudUserStor.getUserStor().then(res => {
-      crudStorattr.getStor({ 'is_virtualstore': '1' }).then(res => {
+        this.storlist = res
-        this.storlist = res.content
       })
     },
     close() {

lms/nladmin-ui/src/views/wms/st/inbill/index.vue

@@ -233,6 +233,7 @@ import ViewDialog from '@/views/wms/st/inbill/ViewDialog'
 import TaskDialog from '@/views/wms/st/inbill/TaskDialog'
 import { mapGetters } from 'vuex'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'Rawassist',
@@ -286,8 +287,8 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
+    crudUserStor.getUserStor().then(res => {
-      this.storlist = res.content
+      this.storlist = res
     })
   },
   methods: {

lms/nladmin-ui/src/views/wms/st/incharge/index.vue

@@ -152,6 +152,7 @@ import DateRangePicker from '@/components/DateRangePicker/index'
 import crudInchargefrom from '@/views/wms/st/incharge/incharge'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import ViewDialog from '@/views/wms/st/outbill/ViewDialog'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'Incharge',
@@ -185,8 +186,8 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
+    crudUserStor.getUserStor().then(res => {
-      this.storlist = res.content
+      this.storlist = res
     })
   },
   methods: {

lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue

@@ -242,6 +242,7 @@ import MaterDialog from '@/views/wms/pub/MaterDialog'
 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'
 
 const defaultForm = {
   bill_code: '',
@@ -301,16 +302,9 @@ export default {
   },
   methods: {
     open() {
-      // 查询原材料库的仓库
+      crudUserStor.getUserStor().then(res => {
-      crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
+        this.storlist = res
-        this.storlist = res.content
       })
-      /*     crudRawAssist.getType({ 'io_code': '0101', 'io_flag': '01' }).then(res => {
-        this.billtypelist = res
-      })
-      checkoutbill.getInvTypes().then(res => {
-        this.invtypelist = res
-      })*/
     },
     close() {
       this.$emit('AddChanged')

lms/nladmin-ui/src/views/wms/st/outbill/index.vue

@@ -238,6 +238,7 @@ import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import { getLodop } from '@/assets/js/lodop/LodopFuncs'
 import { download } from '@/api/data'
 import { downloadFile } from '@/utils'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'Checkoutbill',
@@ -285,12 +286,9 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
+    crudUserStor.getUserStor().then(res => {
-      this.storlist = res.content
+      this.storlist = res
     })
-    // crudRawAssist.getType({ 'io_code': '0101', 'io_flag': '01' }).then(res => {
-    //   this.billtypelist = res
-    // })
   },
   methods: {
     canUd(row) {

lms/nladmin-ui/src/views/wms/st/outcharge/index.vue

@@ -173,6 +173,7 @@ import DateRangePicker from '@/components/DateRangePicker/index'
 import crudOutchargefrom from '@/views/wms/st/outcharge/outcharge'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import ViewDialog from '@/views/wms/st/outbill/ViewDialog'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'Outcharge',
@@ -210,8 +211,8 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
+    crudUserStor.getUserStor().then(res => {
-      this.storlist = res.content
+      this.storlist = res
     })
   },
   methods: {

lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/index.vue

@@ -238,6 +238,7 @@ import TaskDialog from '@/views/wms/statistics/ioStorQuery/TaskDialog'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import inandoutreturn from '@/views/wms/st/inAndOutReturn/inandoutreturn'
 import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'IoStorQuery',
@@ -285,8 +286,8 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
+    crudUserStor.getUserStor().then(res => {
-      this.storlist = res.content
+      this.storlist = res
     })
     debugger
     this.billtypelist = this.dict.ST_INV_IN_TYPE

lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/index.vue

@@ -24,9 +24,9 @@
               @change="hand"
             >
               <el-option
-                v-for="item in this.storList"
+                v-for="item in storList"
-                :label="item.label"
+                :label="item.stor_name"
-                :value="item.value"
+                :value="item.stor_id"
               />
             </el-select>
           </el-form-item>
@@ -108,6 +108,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker'
 import crudMaterialbase from '@/views/wms/basedata/master/material/materialbase'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 const defaultForm = {
   stordaily_id: null,
@@ -164,7 +165,7 @@ export default {
     }
   },
   created() {
-    crudIostordaily.getStor().then(res => {
+    crudUserStor.getUserStor().then(res => {
       this.storList = res
     })
     const param = {