Commit e6e49ec865a5a03e06a245eb01fd8cb1ac397c7e

Authored by 肖超群
1 parent 654a8942

任务排序id由大到小

huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
@@ -102,6 +102,7 @@ public class TaskHeaderController extends HuahengBaseController { @@ -102,6 +102,7 @@ public class TaskHeaderController extends HuahengBaseController {
102 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { 102 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
103 HuahengJwtUtil.setWarehouseCode(req, taskHeader); 103 HuahengJwtUtil.setWarehouseCode(req, taskHeader);
104 QueryWrapper<TaskHeader> queryWrapper = QueryGenerator.initQueryWrapper(taskHeader, req.getParameterMap()); 104 QueryWrapper<TaskHeader> queryWrapper = QueryGenerator.initQueryWrapper(taskHeader, req.getParameterMap());
  105 + queryWrapper.orderByDesc("id");
105 Page<TaskHeader> page = new Page<TaskHeader>(pageNo, pageSize); 106 Page<TaskHeader> page = new Page<TaskHeader>(pageNo, pageSize);
106 IPage<TaskHeader> pageList = taskHeaderService.page(page, queryWrapper); 107 IPage<TaskHeader> pageList = taskHeaderService.page(page, queryWrapper);
107 return Result.OK(pageList); 108 return Result.OK(pageList);
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&lt;TaskHeaderMapper, TaskHea @@ -2274,8 +2274,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
2274 } 2274 }
2275 } 2275 }
2276 if (StringUtils.isNotEmpty(toLocationCode)) { 2276 if (StringUtils.isNotEmpty(toLocationCode)) {
2277 - success = locationService.updateStatusByOriginStatus(toLocationCode, QuantityConstant.STATUS_LOCATION_EMPTY, QuantityConstant.STATUS_LOCATION_LOCK,  
2278 - warehouseCode); 2277 + success = locationService.updateStatus(toLocationCode, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
2279 if (!success) { 2278 if (!success) {
2280 throw new JeecgBootException("取消任务时, 更新目标库位状态失败"); 2279 throw new JeecgBootException("取消任务时, 更新目标库位状态失败");
2281 } 2280 }