From c17dcbf09d287a0a6d2bdbe443ec2630c3934370 Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Thu, 6 Apr 2023 16:36:49 +0800
Subject: [PATCH] 库位比较功能支持比较所有库位任务
---
ant-design-vue-jeecg/src/views/system/compare/CompareWcsLocationTask.vue | 31 ++++++++++++++++++++++++-------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/dto/QueryCompareLocationTaskDto.java | 6 ++++++
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java | 27 +++++++++++++++++----------
3 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/system/compare/CompareWcsLocationTask.vue b/ant-design-vue-jeecg/src/views/system/compare/CompareWcsLocationTask.vue
index 9689495..2768e61 100644
--- a/ant-design-vue-jeecg/src/views/system/compare/CompareWcsLocationTask.vue
+++ b/ant-design-vue-jeecg/src/views/system/compare/CompareWcsLocationTask.vue
@@ -23,6 +23,25 @@
/>
</a-form-item>
</a-col>
+ <a-col :xl="12" :lg="14" :md="16" :sm="24">
+ <a-form-item label="任务创建时间">
+ <j-date
+ :show-time="true"
+ date-format="YYYY-MM-DD HH:mm:ss"
+ placeholder="请选择开始时间"
+ class="query-group-cust"
+ v-model="queryParam.taskCreateTimeBegin"
+ ></j-date>
+ <span class="query-group-split-cust"></span>
+ <j-date
+ :show-time="true"
+ date-format="YYYY-MM-DD HH:mm:ss"
+ placeholder="请选择结束时间"
+ class="query-group-cust"
+ v-model="queryParam.taskCreateTimeEnd"
+ ></j-date>
+ </a-form-item>
+ </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -94,12 +113,8 @@ export default {
mainId: {
immediate: true,
handler(val) {
- if (!this.mainId) {
- this.clearList()
- } else {
- this.queryParam['locationCode'] = val
- this.loadData(1)
- }
+ this.queryParam['locationCode'] = val
+ this.loadData(1)
}
}
},
@@ -202,6 +217,9 @@ export default {
},
created() {
this.initDictData()
+ var nowDate = new Date()
+ this.queryParam['taskCreateTimeBegin'] = new Date(nowDate.getTime() - 90 * 24 * 60 * 60 * 1000)
+ this.queryParam['taskCreateTimeEnd'] = nowDate
},
methods: {
initDictData() {
@@ -227,7 +245,6 @@ export default {
}
})
}
-
// 获取 wcs_task_status
if (getDictItemsFromCache('wcs_task_status')) {
this.wcsTaskStatusList = getDictItemsFromCache('wcs_task_status')
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/dto/QueryCompareLocationTaskDto.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/dto/QueryCompareLocationTaskDto.java
index d42009c..d6500bb 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/dto/QueryCompareLocationTaskDto.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/dto/QueryCompareLocationTaskDto.java
@@ -25,6 +25,12 @@ public class QueryCompareLocationTaskDto {
/** 数据状态 */
private Integer consistencyStatus;
+ /** 任务创建时间开始区间 */
+ private String taskCreateTimeBegin;
+
+ /** 任务创建时间结束区间 */
+ private String taskCreateTimeEnd;
+
/** 页码 */
private Integer pageNo = 1;
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
index c658b5c..785b024 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
@@ -458,7 +458,6 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
Map<String, List<WcsLocationDto>> wcsLocationMap = new HashMap<String, List<WcsLocationDto>>();
// 1.获取WMS库位表库位信息
- Page<Location> page = new Page<Location>(queryCompareLocationDto.getPageNo(), queryCompareLocationDto.getPageSize());
LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
locationLambdaQueryWrapper.select(Location::getWarehouseCode, Location::getCode, Location::getContainerCode, Location::getStatus)
.eq(Location::getWarehouseCode, queryCompareLocationDto.getWarehouseCode())
@@ -568,9 +567,9 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
@Override
public PageUtil<CompareLocationTaskDto> compareWcsLocationTask(QueryCompareLocationTaskDto queryCompareLocationTaskDto) {
List<CompareLocationTaskDto> finalCompareLocationTaskList = new ArrayList<CompareLocationTaskDto>();
- if (queryCompareLocationTaskDto.getLocationCode() == null) {
- return PageUtil.create(finalCompareLocationTaskList, queryCompareLocationTaskDto.getPageNo(), queryCompareLocationTaskDto.getPageSize());
- }
+// if (queryCompareLocationTaskDto.getLocationCode() == null) {
+// return PageUtil.create(finalCompareLocationTaskList, queryCompareLocationTaskDto.getPageNo(), queryCompareLocationTaskDto.getPageSize());
+// }
// 只查询近90天的数据
// String queryCreateTime = DateUtil.format(DateUtil.offsetDay(new Date(), -90), DatePattern.NORM_DATE_PATTERN);
// 1.获取WMS任务信息
@@ -579,12 +578,14 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
.select(TaskHeader::getId, TaskHeader::getWarehouseCode, TaskHeader::getTaskType, TaskHeader::getFromLocationCode, TaskHeader::getToLocationCode,
TaskHeader::getContainerCode, TaskHeader::getStatus, TaskHeader::getCreateTime)
.eq(TaskHeader::getWarehouseCode, queryCompareLocationTaskDto.getWarehouseCode())
+ .gt(StringUtils.isNotEmpty(queryCompareLocationTaskDto.getTaskCreateTimeBegin()), TaskHeader::getCreateTime, queryCompareLocationTaskDto.getTaskCreateTimeBegin())
+ .lt(StringUtils.isNotEmpty(queryCompareLocationTaskDto.getTaskCreateTimeEnd()),TaskHeader::getCreateTime, queryCompareLocationTaskDto.getTaskCreateTimeEnd());
// .ge(TaskHeader::getCreateTime, queryCreateTime)
- .and(t -> t.eq(StringUtils.isNotEmpty(queryCompareLocationTaskDto.getLocationCode()), TaskHeader::getFromLocationCode,
- queryCompareLocationTaskDto.getLocationCode()).or().eq(StringUtils.isNotEmpty(queryCompareLocationTaskDto.getLocationCode()),
- TaskHeader::getToLocationCode, queryCompareLocationTaskDto.getLocationCode()));
+ if (StringUtils.isNotEmpty(queryCompareLocationTaskDto.getLocationCode())) {
+ taskHeaderLambdaQueryWrapper.and(t -> t.eq(TaskHeader::getFromLocationCode, queryCompareLocationTaskDto.getLocationCode()).or()
+ .eq(TaskHeader::getToLocationCode, queryCompareLocationTaskDto.getLocationCode()));
+ }
List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
-
// 2.获取WCS任务信息
String url = addressService.getUrlByParam(QuantityConstant.ADDRESS_WCS_TAKS_INFOS);
Map<String, Object> queryParamMap = new HashMap<String, Object>();
@@ -594,6 +595,12 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
if (StringUtils.isNotEmpty(queryCompareLocationTaskDto.getLocationCode())) {
queryParamMap.put("location", queryCompareLocationTaskDto.getLocationCode());
}
+ if (StringUtils.isNotEmpty(queryCompareLocationTaskDto.getTaskCreateTimeBegin())) {
+ queryParamMap.put("begin", queryCompareLocationTaskDto.getTaskCreateTimeBegin());
+ }
+ if (StringUtils.isNotEmpty(queryCompareLocationTaskDto.getTaskCreateTimeEnd())) {
+ queryParamMap.put("end", queryCompareLocationTaskDto.getTaskCreateTimeEnd());
+ }
// queryParamMap.put("begin", queryCreateTime);
String jsonStringResult = OkHttpUtils.sendPostByJsonStr(url, JSON.toJSONString(queryParamMap));
WcsResultDto<List<WcsTaskDto>> wcsResult = JSON.parseObject(jsonStringResult, new TypeReference<WcsResultDto<List<WcsTaskDto>>>() {});
@@ -686,8 +693,8 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
finalCompareLocationTaskList.stream().filter(t -> queryCompareLocationTaskDto.getWcsId().equals(t.getWcsId())).collect(Collectors.toList());
}
if (queryCompareLocationTaskDto.getConsistencyStatus() != null) {
- finalCompareLocationTaskList = finalCompareLocationTaskList.stream().filter(t -> queryCompareLocationTaskDto.getConsistencyStatus().equals(t.getConsistencyStatus()))
- .collect(Collectors.toList());
+ finalCompareLocationTaskList = finalCompareLocationTaskList.stream()
+ .filter(t -> queryCompareLocationTaskDto.getConsistencyStatus().equals(t.getConsistencyStatus())).collect(Collectors.toList());
}
return PageUtil.create(finalCompareLocationTaskList, queryCompareLocationTaskDto.getPageNo(), queryCompareLocationTaskDto.getPageSize());
}
--
libgit2 0.22.2