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 7e98f6ba3..397bcb26a 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 @@ -62,8 +62,8 @@ public class UserStorController { @PostMapping("/getSect") @Log("获取人员对应下拉框-多级下拉框") @ApiOperation("获取人员对应下拉框-多级下拉框") - public ResponseEntity getSect() { - return new ResponseEntity<>(userStorService.getSect(),HttpStatus.OK); + public ResponseEntity getSect(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(userStorService.getSect(whereJson),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 fee13febf..e146c4ea7 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 @@ -42,5 +42,5 @@ public interface UserStorService { /** * 获取人员对应下拉框 多级下拉框 */ - JSONObject getSect(); + JSONObject getSect(JSONObject whereJson); } 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 0e1a80904..668a65aa1 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 @@ -122,13 +122,14 @@ public class UserStorServiceImpl implements UserStorService { } @Override - public JSONObject getSect() { + public JSONObject getSect(JSONObject whereJson) { /* * 获取人员对应仓库下拉框公共方法 多级下拉框 */ JSONArray new_ja = new JSONArray(); HashMap stor_map = new HashMap<>(); stor_map.put("flag", "2"); + stor_map.put("stor_id", whereJson.getString("stor_id")); //获取人员对应的仓库 String in_stor_id = this.getInStor(); 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 a75a2e7f6..c22c7b2f6 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 @@ -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 diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue index 7d97702f0..ce1c44f5f 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue +++ b/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 }) }, diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/userStor/userStor.js b/lms/nladmin-ui/src/views/wms/basedata/st/userStor/userStor.js index 0e165ceb0..ba4945cfa 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/userStor/userStor.js +++ b/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 }) } diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue index a1449d13b..90762d626 100644 --- a/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue @@ -115,7 +115,7 @@ 载具物料明细
- + { + crudUserStor.getSect({ 'stor_id': this.storId}).then(res => { this.sects = res.content }) + const area_type = '1585164789083148288' crudPoint.getPoint({ 'area_type': area_type }).then(res => { diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/index.vue b/lms/nladmin-ui/src/views/wms/st/inbill/index.vue index 68e6f14ef..d89c7abf7 100644 --- a/lms/nladmin-ui/src/views/wms/st/inbill/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/inbill/index.vue @@ -213,7 +213,7 @@
- + @@ -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 })