代码更新

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

@@ -62,8 +62,8 @@ public class UserStorController {
     @PostMapping("/getSect")
     @Log("获取人员对应下拉框-多级下拉框")
     @ApiOperation("获取人员对应下拉框-多级下拉框")
-    public ResponseEntity<Object> getSect() {
-        return new ResponseEntity<>(userStorService.getSect(),HttpStatus.OK);
+    public ResponseEntity<Object> getSect(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(userStorService.getSect(whereJson),HttpStatus.OK);
     }
 
 }

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

@@ -42,5 +42,5 @@ public interface UserStorService {
     /**
      * 获取人员对应下拉框 多级下拉框
      */
-    JSONObject getSect();
+    JSONObject getSect(JSONObject whereJson);
 }

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

@@ -122,13 +122,14 @@ public class UserStorServiceImpl implements UserStorService {
     }
 
     @Override
-    public JSONObject getSect() {
+    public JSONObject getSect(JSONObject whereJson) {
         /*
          *  获取人员对应仓库下拉框公共方法 多级下拉框
          */
         JSONArray new_ja = new JSONArray();
         HashMap<String, String> stor_map = new HashMap<>();
         stor_map.put("flag", "2");
+        stor_map.put("stor_id", whereJson.getString("stor_id"));
 
         //获取人员对应的仓库
         String in_stor_id = this.getInStor();

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

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

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

@@ -385,7 +385,7 @@ export default {
     }
   },
   created() {
-    crudUserStor.getSect().then(res => {
+    crudUserStor.getSect({ 'stor_id': '' }).then(res => {
       this.sects = res.content
     })
   },

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

@@ -32,10 +32,11 @@ export function getUserStor(data) {
   })
 }
 
-export function getSect() {
+export function getSect(data) {
   return request({
     url: '/api/userStor/getSect',
-    method: 'post'
+    method: 'post',
+    data
   })
 }
 

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

@@ -115,7 +115,7 @@
       <span class="role-span">载具物料明细</span>
       <div class="crud-opts-form">
         <el-form ref="form" :inline="true" :model="form" size="mini">
-          <el-form-item label="区域" prop="gender5">
+          <el-form-item label="库区" prop="gender5">
             <el-cascader
               placeholder="请选择"
               :options="sects"
@@ -228,6 +228,7 @@ import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
 import StructDiv from '@/views/wms/pub/StructDialog'
 import crudRawAssist from '@/views/wms/st/inbill/rawassist'
 import crudPoint from '@/views/wms/sch/point/point'
+import crudUserStor, { getSect } from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'DivDialog',
@@ -251,6 +252,10 @@ export default {
     billType: {
       type: String,
       default: null
+    },
+    storId: {
+      type: String,
+      default: null
     }
   },
   data() {
@@ -288,10 +293,10 @@ export default {
   },
   methods: {
     open() {
-      debugger
-      crudSectattr.getSect({ 'is_virtualstore': '1' }).then(res => {
+      crudUserStor.getSect({ 'stor_id': this.storId}).then(res => {
         this.sects = res.content
       })
+
       const area_type = '1585164789083148288'
 
       crudPoint.getPoint({ 'area_type': area_type }).then(res => {

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

@@ -213,7 +213,7 @@
     </div>
     <AddDialog @AddChanged="querytable" />
     <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
-    <DivDialog :dialog-show.sync="divShow" :open-param="openParam" :bill-type="billType" :buss-config="bussConfig" @AddChanged="querytable" />
+    <DivDialog :dialog-show.sync="divShow" :stor-id="storId" :open-param="openParam" :bill-type="billType" :buss-config="bussConfig" @AddChanged="querytable" />
     <TaskDialog :dialog-show.sync="taskShow" :open-param="openParam" :buss-config="bussConfig" @AddChanged="querytable" />
   </div>
 </template>
@@ -272,7 +272,8 @@ export default {
       currentRow: null,
       storlist: [],
       createtypelist: [],
-      statuslist: []
+      statuslist: [],
+      storId: null
     }
   },
   computed: {
@@ -361,6 +362,7 @@ export default {
     divOpen() {
       crudRawAssist.getIODtl({ 'bill_code': this.currentRow.bill_code, 'open_flag': '1' }).then(res => {
         this.openParam = res
+        this.storId = this.currentRow.stor_id
         this.billType = this.currentRow.bill_type
         this.divShow = true
       })