diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java index 7fec72f7..8b0df038 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java @@ -72,10 +72,10 @@ public class SectattrController { return new ResponseEntity<>(HttpStatus.OK); } - @GetMapping("/getSect") + @PostMapping("/getSect") @Log("查询库区下拉框") @ApiOperation("查询库区下拉框") - public ResponseEntity querySect(@RequestParam JSONObject query) { + public ResponseEntity querySect(@RequestBody JSONObject query) { List list = isectattrService.getSect(query); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml index 14ffda24..38ca0712 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml @@ -7,9 +7,9 @@ st_ivt_sectattr.sect_name, st_ivt_sectattr.sect_id, st_ivt_sectattr.sect_code, - st_ivt_bsrealstorattr.stor_name, - st_ivt_bsrealstorattr.stor_id, - st_ivt_bsrealstorattr.stor_code + stor.stor_name, + stor.stor_id, + stor.stor_code FROM st_ivt_sectattr LEFT JOIN st_ivt_bsrealstorattr stor ON st_ivt_sectattr.stor_id = stor.stor_id diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java index 26bbbcb5..a204117e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java @@ -321,6 +321,7 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl().lambda() - .eq(StIvtStructattr::getStruct_id,struct_id) - ); + attrDao = iStIvtStructattrService.getById(struct_id); } if (ObjectUtil.isEmpty(attrDao.getStruct_code())) throw new BadRequestException("未找到仓位!"); @@ -346,7 +344,18 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl name = array.stream().map(row -> ((JSONObject) row)).collect(Collectors.toSet()); + HashMap name1 = array.stream().collect(HashMap::new, (k, v) -> k.put(((JSONObject) v).getString("name"), (JSONObject) v), HashMap::putAll); + HashSet collect = array.stream().collect(HashSet::new, (k, v) -> k.add((JSONObject) v), HashSet::addAll); + collect.stream().forEach(json -> a(json.getString("name"))); + + List maps = new ArrayList<>(); + + HashMap map = new HashMap<>(); + map.put("storagevehicle_code","1"); + map.put("storagevehicle_name","sadfs"); + maps.add(map); + HashMap map2 = new HashMap<>(); + map2.put("storagevehicle_code","2"); + map2.put("storagevehicle_name","sdfd"); + maps.add(map2); + + boolean age = array.stream().filter(row -> ((JSONObject) row).getString("age").equals("18")).findAny().isPresent(); + System.out.println(age); + + + } + + public static void a(String name) { + } + + public static void b(String name) { + } + + +} + diff --git a/mes/qd/src/api/wms/basedata/st/sectattr.js b/mes/qd/src/api/wms/basedata/st/sectattr.js index 18b511af..2b5f2936 100644 --- a/mes/qd/src/api/wms/basedata/st/sectattr.js +++ b/mes/qd/src/api/wms/basedata/st/sectattr.js @@ -24,11 +24,11 @@ export function edit(data) { }) } -export function getSect(params) { +export function getSect(data) { return request({ url: 'api/sectattr/getSect', - method: 'get', - params + method: 'post', + data }) } diff --git a/mes/qd/src/api/wms/basedata/st/storattr.js b/mes/qd/src/api/wms/basedata/st/storattr.js index 61c3eb3b..6518f7c6 100644 --- a/mes/qd/src/api/wms/basedata/st/storattr.js +++ b/mes/qd/src/api/wms/basedata/st/storattr.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function add(data) { return request({ - url: '/api/stIvtBsrealstorattr', + url: '/api/Storattr', method: 'post', data }) @@ -10,7 +10,7 @@ export function add(data) { export function del(ids) { return request({ - url: '/api/stIvtBsrealstorattr', + url: '/api/Storattr', method: 'delete', data: ids }) @@ -18,7 +18,7 @@ export function del(ids) { export function edit(data) { return request({ - url: '/api/stIvtBsrealstorattr', + url: '/api/Storattr', method: 'put', data }) @@ -26,7 +26,7 @@ export function edit(data) { export function getStor(params) { return request({ - url: '/api/stIvtBsrealstorattr/getStor', + url: '/api/Storattr/getStor', method: 'get', params }) @@ -34,7 +34,7 @@ export function getStor(params) { export function changeActive(data) { return request({ - url: '/api/stIvtBsrealstorattr/changeActive', + url: '/api/Storattr/changeActive', method: 'put', data }) @@ -42,7 +42,7 @@ export function changeActive(data) { export function queryStor(data) { return request({ - url: '/api/stIvtBsrealstorattr/queryStor', + url: '/api/Storattr/queryStor', method: 'post', data }) diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/DivDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productIn/DivDialog.vue index 989e3b84..a95a2a48 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productIn/DivDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productIn/DivDialog.vue @@ -223,6 +223,7 @@ import StructDiv from '@/views/wms/pub/StructDialog' import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin' import crudPoint from '@/api/wms/sch/point' import AddBox from '@/views/wms/storage_manage/product/productIn/AddBox' +import crudSectattr from '@/api/wms/basedata/st/sectattr' export default { name: 'DivDialog', @@ -285,7 +286,7 @@ export default { }, methods: { open() { - crudProductIn.getSect({ 'stor_id': this.storId }).then(res => { + crudSectattr.getSect({ 'stor_id': this.storId }).then(res => { this.sects = res.content }) const area_type = 'A1_RK01'