diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java
index bf19ec3f..a86e46f4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java
@@ -679,8 +679,11 @@ public abstract class AbstractInManage {
         HashMap<String, String> map = rows.get(0);
 
         //判断该载具是否已经分配货位或者起点
-        JSONArray now_dis_rows = WQLObject.getWQLObject("st_ivt_iostorinvdis").query("storagevehicle_code = '"+map.get("storagevehicle_code")+"' AND work_status < '99' AND (struct_id <> '' AND struct_id is not null)").getResultJSONArray(0);
-        if (now_dis_rows.size()>0){
+        HashMap<String, String> paramMap = new HashMap<>();
+        paramMap.put("flag", "11");
+        paramMap.put("storagevehicle_code", map.get("storagevehicle_code"));
+        JSONArray iostorinvs = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(paramMap).process().getResultJSONArray(0);
+        if (iostorinvs.size()>0){
             throw new BadRequestException("该载具已经分配过货位，无法继续分配！");
         }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql
index ce187095..d8d92471 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql
@@ -432,6 +432,24 @@
         ENDIF
 
 
+        IF 输入.flag = "11"
+                    QUERY
+                        SELECT
+                        	st_ivt_iostorinv.iostorinv_id,
+                        	st_ivt_iostorinvdis.*
+                        FROM
+                        	st_ivt_iostorinv
+                        	LEFT JOIN st_ivt_iostorinvdis ON st_ivt_iostorinv.iostorinv_id = st_ivt_iostorinvdis.iostorinv_id
+                        WHERE
+                        	storagevehicle_code = 输入.storagevehicle_code
+                        	AND st_ivt_iostorinvdis.work_status < '99'
+                        	AND ( st_ivt_iostorinvdis.struct_id <> '' AND st_ivt_iostorinvdis.struct_id IS NOT NULL )
+                        	AND is_delete = 0
+                        ENDSELECT
+                    ENDQUERY
+                ENDIF
+
+