From 6fb44f724a4b359f669a8a68aaad690018708cc2 Mon Sep 17 00:00:00 2001
From: lty <1179749281@qq.com>
Date: Thu, 30 Mar 2023 16:58:48 +0800
Subject: [PATCH] 库位监控改成根据库区筛选
---
ant-design-vue-jeecg/src/api/api.js | 2 +-
ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue | 5 ++---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/locationMonitor/controller/LocationMonitorController.java | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ant-design-vue-jeecg/src/api/api.js b/ant-design-vue-jeecg/src/api/api.js
index 02c948d..1ad7127 100644
--- a/ant-design-vue-jeecg/src/api/api.js
+++ b/ant-design-vue-jeecg/src/api/api.js
@@ -104,7 +104,7 @@ export const getZoneList = (params) => getAction('/config/zone/getZoneList', par
//获取容器类型列表
export const getContainerTypeList = (params) => getAction('/config/containerType/getContainerTypeList', params);
//获取库位类型列表
-export const getLocationTypeList = (params) => getAction('/config/locationType/getLocationTypeList', params);
+export const getLocationTypeList = (params) => getAction('/config/zone/getZoneList', params);
//获取库位类高度列表
export const getLocationHighList = (params) => postAction('/config/locationHigh/getLocationHighList', params);
//获取货主列表
diff --git a/ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue b/ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue
index a15ec6c..8da6c01 100644
--- a/ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue
+++ b/ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue
@@ -14,7 +14,7 @@
@change="refresh"
style="width: 200px">
<a-select-option selected="0" id="zoneCode" v-for="item in locationTypeList" :key="item.name"
- :value="item.code">{{ item.name }}
+ :value="item.locationTypeCode">{{ item.name }}
</a-select-option>
</a-select>
</li>
@@ -189,7 +189,7 @@ export default {
if (res.success) {
this.locationTypeList = res.result;
if (this.locationTypeList.length > 0) {
- this.zoneCode = this.locationTypeList[0].code;
+ this.zoneCode = this.locationTypeList[0].locationTypeCode;
let _this = this;
this.resetAjax(this.zoneCode);
}
@@ -228,7 +228,6 @@ export default {
$("#editable-num").append("<option value='" + i + "'>" + i + "</option>")
}
}
- alert($("#editable-select").val())
let type = $("#zoneCode").val();
this.resetAjax(this.zoneCode);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/locationMonitor/controller/LocationMonitorController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/locationMonitor/controller/LocationMonitorController.java
index 22a59a0..87cd958 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/locationMonitor/controller/LocationMonitorController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/locationMonitor/controller/LocationMonitorController.java
@@ -92,7 +92,7 @@ public class LocationMonitorController {
HuahengJwtUtil.setWarehouseCode(locationLambdaQueryWrapper, Location.class, req);
locationLambdaQueryWrapper.eq(StringUtils.isNotEmpty(row), Location::getRow, row).eq(StringUtils.isNotEmpty(line), Location::getIcolumn, line)
.eq(StringUtils.isNotEmpty(layer), Location::getLayer, layer).eq(StringUtils.isNotEmpty(grid), Location::getGrid, grid)
- .eq(StringUtils.isNotEmpty(type), Location::getZoneCode, type);
+ .eq(StringUtils.isNotEmpty(type), Location::getLocationTypeCode, type);
List<Location> locations = locationService.list(locationLambdaQueryWrapper);
List<Location> locationList = new ArrayList<>();
--
libgit2 0.22.2