diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserStorController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserStorController.java
index 31a102645..e3a1e9e1d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserStorController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserStorController.java
@@ -34,14 +34,14 @@ public class UserStorController {
     @Log("查询所有仓库")
     @ApiOperation("查询所有仓库")
     public ResponseEntity<Object> queryStor(@RequestBody JSONObject whereJson) {
-        return new ResponseEntity<>(userStorService.queryStor(whereJson),HttpStatus.NO_CONTENT);
+        return new ResponseEntity<>(userStorService.queryStor(whereJson),HttpStatus.OK);
     }
 
     @PostMapping("/queryUserStor")
     @Log("查询用户对应仓库")
     @ApiOperation("查询用户对应仓库")
     public ResponseEntity<Object> queryUserStor(@RequestBody JSONObject whereJson) {
-        return new ResponseEntity<>(userStorService.queryUserStor(whereJson),HttpStatus.NO_CONTENT);
+        return new ResponseEntity<>(userStorService.queryUserStor(whereJson),HttpStatus.OK);
     }
 
     @PostMapping("/save")
@@ -49,7 +49,7 @@ public class UserStorController {
     @ApiOperation("保存用户仓库信息")
     public ResponseEntity<Object> save(@RequestBody JSONObject whereJson) {
         userStorService.save(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/UserStorService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/UserStorService.java
index 6bccb9c3d..33ed573bc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/UserStorService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/UserStorService.java
@@ -32,6 +32,6 @@ public interface UserStorService {
      * 保存
      * @param whereJson /
      */
-    JSONArray save(JSONObject whereJson);
+    void save(JSONObject whereJson);
 
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
index 298f2f872..c676ee25d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
@@ -42,11 +42,11 @@ public class StructivtServiceImpl implements StructivtService {
     public Map<String,Object> queryAll(Map whereJson, Pageable page){
         String material = MapUtil.getStr(whereJson, "material");
         String struct = MapUtil.getStr(whereJson, "struct");
-        String region_id = MapUtil.getStr(whereJson, "region_id");
+        String stor_id = MapUtil.getStr(whereJson, "stor_id");
         String pcsn = MapUtil.getStr(whereJson, "pcsn");
         JSONObject map = new JSONObject();
         map.put("flag", "1");
-        map.put("region_id", region_id);
+        map.put("stor_id", stor_id);
         if (StrUtil.isNotEmpty(material)) {
             map.put("material", "%" + material + "%");
         }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java
index 882122369..c05471e6f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java
@@ -54,11 +54,26 @@ public class UserStorServiceImpl implements UserStorService {
 
     @Override
     public JSONArray queryUserStor(JSONObject whereJson) {
-        return null;
+        String user_id = whereJson.getString("user_id");
+        JSONArray rows = WQLObject.getWQLObject("st_ivt_userstor").query("user_id = '" + user_id + "'").getResultJSONArray(0);
+        return rows;
     }
 
     @Override
-    public JSONArray save(JSONObject whereJson) {
-        return null;
+    public void save(JSONObject whereJson) {
+        JSONObject jo = whereJson.getJSONObject("jo");
+        JSONArray rows = whereJson.getJSONArray("rows");
+
+        String user_id = jo.getString("user_id");
+
+        WQLObject.getWQLObject("st_ivt_userstor").delete("user_id ='" + user_id + "'");
+        for (int i = 0; i < rows.size(); i++) {
+            JSONObject row = rows.getJSONObject(i);
+            String stor_id = row.getString("stor_id");
+            JSONObject user_stor = new JSONObject();
+            user_stor.put("stor_id", stor_id);
+            user_stor.put("user_id", user_id);
+            WQLObject.getWQLObject("st_ivt_userstor").insert(user_stor);
+        }
     }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql
index 17da652a9..e4930b25a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql
@@ -104,17 +104,20 @@
      IF 输入.flag = "3"
         PAGEQUERY
             SELECT
-            	*
+            	sys_user.*,
+            	dept.name
             FROM
-            	sys_user
+            	sys_user sys_user
+            	LEFT JOIN sys_dept dept ON dept.dept_id = sys_user.dept_id
             WHERE
-            	enabled = '1'
+            	sys_user.enabled = '1'
             OPTION 输入.blurry <> ""
                 (
                 username like 输入.blurry
                 OR
                 nick_name like 输入.blurry
                 )
+            ENDOPTION
             ENDSELECT
         ENDPAGEQUERY
     ENDIF
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
index 063d21f62..7f0bd4cb4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
@@ -16,7 +16,7 @@
 	输入.flag					            TYPEAS s_string
 	输入.struct					            TYPEAS s_string
 	输入.material					        TYPEAS s_string
-	输入.region_id					        TYPEAS f_string
+	输入.stor_id					            TYPEAS s_string
 	输入.pcsn					            TYPEAS s_string
 
 [临时表]
@@ -82,8 +82,8 @@
                         ivt.pcsn like 输入.pcsn
                  ENDOPTION
 
-                OPTION 输入.region_id <> ""
-                        ivt.region_id = 输入.region_id
+                OPTION 输入.stor_id <> ""
+                        attr.stor_id = 输入.stor_id
                 ENDOPTION
 			ENDSELECT
 		ENDPAGEQUERY
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls
index 001c1102c..88c2a19ef 100644
Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls differ
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
index bfe0da3c6..4d6549782 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
@@ -100,6 +100,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
                     jsonMst.put("receiptphone", json.getString("TEL_NUMBER")); // 联系电话
                     jsonMst.put("contractno", json.getString("BSTNK")); // 合同号
                     jsonMst.put("cust_code", json.getString("KUNNR")); // 客户
+                    jsonMst.put("remark",json.getString("LGORT"));//库位
 
                     // 明细
                     JSONObject jsonMater = materTab.query("material_code = '" + json.getString("MATNR") + "'").uniqueResult(0);
@@ -117,6 +118,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
                     tableData.add(jsonDtl);
                 }
                 if (StrUtil.equals(lfart, "ZLR")) {
+                    jsonMst.put("remark",json.getString("LGORT"));//库位
                     HashMap map = new HashMap();
                     //更新包装关系
                     String sap_pcsn = json.getString("CHARG");
@@ -185,7 +187,6 @@ public class SapToLmsServiceImpl implements SapToLmsService {
                     map.put("net_weight", sub_jo.getString("net_weight"));
                     map.put("package_box_sn", sub_jo.getString("package_box_sn"));
                     map.put("product_name", sub_jo.getString("product_name"));
-                    map.put("product_name", sub_jo.getString("product_name"));
                     map.put("vbeln", json.getString("VBELN"));
                     map.put("posnr", json.getString("POSNR"));
                     box_rows.add(map);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java
index 4de91e752..82b6e2c65 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java
@@ -29,7 +29,7 @@ public class SubpackagerelationDto implements Serializable {
     private BigDecimal box_weight;
 
         /** 保质期 */
-    private BigDecimal quality_guaran_period;
+    private String quality_guaran_period;
 
         /** 销售订单及行号 */
     private String sale_order_name;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/rest/InAndOutReturnlController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/rest/InAndOutReturnlController.java
index 3927cda0c..9d89f46b9 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/rest/InAndOutReturnlController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/rest/InAndOutReturnlController.java
@@ -57,7 +57,7 @@ public class InAndOutReturnlController {
     @PostMapping("/disupload")
     @Log("不回传")
     @ApiOperation("不回传")
-    public ResponseEntity<Object> disupload(@RequestBody Map whereJson) {
+    public ResponseEntity<Object> disupload(@RequestBody JSONObject whereJson) {
         inAndOutReturnService.disupload(whereJson);
         return new ResponseEntity<>(HttpStatus.OK);
     }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/InAndOutReturnService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/InAndOutReturnService.java
index 36c138445..11f601249 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/InAndOutReturnService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/InAndOutReturnService.java
@@ -22,6 +22,6 @@ public interface InAndOutReturnService {
 
     void uploadSAP(JSONObject whereJson);
 
-    void disupload(Map whereJson);
+    void disupload(JSONObject whereJson);
 
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
index 24831bb25..26ca35de0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
@@ -131,7 +131,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
 
                                 JSONObject jsonSect = sectTab.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0);
                                 if (ObjectUtil.isNotEmpty(jsonSect)) {
-                                    jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点
+                                    //jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点
+                                    jsonDtl.put("LGORT", json.getString("remark")); // 明細储存地点
                                 }
 
                                 JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "'").uniqueResult(0);
@@ -260,7 +261,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
 
                             JSONObject jsonSect = sectTab.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0);
                             if (ObjectUtil.isNotEmpty(jsonSect)) {
-                                jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点
+                                //jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点
+                                jsonDtl.put("LGORT", json.getString("remark")); // 明細储存地点
                             }
 
                             JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "'").uniqueResult(0);
@@ -318,7 +320,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
 
                         JSONObject jsonSect = sectTab.query("sect_id = '" + json.getString("sect_id") + "'").uniqueResult(0);
                         if (ObjectUtil.isNotEmpty(jsonSect)) {
-                            jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 库存地点：库区外部标识
+                            //jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 库存地点：库区外部标识
+                            jsonDtl.put("LGORT", json.getString("remark")); // 库存地点：库区外部标识
                         }
 
                         JSONObject jsonSub = subTab.query("container_name = '" + json.getString("pcsn") + "'").uniqueResult(0);
@@ -348,7 +351,29 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void disupload(Map whereJson) {
+    public void disupload(JSONObject whereJson) {
+        //出库分配表
+        WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis");
+        //出库明细表
+        WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl");
+        //出库主表
+        WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_IOStorInv");
+        // 物料表
+        WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase");
+        // 库区表
+        WQLObject sectTab = WQLObject.getWQLObject("st_ivt_sectattr");
+        // 子卷包装关系表
+        WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation");
+
+        JSONArray rows = whereJson.getJSONArray("rows");
+
+        for (int i = 0; i < rows.size(); i++) {
+            JSONObject jo_mst = rows.getJSONObject(i);
+            jo_mst.put("is_upload", "1");
+            jo_mst.put("upload_optid", SecurityUtils.getCurrentUserId());
+            jo_mst.put("upload_time", DateUtil.now());
+            WQLObject.getWQLObject("ST_IVT_IOStorInv").update(jo_mst);
+        }
     }
 
     @Override
@@ -422,7 +447,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
 
                             JSONObject jsonSect = sectTab.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0);
                             if (ObjectUtil.isNotEmpty(jsonSect)) {
-                                jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点
+                                // jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点
+                                jsonDtl.put("LGORT", json.getString("remark")); // 明細储存地点
                             }
 
                             JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "'").uniqueResult(0);
@@ -511,7 +537,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
 
                             JSONObject jsonSect = sectTab.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0);
                             if (ObjectUtil.isNotEmpty(jsonSect)) {
-                                jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点
+                                //jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点
+                                jsonDtl.put("LGORT", json.getString("remark")); // 明細储存地点
                             }
 
                             JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "'").uniqueResult(0);
@@ -589,7 +616,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                         jsonDtl.put("BWART", "311");
                         jsonDtl.put("MENGE", json.getDoubleValue("plan_qty"));
                         jsonDtl.put("MEINS", json.getString("qty_unit_id"));
-                        jsonDtl.put("LGORT", ""); // 库存地点
+                        jsonDtl.put("LGORT", json.getString("remark")); // 库存地点
                         jsonDtl.put("CHARG", json.getString("pcsn"));
                         jsonDtl.put("UMLGO", ""); // 收货库存地点
                         jsonDtl.put("UMCHA", json.getString("pcsn"));
diff --git a/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue
index bc2a53d0b..c40001c76 100644
--- a/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue
+++ b/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue
@@ -34,15 +34,9 @@ export default {
   },
   data() {
     return {
-      title: '诺力开发平台',
-      logo: Logo,
-      title_param: 'platform'
+      title: '甘肃海亮铜箔LMS',
+      logo: Logo
     }
-  },
-  created() {
-    this.getValueByCode(this.title_param).then(res => {
-      this.title = res.value
-    })
   }
 }
 </script>
diff --git a/lms/nladmin-ui/src/views/login.vue b/lms/nladmin-ui/src/views/login.vue
index caa6d0699..59876e706 100644
--- a/lms/nladmin-ui/src/views/login.vue
+++ b/lms/nladmin-ui/src/views/login.vue
@@ -50,8 +50,7 @@ export default {
   name: 'Login',
   data() {
     return {
-      title: '诺力开发平台',
-      title_param: 'platform',
+      title: '甘肃海亮铜箔LMS',
       Background: Background,
       codeUrl: '',
       cookiePass: '',
@@ -80,9 +79,6 @@ export default {
     }
   },
   created() {
-    this.getValueByCode(this.title_param).then(res => {
-      this.title = res.value
-    })
     // 获取验证码
     this.getCode()
     // 获取用户名密码等Cookie
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
index 24af94c19..414286d76 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
@@ -11,6 +11,22 @@
           label-width="90px"
           label-suffix=":"
         >
+          <el-form-item label="仓库">
+            <el-select
+              v-model="query.stor_id"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 200px;"
+            >
+              <el-option
+                v-for="item in storlist"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="仓位搜索">
             <el-input
               v-model="query.struct"
@@ -41,22 +57,6 @@
               class="filter-item"
             />
           </el-form-item>
-          <el-form-item label="下料区域">
-            <el-select
-              v-model="query.region_id"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 200px;"
-            >
-              <el-option
-                v-for="item in reginoList"
-                :label="item.region_name"
-                :value="item.region_id"
-              />
-            </el-select>
-          </el-form-item>
           <rrOperation :crud="crud" />
         </el-form>
       </div>
@@ -99,6 +99,7 @@ import crudOperation from '@crud/CRUD.operation'
 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'
 
 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 {
@@ -119,7 +120,7 @@ export default {
   },
   data() {
     return {
-      reginoList: [],
+      storlist: [],
       permission: {
       },
       rules: {
@@ -127,8 +128,8 @@ export default {
     }
   },
   created() {
-    crudPoint.getRegion().then(res => {
-      this.reginoList = res
+    crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
+      this.storlist = res.content
     })
   },
   methods: {
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue
index 53c92713e..c5ea879cf 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue
@@ -13,58 +13,14 @@
           class="filter-item"
           @keyup.enter.native="crud.toQuery"
         />
-        <rrOperation />
+        <rrOperation/>
       </div>
-      <crudOperation :permission="permission" />
+      <crudOperation :permission="permission"/>
     </div>
     <!-- 表单渲染 -->
-    <el-dialog
-      append-to-body
-      :close-on-click-modal="false"
-      :before-close="crud.cancelCU"
-      :visible.sync="crud.status.cu > 0"
-      :title="crud.status.title"
-      width="520px"
-    >
-      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="80px">
-        <el-form-item label="角色名称" prop="name">
-          <el-input v-model="form.name" style="width: 380px;" />
-        </el-form-item>
-        <el-form-item label="角色级别" prop="level">
-          <el-input-number v-model.number="form.level" :min="1" controls-position="right" style="width: 145px;" />
-        </el-form-item>
-        <el-form-item label="数据范围" prop="dataScope">
-          <el-select v-model="form.dataScope" style="width: 140px" placeholder="请选择数据范围" @change="changeScope">
-            <el-option
-              v-for="item in dateScopes"
-              :key="item"
-              :label="item"
-              :value="item"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item v-if="form.dataScope === '自定义'" label="数据权限" prop="depts">
-          <treeselect
-            v-model="deptDatas"
-            :load-options="loadDepts"
-            :options="depts"
-            multiple
-            style="width: 380px"
-            placeholder="请选择"
-          />
-        </el-form-item>
-        <el-form-item label="描述信息" prop="description">
-          <el-input v-model="form.description" style="width: 380px;" rows="5" type="textarea" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="crud.cancelCU">取消</el-button>
-        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-      </div>
-    </el-dialog>
     <el-row :gutter="15">
       <!--角色管理-->
-      <el-col :xs="24" :sm="24" :md="16" :lg="16" :xl="17" style="margin-bottom: 10px">
+      <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="17" style="margin-bottom: 10px">
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
             <span class="role-span">角色列表</span>
@@ -78,42 +34,25 @@
             @selection-change="crud.selectionChangeHandler"
             @current-change="handleCurrentChange"
           >
-            <el-table-column :selectable="checkboxT" type="selection" width="55" />
-            <el-table-column prop="name" label="名称" min-width="100" show-overflow-tooltip />
-            <el-table-column prop="dataScope" label="数据权限" />
-            <el-table-column prop="level" label="角色级别" />
-            <el-table-column show-overflow-tooltip prop="description" label="描述" />
-            <el-table-column show-overflow-tooltip width="135px" prop="createTime" label="创建日期">
+            <el-table-column show-overflow-tooltip prop="username" label="用户名"/>
+            <el-table-column show-overflow-tooltip prop="nick_name" label="姓名"/>
+            <el-table-column prop="name" label="部门"/>
+            <!--<el-table-column show-overflow-tooltip prop="dept" label="部门">
               <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
+                <div>{{ scope.row.dept.name }}</div>
               </template>
-            </el-table-column>
-            <el-table-column
-              v-permission="['admin','roles:edit','roles:del']"
-              label="操作"
-              width="130px"
-              align="center"
-              fixed="right"
-            >
-              <template slot-scope="scope">
-                <udOperation
-                  v-if="scope.row.level >= level"
-                  :data="scope.row"
-                  :permission="permission"
-                />
-              </template>
-            </el-table-column>
+            </el-table-column>-->
           </el-table>
           <!--分页组件-->
-          <pagination />
+          <pagination/>
         </el-card>
       </el-col>
       <!-- 菜单授权 -->
-      <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="7">
+      <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="7">
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
             <el-tooltip class="item" effect="dark" content="选择指定角色分配菜单" placement="top">
-              <span class="role-span">菜单分配</span>
+              <span class="role-span">仓库选择</span>
             </el-tooltip>
             <el-button
               v-permission="['admin','roles:edit']"
@@ -137,21 +76,9 @@
               type="selection"
               width="55">
             </el-table-column>
-            <el-table-column
-              label="日期"
-              width="120">
-              <template slot-scope="scope">{{ scope.row.date }}</template>
-            </el-table-column>
-            <el-table-column
-              prop="name"
-              label="姓名"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="address"
-              label="地址"
-              show-overflow-tooltip>
-            </el-table-column>
+            <el-table-column prop="stor_code" label="仓库编码" />
+            <el-table-column prop="stor_name" label="仓库名称"/>
+            <el-table-column prop="simple_name" label="简称"/>
           </el-table>
         </el-card>
       </el-col>
@@ -177,44 +104,21 @@ export default {
   name: 'UserStor',
   components: { Treeselect, pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '角色', url: 'api/userStor', crudMethod: { ...crudUserStor }})
+    return CRUD({
+      title: '角色',
+      url: 'api/userStor',
+      crudMethod: { ...crudUserStor },
+      optShow: { add: false, reset: false, edit: false, del: false }
+    })
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {
     return {
-      defaultProps: { children: 'children', label: 'label', isLeaf: 'leaf' },
-      dateScopes: ['全部', '本级', '自定义'], level: 3,
+      level: 3,
       currentId: 0, menuLoading: false, showButton: false,
       menus: [], menuIds: [], depts: [], deptDatas: [], // 多选时使用
-      tableData: [{
-        date: '2016-05-03',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }, {
-        date: '2016-05-02',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }, {
-        date: '2016-05-04',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }, {
-        date: '2016-05-01',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }, {
-        date: '2016-05-08',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }, {
-        date: '2016-05-06',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }, {
-        date: '2016-05-07',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }],
+      tableData: [],
+      currentRow: null,
       permission: {
         add: ['admin', 'roles:add'],
         edit: ['admin', 'roles:edit'],
@@ -231,8 +135,8 @@ export default {
     }
   },
   created() {
-    crudRoles.getLevel().then(data => {
-      this.level = data.level
+    crudUserStor.queryStor({}).then(res => {
+      this.tableData = res
     })
   },
   methods: {
@@ -284,17 +188,18 @@ export default {
     // 触发单选
     handleCurrentChange(val) {
       if (val) {
-        const _this = this
-        // 清空菜单的选中
-        this.$refs.menu.setCheckedKeys([])
-        // 保存当前的角色id
-        this.currentId = val.id
-        // 初始化默认选中的key
-        this.menuIds = []
-        val.menus.forEach(function(data) {
-          _this.menuIds.push(data.id)
-        })
         this.showButton = true
+        this.$refs.multipleTable.clearSelection()
+        this.currentRow = val
+        crudUserStor.queryUserStor(val).then(res => {
+          res.forEach(row => {
+            this.tableData.forEach(selected => {
+              if (selected.stor_id === row.stor_id) {
+                this.$refs.multipleTable.toggleRowSelection(selected, true)
+              }
+            })
+          })
+        })
       }
     },
     menuChange(menu) {
@@ -321,20 +226,11 @@ export default {
     },
     // 保存菜单
     saveMenu() {
-      this.menuLoading = true
-      const role = { id: this.currentId, menus: [] }
-      // 得到已选中的 key 值
-      this.menuIds.forEach(function(id) {
-        const menu = { id: id }
-        role.menus.push(menu)
-      })
-      crudRoles.editMenu(role).then(() => {
+      const row = {}
+      row.jo = this.currentRow
+      row.rows = this.$refs.multipleTable.selection
+      crudUserStor.save(row).then(res => {
         this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.menuLoading = false
-        this.update()
-      }).catch(err => {
-        this.menuLoading = false
-        console.log(err.response.data.message)
       })
     },
     // 改变数据
diff --git a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
index 45a9d76d6..95158ba31 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
@@ -355,9 +355,21 @@
       <el-table ref="table" v-loading="crud.loading" style="width: 100%" :data="crud.data" size="mini" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" />
         <el-table-column prop="package_box_sn" label="木箱码" :min-width="flexWidth('package_box_sn',crud.data,'木箱码')" />
-        <el-table-column prop="container_name" label="子卷号" :min-width="flexWidth('container_name',crud.data,'子卷号')" />
-        <el-table-column prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'SAP批次')" />
         <el-table-column prop="quanlity_in_box" label="箱内子卷数量" :min-width="flexWidth('quanlity_in_box',crud.data,'箱内子卷数量')" />
+        <el-table-column prop="customer_name" label="客户编码" :min-width="flexWidth('customer_name',crud.data,'客户编码')" />
+        <el-table-column prop="customer_description" label="客户名称" :min-width="flexWidth('customer_description',crud.data,'客户名称')" />
+        <el-table-column prop="sale_order_name" label="销售订单及行号" :min-width="flexWidth('sale_order_name',crud.data,'销售订单及行号')" />
+        <el-table-column prop="container_name" label="子卷号" :min-width="flexWidth('container_name',crud.data,'子卷号')" />
+        <el-table-column prop="product_name" label="产品编码" :min-width="flexWidth('product_name',crud.data,'产品描述')" />
+        <el-table-column prop="product_description" label="产品描述" :min-width="flexWidth('product_description',crud.data,'产品描述')" />
+        <el-table-column prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'SAP批次')" />
+        <el-table-column prop="width" label="产品规格(幅宽)" :min-width="flexWidth('width',crud.data,'产品规格(幅宽)')" />
+        <el-table-column prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
+        <el-table-column prop="mass_per_unit_area" label="单位面积质量" :formatter="crud.formatNum3" :min-width="flexWidth('mass_per_unit_area',crud.data,'单位面积质量')" />
+        <el-table-column prop="net_weight" label="净重" :formatter="crud.formatNum3" :min-width="flexWidth('net_weight',crud.data,'净重')" />
+        <el-table-column prop="length" label="长度" :formatter="crud.formatNum3" :min-width="flexWidth('length',crud.data,'长度')" />
+        <el-table-column prop="date_of_production" label="制造完成日期" :min-width="flexWidth('date_of_production',crud.data,'制造完成日期')" />
+        <el-table-column prop="date_of_fg_inbound" label="入库日期" :min-width="flexWidth('date_of_fg_inbound',crud.data,'入库日期')" />
         <el-table-column prop="status" label="状态" :min-width="flexWidth('status',crud.data,'状态')">
           <template slot-scope="scope">
             {{ dict.label.sub_package_relation[scope.row.status] }}
@@ -365,36 +377,22 @@
         </el-table-column>
         <el-table-column prop="box_weight" label="木箱自身重量" :min-width="flexWidth('box_weight',crud.data,'木箱自身重量')" :formatter="crud.formatNum3"  />
         <el-table-column prop="quality_guaran_period" label="保质期" :min-width="flexWidth('quality_guaran_period',crud.data,'保质期')" />
-        <el-table-column prop="sale_order_name" label="销售订单及行号" :min-width="flexWidth('sale_order_name',crud.data,'销售订单及行号')" />
-        <el-table-column prop="customer_description" label="客户名称" :min-width="flexWidth('customer_description',crud.data,'客户名称')" />
-        <el-table-column prop="customer_name" label="客户编码" :min-width="flexWidth('customer_name',crud.data,'客户编码')" />
-        <el-table-column prop="product_name" label="产品描述" :min-width="flexWidth('product_name',crud.data,'产品描述')" />
-        <el-table-column prop="product_description" label="产品描述" :min-width="flexWidth('product_description',crud.data,'产品描述')" />
-        <el-table-column prop="date_of_fg_inbound" label="入库日期" :min-width="flexWidth('date_of_fg_inbound',crud.data,'入库日期')" />
-        <el-table-column prop="net_weight" label="净重" :formatter="crud.formatNum3" :min-width="flexWidth('net_weight',crud.data,'净重')" />
-        <el-table-column prop="length" label="长度" :formatter="crud.formatNum3" :min-width="flexWidth('length',crud.data,'长度')" />
-        <el-table-column prop="date_of_production" label="制造完成日期" :min-width="flexWidth('date_of_production',crud.data,'制造完成日期')" />
         <el-table-column prop="is_un_plan_production" label="计划外分切的子卷" :min-width="flexWidth('is_un_plan_production',crud.data,'计划外分切的子卷')">
           <template slot-scope="scope">
             {{ dict.label.IS_OR_NOT[scope.row.is_un_plan_production] }}
           </template>
         </el-table-column>
-        <el-table-column prop="box_type" label="木箱料号" :min-width="flexWidth('box_type',crud.data,'木箱料号')" />
         <el-table-column prop="un_plan_product_property1" label="子卷的物性值1" :min-width="flexWidth('un_plan_product_property1',crud.data,'子卷的物性值1')" />
         <el-table-column prop="un_plan_product_property2" label="子卷的物性值2" :min-width="flexWidth('un_plan_product_property2',crud.data,'子卷的物性值2')" />
         <el-table-column prop="un_plan_product_property3" label="子卷的物性值3" :min-width="flexWidth('un_plan_product_property3',crud.data,'子卷的物性值3')" />
+        <el-table-column prop="box_type" label="木箱料号" :min-width="flexWidth('box_type',crud.data,'木箱料号')" />
         <el-table-column prop="box_length" label="长" :min-width="flexWidth('box_length',crud.data,'长')" />
         <el-table-column prop="box_width" label="宽" :min-width="flexWidth('box_width',crud.data,'宽')" />
         <el-table-column prop="box_high" label="高" :min-width="flexWidth('box_high',crud.data,'高')" />
-        <el-table-column prop="width" label="产品规格(幅宽)" :min-width="flexWidth('width',crud.data,'产品规格(幅宽)')" />
-        <el-table-column prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
-        <el-table-column prop="mass_per_unit_area" label="单位面积质量" :formatter="crud.formatNum3" :min-width="flexWidth('mass_per_unit_area',crud.data,'单位面积质量')" />
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
         <el-table-column prop="vbeln" label="来源交货单" :min-width="flexWidth('vbeln',crud.data,'来源交货单')" />
         <el-table-column prop="posnr" label="来源交货单行" :min-width="flexWidth('posnr',crud.data,'来源交货单行')" />
         <el-table-column prop="sale_order_description" label="销售订单描述" :min-width="flexWidth('sale_order_description',crud.data,'销售订单描述')" />
-        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
-        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
         <el-table-column prop="isreprintpackageboxlabel" label="是否需要重打外包装标签" :min-width="flexWidth('isreprintpackageboxlabel',crud.data,'是否需要重打外包装标签')">
           <template slot-scope="scope">
             {{ dict.label.IS_OR_NOT[scope.row.isreprintpackageboxlabel] }}
@@ -405,6 +403,8 @@
             {{ dict.label.IS_OR_NOT[scope.row.isunpackbox] }}
           </template>
         </el-table-column>
+        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
         <el-table-column v-permission="[]" label="操作" align="center" fixed="right" min-width="120">
           <template slot-scope="scope">
             <udOperation
diff --git a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/DivDialog.vue b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/DivDialog.vue
index 9f0e6e7d3..50afe0734 100644
--- a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/DivDialog.vue
@@ -125,9 +125,6 @@ export default {
     }
   },
   created() {
-    checkoutbill.getInvTypes().then(res => {
-      this.invtypelist = res
-    })
   },
   methods: {
     close() {
diff --git a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/index.vue b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/index.vue
index 5c492f8e7..8c388cc01 100644
--- a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/index.vue
+++ b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/index.vue
@@ -58,9 +58,9 @@
             >
               <el-option
                 v-for="item in billtypelist"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
               />
             </el-select>
           </el-form-item>
@@ -217,7 +217,7 @@
         <el-table-column label="修改时间" align="center" prop="update_time" width="150" />
         <el-table-column label="确认人" align="center" prop="confirm_optname" width="150" />
         <el-table-column label="确认时间" align="center" prop="confirm_time" width="150" />
-        <el-table-column label="回传人" align="center" prop="upload_optname" width="150" />
+        <el-table-column label="回传人" align="center" prop="upload_name" width="150" />
         <el-table-column label="回传时间" align="center" prop="upload_time" width="150" />
       </el-table>
       <!--分页组件-->