diff --git a/ant-design-vue-jeecg/src/api/api.js b/ant-design-vue-jeecg/src/api/api.js index f13e4e5..6f4322d 100644 --- a/ant-design-vue-jeecg/src/api/api.js +++ b/ant-design-vue-jeecg/src/api/api.js @@ -213,6 +213,8 @@ export const handleDoubleIn = (params) => postAction('/task/taskHeader/handleDou export const queryWarehouse = (params) => getAction("/config/sysUserWarehouse/queryWarehouse", params); //查询所有仓库 export const getAllWarehouseList = (params) => getAction("/config/warehouse/getAllWarehouseList", params); +//查询所有库区 +export const getAllZoneList = (params) => getAction("/config/zone/getAllZoneList", params); // 中转HTTP请求 export const transitRESTful = { get: (url, parameter) => getAction(getTransitURL(url), parameter), diff --git a/ant-design-vue-jeecg/src/views/system/UserList.vue b/ant-design-vue-jeecg/src/views/system/UserList.vue index 5b45620..064fd95 100644 --- a/ant-design-vue-jeecg/src/views/system/UserList.vue +++ b/ant-design-vue-jeecg/src/views/system/UserList.vue @@ -196,7 +196,7 @@ import UserModal from './modules/UserModal' import PasswordModal from './modules/PasswordModal' import {putAction, getFileAccessHttpUrl} from '@/api/manage'; -import {frozenBatch, getAllWarehouseList, queryall, getZoneList} from '@/api/api' +import {frozenBatch, getAllWarehouseList, queryall, getZoneList, getAllZoneList} from '@/api/api' import {JeecgListMixin} from '@/mixins/JeecgListMixin' import SysUserAgentModal from "./modules/SysUserAgentModal"; import JInput from '@/components/jeecg/JInput' @@ -289,18 +289,17 @@ export default { { title: '所属仓库', align: "center", - dataIndex: 'selectedWarehouses', - width: 240, - key: 'selectedWarehouses', - scopedSlots: {customRender: 'selectedWarehouses'} + dataIndex: 'selectedWarehouses', key: 'selectedWarehouses', + scopedSlots: {customRender: 'selectedWarehouses'}, + width: 200 }, { title: '所属库区', align: "center", dataIndex: 'zoneCodes', - width: 240, key: 'zoneCodes', - scopedSlots: {customRender: 'zoneCodes'} + scopedSlots: {customRender: 'zoneCodes'}, + width: 200 }, // { // title: '部门', @@ -353,7 +352,7 @@ export default { }, methods: { loadFrom() { - getZoneList().then((res) => { + getAllZoneList().then((res) => { if (res.success) { this.zoneList = res.result } diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/controller/ZoneController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/controller/ZoneController.java index 456bc59..8b0fec9 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/controller/ZoneController.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/controller/ZoneController.java @@ -186,9 +186,10 @@ public class ZoneController extends JeecgController<Zone, IZoneService> { } @RequestMapping(value = "/getAllZoneList", method = RequestMethod.GET) - public Result<List<Zone>> getAllZoneList() { + public Result<List<Zone>> getAllZoneList(HttpServletRequest req) { + String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req); Result<List<Zone>> result = new Result<>(); - List<Zone> list = zoneService.getAllZoneList(); + List<Zone> list = zoneService.getAllZoneList(warehouseCode); result.setResult(list); result.setSuccess(true); return result; diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/service/IZoneService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/service/IZoneService.java index 5961946..0013a59 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/service/IZoneService.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/service/IZoneService.java @@ -16,5 +16,5 @@ public interface IZoneService extends IService<Zone> { Zone getZoneByCode(String zoneCode, String wareohuseCode); - public List<Zone> getAllZoneList(); + List<Zone> getAllZoneList(String wareohuseCode); } diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/service/impl/ZoneServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/service/impl/ZoneServiceImpl.java index bb31fd3..19b8307 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/service/impl/ZoneServiceImpl.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/service/impl/ZoneServiceImpl.java @@ -29,7 +29,9 @@ public class ZoneServiceImpl extends ServiceImpl<ZoneMapper, Zone> implements IZ } @Override - public List<Zone> getAllZoneList() { + public List<Zone> getAllZoneList(String wareohuseCode) { + LambdaQueryWrapper<Zone> zoneLambdaQueryWrapper = Wrappers.lambdaQuery(); + zoneLambdaQueryWrapper.eq(Zone::getWarehouseCode, wareohuseCode); return list(); } }