diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java
index c2b387f7c..c78464a42 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java
@@ -115,6 +115,8 @@ public class ProductInstorServiceImpl implements ProductInstorService {
         //查询成品库仓库
         JSONObject stor = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("is_delete = '0' AND is_used = '1' AND is_productstore = '1'").uniqueResult(0);
         mst_jo.put("stor_id", stor.getString("stor_id"));
+        mst_jo.put("stor_code", stor.getString("stor_code"));
+        mst_jo.put("stor_name", stor.getString("stor_name"));
         mst_jo.put("detail_count", box_rows.size());
         mst_jo.put("total_qty", "0");
         mst_jo.put("bill_status", "30");
@@ -147,7 +149,7 @@ public class ProductInstorServiceImpl implements ProductInstorService {
         } else {
             String task_id = IdUtil.getSnowflake(1, 1).nextId() + "";
             //直接分配虚拟区货位，并确认
-            JSONObject struct = WQL.getWO("PDA_ST_01").addParam("flag", "3").process().uniqueResult(0);
+            JSONObject struct = WQL.getWO("PDA_ST_01").addParam("flag", "3").addParam("stor_id",stor.getString("stor_id")).process().uniqueResult(0);
 
             HashMap<String, String> dis_map = new HashMap();
             dis_map.put("sect_id", struct.getString("sect_id"));
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql
index 82cc9c3e9..6c549db39 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql
@@ -15,6 +15,7 @@
 	#################################################
 	输入.flag					        TYPEAS s_string
 	输入.box_no					        TYPEAS s_string
+	输入.stor_id					        TYPEAS s_string
 
 
 [临时表]
@@ -107,13 +108,15 @@
             SELECT
             	*
             FROM
-            	st_ivt_structattr
+            	st_ivt_structattr sa
+            	LEFT JOIN st_ivt_sectattr se ON se.sect_id =sa.sect_id
             WHERE
-            	sect_code = 'XN01'
+            	se.sect_type_attr = '09'
             	AND lock_type = '1'
-            	AND is_delete = '0'
+            	AND stor_id = 输入.stor_id
+            	AND sa.is_delete = '0'
             	AND IFNULL( storagevehicle_code, '' ) = ''
-            	ORDER BY
+            ORDER BY
             	struct_code
             	LIMIT 1
             ENDSELECT
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue
index 7fab20ea9..c57f132ff 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue
@@ -100,6 +100,13 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="外部标识">
+                <el-input v-model="form.ext_id" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row :gutter="20">
             <el-form-item label="仓库类型" required>
               <el-col :span="4" />
@@ -153,6 +160,7 @@
         <el-table-column prop="storea_ddress" label="地址" />
         <el-table-column prop="principal" label="负责人" />
         <el-table-column prop="office_phone" label="联系电话" width="130" />
+        <el-table-column prop="ext_id" label="外部标识" width="130" />
         <el-table-column label="是否启用" align="center" prop="is_used">
           <template slot-scope="scope">
             <el-switch