库位监控改成根据库区筛选

李泰瑜
1 parent 6ea51483
Showing 3 changed files with 4 additions and 5 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/locationMonitor/controller/LocationMonitorController.java
@@ -104,7 +104,7 @@ export const getZoneList = (params) =&gt; getAction(&#39;/config/zone/getZoneList&#39;, 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);
 //获取货主列表
@@ -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);
@@ -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<>();