库位比较功能提交（5）

Signed-off-by: TanYibin <5491541@qq.com>

库位比较功能提交（5）
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent 57cae75a
Showing 6 changed files with 278 additions and 116 deletions
ant-design-vue-jeecg/src/views/system/compare/CompareWcsLocation.vue
ant-design-vue-jeecg/src/views/system/compare/CompareWcsLocationTask.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/dto/CompareLocationDto.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/dto/QueryCompareLocationDto.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/dto/WcsLocationDto.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
@@ -15,11 +15,11 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="库位状态">
+            <a-form-item label="数据一致性状态">
               <j-dict-select-tag
-                placeholder="请选择库位状态"
-                v-model="queryParam.locationStatus"
-                dictCode="location_status"
+                placeholder="请选择数据一致性状态"
+                v-model="queryParam.consistencyStatus"
+                dictCode="consistency_status"
               />
             </a-form-item>
           </a-col>
@@ -51,9 +51,31 @@
         :customRow="clickThenSelect"
         @change="handleTableChange"
       >
+        <span slot="locationStatus" slot-scope="locationStatus">
+          <a-tag :key="locationStatus">
+            {{ solutionLocationStatus(locationStatus) }}
+          </a-tag>
+        </span>
+
+        <span slot="containerStatus" slot-scope="containerStatus">
+          <a-tag :key="containerStatus">
+            {{ solutionContainerStatus(containerStatus) }}
+          </a-tag>
+        </span>
+
+        <span slot="wcsLocationStatus" slot-scope="wcsLocationStatus">
+          <a-tag :key="wcsLocationStatus">
+            {{ solutionWcsLocationStatus(wcsLocationStatus) }}
+          </a-tag>
+        </span>
+
+        <span slot="consistencyStatus" slot-scope="consistencyStatus">
+          <a-tag :key="consistencyStatus" :color="solutionPurchaseColor(consistencyStatus)">
+            {{ solutionConsistencyStatus(consistencyStatus) }}
+          </a-tag>
+        </span>
       </a-table>
     </div>
-
     <a-tabs defaultActiveKey="1">
       <a-tab-pane tab="库位任务详情" key="1">
         <CompareWcsLocationTask :mainId="selectedMainId" />
@@ -64,12 +86,11 @@
 <script>
 import '@/assets/less/TableExpand.less'
-import { mixinDevice } from '@/utils/mixin'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { getAction } from '@/api/manage'
 import CompareWcsLocationTask from './CompareWcsLocationTask'
 import { initDictOptions, filterMultiDictText } from '@/components/dict/JDictSelectUtil'
-import { compareWcsLocation } from '@/api/api'
+import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
 export default {
   name: 'CompareWcsLocation',
@@ -81,6 +102,10 @@ export default {
     return {
       description: '库位信息比较页面',
       querySource: {},
+      locationStatusList: [],
+      containerStatusList: [],
+      wcsLocationStatusList: [],
+      consistencyStatusList: [],
       // 表头
       columns: [
         {
@@ -94,48 +119,52 @@ export default {
           dataIndex: 'locationContainerCode'
         },
         {
-          title: '库位表状态',
-          align: 'center',
-          // dataIndex: 'locationStatus_dictText'
-          dataIndex: 'locationStatus'
-        },
-        {
           title: '托盘表容器编码',
           align: 'center',
           dataIndex: 'containerContainerCode'
         },
         {
-          title: '托盘表状态',
+          title: '库存表容器编码',
           align: 'center',
-          dataIndex: 'containerStatus'
+          dataIndex: 'inventoryContainerCode'
         },
         {
-          title: '库存表容器编码',
+          title: 'WCS库位表容器编码',
           align: 'center',
-          dataIndex: 'inventoryContainerCode'
+          dataIndex: 'wcsContainerCode'
         },
         {
-          title: '库存表状态',
+          title: '库位表状态',
           align: 'center',
-          dataIndex: 'inventoryStatus'
+          dataIndex: 'locationStatus',
+          key: 'locationStatus',
+          scopedSlots: { customRender: 'locationStatus' }
         },
         {
-          title: 'WCS库位表容器编码',
+          title: '托盘表状态',
           align: 'center',
-          dataIndex: 'wcsContainerCode'
+          dataIndex: 'containerStatus',
+          key: 'containerStatus',
+          scopedSlots: { customRender: 'containerStatus' }
         },
         {
           title: 'WCS库位表状态',
           align: 'center',
-          dataIndex: 'wcsLocationStatus'
+          dataIndex: 'wcsLocationStatus',
+          key: 'wcsLocationStatus',
+          scopedSlots: { customRender: 'wcsLocationStatus' }
+        },
+        {
+          title: '数据一致性状态',
+          align: 'center',
+          dataIndex: 'consistencyStatus',
+          key: 'consistencyStatus',
+          scopedSlots: { customRender: 'consistencyStatus' }
         }
       ],
       url: {
         list: '/config/location/compareWcsLocation'
       },
-      dictOptions: {
-        locationStatus: []
-      },
       /* 分页参数 */
       ipagination: {
         current: 1,
@@ -153,14 +182,103 @@ export default {
     }
   },
   created() {
-    this.getSuperFieldList()
-  },
-  computed: {
-    importExcelUrl: function() {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
-    }
+    this.initDictData()
   },
   methods: {
+    //优先从缓存中读取字典配置
+    initDictData() {
+      // 获取 location_status
+      if (getDictItemsFromCache('location_status')) {
+        this.locationStatusList = getDictItemsFromCache('location_status')
+      } else {
+        //根据字典Code, 初始化字典数组
+        ajaxGetDictItems('location_status', null).then(res => {
+          if (res.success) {
+            this.locationStatusList = res.result
+          }
+        })
+      }
+      // 获取 container_status
+      if (getDictItemsFromCache('container_status')) {
+        this.containerStatusList = getDictItemsFromCache('container_status')
+      } else {
+        //根据字典Code, 初始化字典数组
+        ajaxGetDictItems('container_status', null).then(res => {
+          if (res.success) {
+            this.containerStatusList = res.result
+          }
+        })
+      }
+      // 获取 wcs_location_status
+      if (getDictItemsFromCache('wcs_location_status')) {
+        this.wcsLocationStatusList = getDictItemsFromCache('wcs_location_status')
+      } else {
+        //根据字典Code, 初始化字典数组
+        ajaxGetDictItems('wcs_location_status', null).then(res => {
+          if (res.success) {
+            this.wcsLocationStatusList = res.result
+          }
+        })
+      }
+      // 获取 consistency_status
+      if (getDictItemsFromCache('consistency_status')) {
+        this.consistencyStatusList = getDictItemsFromCache('consistency_status')
+      } else {
+        //根据字典Code, 初始化字典数组
+        ajaxGetDictItems('consistency_status', null).then(res => {
+          if (res.success) {
+            this.consistencyStatusList = res.result
+          }
+        })
+      }
+    },
+    solutionLocationStatus(value) {
+      var actions = []
+      Object.keys(this.locationStatusList).some(key => {
+        if (this.locationStatusList[key].value == '' + value) {
+          actions.push(this.locationStatusList[key].text)
+          return true
+        }
+      })
+      return actions.join('')
+    },
+    solutionContainerStatus(value) {
+      var actions = []
+      Object.keys(this.containerStatusList).some(key => {
+        if (this.containerStatusList[key].value == '' + value) {
+          actions.push(this.containerStatusList[key].text)
+          return true
+        }
+      })
+      return actions.join('')
+    },
+    solutionWcsLocationStatus(value) {
+      var actions = []
+      Object.keys(this.wcsLocationStatusList).some(key => {
+        if (this.wcsLocationStatusList[key].value == '' + value) {
+          actions.push(this.wcsLocationStatusList[key].text)
+          return true
+        }
+      })
+      return actions.join('')
+    },
+    solutionConsistencyStatus(value) {
+      var actions = []
+      Object.keys(this.consistencyStatusList).some(key => {
+        if (this.consistencyStatusList[key].value == '' + value) {
+          actions.push(this.consistencyStatusList[key].text)
+          return true
+        }
+      })
+      return actions.join('')
+    },
+    solutionPurchaseColor(value) {
+      var color = 'blue'
+      if (0 == value) {
+        color = 'red'
+      }
+      return color
+    },
     initDictConfig() {},
     clickThenSelect(record) {
       return {
@@ -181,19 +299,6 @@ export default {
       this.selectedRowKeys = selectedRowKeys
       this.selectionRows = selectionRows
     },
-    createTask(record) {
-      this.loading = true
-      this.model = Object.assign({}, record)
-      createReceiptTask(this.model).then(res => {
-        this.loading = false
-        if (res.success) {
-          this.$message.success(res.message)
-        } else {
-          this.$message.error(res.message)
-        }
-        this.searchQuery()
-      })
-    },
     loadData(arg) {
       if (!this.url.list) {
         this.$message.error('请设置url.list属性!')
@@ -216,19 +321,6 @@ export default {
         }
         this.loading = false
       })
-    },
-    getSuperFieldList() {
-      let fieldList = []
-      fieldList.push({ type: 'string', value: 'locationCode', text: '库位编码', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'locationContainerCode', text: '库位表容器编码', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'locationStatus', text: '库位表状态', dictCode: 'location_status' })
-      fieldList.push({ type: 'string', value: 'containerContainerCode', text: '托盘表容器编码', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'containerStatus', text: '托盘表状态', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'inventoryContainerCode', text: '库存表容器编码', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'inventoryStatus', text: '库存表状态', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'wcsContainerCode', text: 'WCS库位容器编码' })
-      fieldList.push({ type: 'string', value: 'wcsLocationStatus', text: 'WCS库位表状态', dictCode: '' })
-      this.superFieldList = fieldList
     }
   }
 }
@@ -44,6 +44,17 @@
         :loading="loading"
         @change="handleTableChange"
       >
+        <span slot="taskType" slot-scope="taskType">
+          <a-tag :key="taskType">
+            {{ solutionTaskType(taskType) }}
+          </a-tag>
+        </span>
+
+        <span slot="taskStatus" slot-scope="taskStatus">
+          <a-tag :key="taskStatus">
+            {{ solutionTaskStatus(taskStatus) }}
+          </a-tag>
+        </span>
       </a-table>
     </div>
   </a-card>
@@ -51,6 +62,7 @@
 <script>
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { initDictOptions, filterMultiDictText } from '@/components/dict/JDictSelectUtil'
+import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
 export default {
   name: 'CompareWcsLocationTask',
@@ -80,6 +92,8 @@ export default {
     return {
       description: '库位任务信息比较页面',
       disableMixinCreated: true,
+      taskTypeList: [],
+      taskStatusList: [],
       // 表头
       columns: [
         {
@@ -95,7 +109,9 @@ export default {
         {
           title: 'WMS任务类型',
           align: 'center',
-          dataIndex: 'taskType_dictText'
+          dataIndex: 'taskType',
+          key: 'taskType',
+          scopedSlots: { customRender: 'taskType' }
         },
         {
           title: '源库位',
@@ -130,7 +146,9 @@ export default {
         {
           title: '任务状态',
           align: 'center',
-          dataIndex: 'taskStatus'
+          dataIndex: 'taskStatus',
+          key: 'taskStatus',
+          scopedSlots: { customRender: 'taskStatus' }
         },
         {
           title: 'WCS任务状态',
@@ -157,30 +175,62 @@ export default {
     }
   },
   created() {
-    this.getSuperFieldList()
-    this.loadFrom()
+    this.initDictData()
   },
   methods: {
+    initDictData() {
+      // 获取 location_status
+      if (getDictItemsFromCache('task_type')) {
+        this.taskTypeList = getDictItemsFromCache('task_type')
+      } else {
+        //根据字典Code, 初始化字典数组
+        ajaxGetDictItems('task_type', null).then(res => {
+          if (res.success) {
+            this.taskTypeList = res.result
+          }
+        })
+      }
+      if (getDictItemsFromCache('task_header_status')) {
+        this.taskStatusList = getDictItemsFromCache('task_header_status')
+      } else {
+        //根据字典Code, 初始化字典数组
+        ajaxGetDictItems('task_header_status', null).then(res => {
+          if (res.success) {
+            this.taskStatusList = res.result
+          }
+        })
+      }
+    },
     clearList() {
       this.dataSource = []
       this.selectedRowKeys = []
       this.ipagination.current = 1
     },
+    solutionTaskType(value) {
+      var actions = []
+      Object.keys(this.taskTypeList).some(key => {
+        if (this.taskTypeList[key].value == '' + value) {
+          actions.push(this.taskTypeList[key].text)
+          return true
+        }
+      })
+      return actions.join('')
+    },
+    solutionTaskStatus(value) {
+      var actions = []
+      Object.keys(this.taskStatusList).some(key => {
+        if (this.taskStatusList[key].value == '' + value) {
+          actions.push(this.taskStatusList[key].text)
+          return true
+        }
+      })
+      return actions.join('')
+    },
     searchReset() {
       var locationCode = this.queryParam['locationCode']
       this.queryParam = {}
       this.queryParam['locationCode'] = locationCode
       this.loadData(1)
-    },
-    loadFrom() {},
-    solutionCompany(value) {
-      var actions = []
-      return actions.join('')
-    },
-    getSuperFieldList() {
-      let fieldList = []
-      fieldList.push({ type: 'int', value: 'taskType', text: 'WMS任务类型', dictCode: 'task_type' })
-      this.superFieldList = fieldList
     }
   }
 }
 package org.jeecg.modules.wms.config.location.dto;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
 import lombok.Data;
 /**
@@ -12,7 +9,7 @@ import lombok.Data;
  */
 @Data
 public class CompareLocationDto {
-    
+
     /** 仓库编码 */
     private String warehouseCode;
@@ -21,27 +18,29 @@ public class CompareLocationDto {
     /** 库位表容器编码 */
     private String locationContainerCode;
-    
+
     /** 库位表状态 */
-    @Dict(dicCode = "location_status")
     private String locationStatus;
     /** 托盘表容器编码 */
     private String containerContainerCode;
-    
+
     /** 托盘表状态 */
     private String containerStatus;
     /** 库存表容器编码 */
     private String inventoryContainerCode;
-    
+
     /** 库存表状态 */
     private String inventoryStatus;
     /** WCS库位容器编码 */
     private String wcsContainerCode;
-    
+
     /** WCS库位表状态 */
     private String wcsLocationStatus;
-    
+
+    /** 数据一致性状态 */
+    private Integer consistencyStatus = 1;
+
 }
@@ -14,8 +14,8 @@ public class QueryCompareLocationDto {
     /** 托盘编码 */
     private String containerCode;
-    /** 库位状态 */
-    private String locationStatus;
+    /** 数据一致性状态 */
+    private Integer consistencyStatus;
     /** 页码 */
     private Integer pageNo = 1;
@@ -23,6 +23,18 @@ public class WcsLocationDto {
     private Integer roadWay;
     /** 库位状态 */
-    private Integer status;
+    private String status;
+
+    public void setStatus(Integer status) {
+        if (status != null && status.equals(0)) {
+            this.status = "empty";
+        }
+        if (status != null && status.equals(10)) {
+            this.status = "lock";
+        }
+        if (status != null && status.equals(30)) {
+            this.status = "disable";
+        }
+    }
 }
@@ -60,6 +60,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 /**
  * @Description: 库位管理
@@ -462,41 +463,39 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
         locationLambdaQueryWrapper.select(Location::getWarehouseCode, Location::getCode, Location::getContainerCode, Location::getStatus)
             .eq(Location::getWarehouseCode, queryCompareLocationDto.getWarehouseCode())
             .eq(StringUtils.isNotEmpty(queryCompareLocationDto.getLocationCode()), Location::getCode, queryCompareLocationDto.getLocationCode())
-            .eq(StringUtils.isNotEmpty(queryCompareLocationDto.getContainerCode()), Location::getContainerCode, queryCompareLocationDto.getContainerCode())
-            .eq(StringUtils.isNotEmpty(queryCompareLocationDto.getLocationStatus()), Location::getStatus, queryCompareLocationDto.getLocationStatus());
-        Page<Location> locationPage = page(page, locationLambdaQueryWrapper);
-        if (!CollectionUtils.isEmpty(locationPage.getRecords())) {
-            locationMap.putAll(locationPage.getRecords().stream().collect(Collectors.toMap(Location::getCode, Function.identity(), (key1, key2) -> key2)));
-            locationCodes.addAll(locationPage.getRecords().stream().map(t -> t.getCode()).collect(Collectors.toSet()));
-        }
-
-        // 2.获取WMS托盘表库位信息
-        LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
-        containerLambdaQueryWrapper.select(Container::getWarehouseCode, Container::getLocationCode, Container::getCode, Container::getStatus)
-            .eq(Container::getWarehouseCode, queryCompareLocationDto.getWarehouseCode()).in(Container::getLocationCode, locationCodes);
-        List<Container> containerList = containerService.list(containerLambdaQueryWrapper);
-        if (!CollectionUtils.isEmpty(containerList)) {
-            containerMap.putAll(containerList.stream().collect(Collectors.groupingBy(Container::getLocationCode)));
-        }
-
-        // 3.获取WMS库存表库位信息
-        LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
-        inventoryDetailLambdaQueryWrapper
-            .select(InventoryDetail::getWarehouseCode, InventoryDetail::getLocationCode, InventoryDetail::getContainerCode, InventoryDetail::getInventoryStatus)
-            .eq(InventoryDetail::getWarehouseCode, queryCompareLocationDto.getWarehouseCode()).in(InventoryDetail::getLocationCode, locationCodes);
-        List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
-        if (!CollectionUtils.isEmpty(inventoryDetailList)) {
-            inventoryDetailMap.putAll(inventoryDetailList.stream().collect(Collectors.groupingBy(InventoryDetail::getLocationCode)));
-        }
-        
-        // 4.获取WCS库位信息
+            .eq(StringUtils.isNotEmpty(queryCompareLocationDto.getContainerCode()), Location::getContainerCode, queryCompareLocationDto.getContainerCode());
+        List<Location> locationList = list(locationLambdaQueryWrapper);
+        if (!CollectionUtils.isEmpty(locationList)) {
+            locationMap.putAll(locationList.stream().collect(Collectors.toMap(Location::getCode, Function.identity(), (key1, key2) -> key2)));
+            locationCodes.addAll(locationList.stream().map(t -> t.getCode()).collect(Collectors.toSet()));
+        }
+
         if (!CollectionUtils.isEmpty(locationCodes)) {
+            // 2.获取WMS托盘表库位信息
+            LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
+            containerLambdaQueryWrapper.select(Container::getWarehouseCode, Container::getLocationCode, Container::getCode, Container::getStatus)
+                .eq(Container::getWarehouseCode, queryCompareLocationDto.getWarehouseCode()).in(Container::getLocationCode, locationCodes);
+            List<Container> containerList = containerService.list(containerLambdaQueryWrapper);
+            if (!CollectionUtils.isEmpty(containerList)) {
+                containerMap.putAll(containerList.stream().collect(Collectors.groupingBy(Container::getLocationCode)));
+            }
+
+            // 3.获取WMS库存表库位信息
+            LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+            inventoryDetailLambdaQueryWrapper
+                .select(InventoryDetail::getWarehouseCode, InventoryDetail::getLocationCode, InventoryDetail::getContainerCode, InventoryDetail::getInventoryStatus)
+                .eq(InventoryDetail::getWarehouseCode, queryCompareLocationDto.getWarehouseCode()).in(InventoryDetail::getLocationCode, locationCodes);
+            List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
+            if (!CollectionUtils.isEmpty(inventoryDetailList)) {
+                inventoryDetailMap.putAll(inventoryDetailList.stream().collect(Collectors.groupingBy(InventoryDetail::getLocationCode)));
+            }
+
+            // 4.获取WCS库位信息
             String url = addressService.getUrlByParam(QuantityConstant.ADDRESS_WCS_LOCATION_INFO);
             Map<String, Object> queryParamMap = new HashMap<String, Object>();
             if (StringUtils.isNotEmpty(queryCompareLocationDto.getWarehouseCode())) {
                 queryParamMap.put("warehouseCode", queryCompareLocationDto.getWarehouseCode());
             }
-            queryParamMap.put("locations", locationCodes);
             String jsonStringResult = OkHttpUtils.sendPostByJsonStr(url, JSON.toJSONString(queryParamMap));
             WcsResultDto<List<WcsLocationDto>> wcsResult = JSON.parseObject(jsonStringResult, new TypeReference<WcsResultDto<List<WcsLocationDto>>>() {});
             if (wcsResult.getCode() != null && wcsResult.getCode().equals(200)) {
@@ -544,16 +543,26 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
                 List<WcsLocationDto> wcsLocationGroupList = wcsLocationMap.get(locationCode);
                 if (!CollectionUtils.isEmpty(wcsLocationGroupList)) {
                     Set<String> wcsContainerCodes = wcsLocationGroupList.stream().map(t -> t.getContainerCode()).collect(Collectors.toSet());
-                    Set<Integer> wcsContainerStatus = wcsLocationGroupList.stream().map(t -> t.getStatus()).collect(Collectors.toSet());
+                    Set<String> wcsContainerStatus = wcsLocationGroupList.stream().map(t -> t.getStatus()).collect(Collectors.toSet());
                     compareLocationDto.setWcsContainerCode(StringUtils.join(wcsContainerCodes, ","));
                     compareLocationDto.setWcsLocationStatus(StringUtils.join(wcsContainerStatus, ","));
                 }
+                if (ObjectUtil.compare(compareLocationDto.getLocationContainerCode(), compareLocationDto.getContainerContainerCode()) != 0
+                    || ObjectUtil.compare(compareLocationDto.getLocationContainerCode(), compareLocationDto.getInventoryContainerCode()) != 0
+                    || ObjectUtil.compare(compareLocationDto.getLocationContainerCode(), compareLocationDto.getWcsContainerCode()) != 0
+                    || ObjectUtil.compare(compareLocationDto.getLocationStatus(), compareLocationDto.getContainerStatus()) != 0
+                    || ObjectUtil.compare(compareLocationDto.getLocationStatus(), compareLocationDto.getWcsLocationStatus()) != 0) {
+                    compareLocationDto.setConsistencyStatus(0);
+                }
                 compareLocationDtoList.add(compareLocationDto);
             }
+            if (queryCompareLocationDto.getConsistencyStatus() != null) {
+                compareLocationDtoList = compareLocationDtoList.stream().filter(t -> queryCompareLocationDto.getConsistencyStatus().equals(t.getConsistencyStatus()))
+                    .collect(Collectors.toList());
+            }
         }
         Collections.sort(compareLocationDtoList, Comparator.comparing(CompareLocationDto::getLocationCode));
-        return PageUtil.create(compareLocationDtoList, new Long(locationPage.getCurrent()).intValue(), new Long(locationPage.getSize()).intValue(),
-            new Long(locationPage.getTotal()).intValue());
+        return PageUtil.create(compareLocationDtoList, queryCompareLocationDto.getPageNo(), queryCompareLocationDto.getPageSize());
     }
     @Override