From e6e49ec865a5a03e06a245eb01fd8cb1ac397c7e Mon Sep 17 00:00:00 2001
From: youjie <272855983@qq.com>
Date: Sun, 26 Mar 2023 16:23:22 +0800
Subject: [PATCH] 任务排序id由大到小
---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java | 1 +
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
index dd9fae6..1c672ee 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
@@ -102,6 +102,7 @@ public class TaskHeaderController extends HuahengBaseController {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
HuahengJwtUtil.setWarehouseCode(req, taskHeader);
QueryWrapper<TaskHeader> queryWrapper = QueryGenerator.initQueryWrapper(taskHeader, req.getParameterMap());
+ queryWrapper.orderByDesc("id");
Page<TaskHeader> page = new Page<TaskHeader>(pageNo, pageSize);
IPage<TaskHeader> pageList = taskHeaderService.page(page, queryWrapper);
return Result.OK(pageList);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
index 7f5da52..6f488a4 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -2274,8 +2274,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
}
if (StringUtils.isNotEmpty(toLocationCode)) {
- success = locationService.updateStatusByOriginStatus(toLocationCode, QuantityConstant.STATUS_LOCATION_EMPTY, QuantityConstant.STATUS_LOCATION_LOCK,
- warehouseCode);
+ success = locationService.updateStatus(toLocationCode, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
if (!success) {
throw new JeecgBootException("取消任务时， 更新目标库位状态失败");
}
--
libgit2 0.22.2