From c0abc40c3187ffdbde635a7df51c45fe8ed54741 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 29 五月 2025 16:57:13 +0800 Subject: [PATCH] 优先级显示优化 提高优先级,需判断浅库位的优先级 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 74 ++++++++++++++++++++++++++++-------- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 2 + rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 4 +- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java | 2 + rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 38 +++++++++--------- 5 files changed, 82 insertions(+), 38 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java index d58dd54..3ac0737 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java @@ -1,6 +1,7 @@ package com.vincent.rsf.server.manager.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.vincent.rsf.framework.common.Cools; @@ -19,6 +20,8 @@ import com.vincent.rsf.server.system.service.impl.ConfigServiceImpl; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; @@ -29,6 +32,8 @@ @RestController public class TaskController extends BaseController { + + public static final Logger logger = LoggerFactory.getLogger(TaskController.class); @Autowired private TaskService taskService; @@ -47,7 +52,9 @@ public R page(@RequestBody Map<String, Object> map) { BaseParam baseParam = buildParam(map, BaseParam.class); PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class); - return R.ok().add(taskService.page(pageParam, pageParam.buildWrapper(true))); + QueryWrapper<Task> queryWrapper = pageParam.buildWrapper(true); + queryWrapper.orderByDesc("sort"); + return R.ok().add(taskService.page(pageParam, queryWrapper)); } @PreAuthorize("hasAuthority('manager:task:list')") @@ -137,14 +144,13 @@ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>() .eq(Task::getId, id) .in(Task::getTaskStatus, longs)); - for (Task task : tasks) { - if (StringUtils.isNotBlank(task.getParentId() + "")) { - Task task1 = taskService.getById(task.getParentId()); - if (!Objects.isNull(task1) && task1.getTaskType().equals(TaskStsType.UPDATED_IN.id)) { - throw new CoolException("鐖朵换鍔★細" + task1.getTaskCode() + "鏈墽琛屽畬鎴愶紒"); - } - } +// if (StringUtils.isNotBlank(task.getParentId() + "")) { +// Task task1 = taskService.getById(task.getParentId()); +// if (!Objects.isNull(task1) && task1.getTaskType().equals(TaskStsType.UPDATED_IN.id)) { +// throw new CoolException("鐖朵换鍔★細" + task1.getTaskCode() + "鏈墽琛屽畬鎴愶紒"); +// } +// } task.setTaskStatus(task.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id); } @@ -205,21 +211,15 @@ @PreAuthorize("hasAuthority('manager:task:update')") @ApiOperation("浠诲姟鍑哄簱缃《") @PostMapping("/task/top/{id}") - public R setTop(@PathVariable String id) { + public R setTop(@PathVariable Long id) { if (Objects.isNull(id)) { throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); } - List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id); - List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs)); - if (tasks.isEmpty()) { - throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿疆椤讹紒锛�"); - } try { - if (!taskService.update(new LambdaUpdateWrapper<Task>().set(Task::getSort, 100).eq(Task::getId, id))) { - throw new CoolException("缃《澶辫触锛侊紒"); - } - } catch (Exception ex) { - return R.error("浠诲姟寮傚父锛屾棤娉曞畬鎴愶紒锛�"); + taskService.taskToTop(id); + } catch (Exception e) { + logger.error("UNK", e); + throw new CoolException(e.getMessage()); } return R.ok(); } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java index f3fc609..997a919 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java @@ -122,7 +122,7 @@ * 浼樺厛绾� */ @ApiModelProperty(value= "浼樺厛绾�") - private Short sort; + private Integer sort; /** * 寮傚父缂栫爜 @@ -199,7 +199,7 @@ public Task() {} - public Task(String taskCode,Integer taskStatus,Integer taskType,String orgLoc,String targLoc,String barcode,String robotCode,Short exceStatus,String expDesc,Short sort,String expCode,Date startTime,Date endTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) { + public Task(String taskCode,Integer taskStatus,Integer taskType,String orgLoc,String targLoc,String barcode,String robotCode,Short exceStatus,String expDesc,Integer sort,String expCode,Date startTime,Date endTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) { this.taskCode = taskCode; this.taskStatus = taskStatus; this.taskType = taskType; diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java index 7e4379e..49d69a4 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java @@ -24,4 +24,6 @@ Task pickOrCheckTask(Long id, String oType) throws Exception; void complateInTask(List<Task> tasks) throws Exception; + + Task taskToTop(Long id) throws Exception; } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java index 2e04767..8c7bc86 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java @@ -98,6 +98,7 @@ .setTaskCode(ruleCode) .setParentId(moveTask.getId()) .setTargSite(siteNo) + .setSort(Short.valueOf("49")) .setUpdateBy(loginUserId) .setCreateBy(loginUserId) .setCreateTime(new Date()) @@ -283,6 +284,7 @@ .setTaskType(TaskType.TASK_TYPE_LOC_MOVE.type) .setTargLoc(targetLoc.getCode()) .setUpdateBy(loginUserId) + .setSort(Short.valueOf("49")) .setUpdateTime(new Date()) .setTaskStatus(TaskStsType.GENERATE_IN.id) .setBarcode(orgLoc.getBarcode()); diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java index 3252593..9dca556 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java @@ -206,8 +206,8 @@ if (!locService.update(new LambdaUpdateWrapper<Loc>() .eq(Loc::getCode, task.getTargLoc()) .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_S.type) - .set(Loc::getUpdateBy, loginUserId) - .set(Loc::getUpdateTime, new Date()) + .set(Loc::getUpdateBy, loginUserId) + .set(Loc::getUpdateTime, new Date()) .set(Loc::getBarcode, pakin.getBarcode()))) { throw new CoolException("搴撲綅棰勭害澶辫触锛侊紒"); } @@ -410,6 +410,47 @@ } } + /** + * 浠诲姟缃《 + * + * @param id + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Task taskToTop(Long id) throws Exception { + List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id); + Task tasks = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs)); + if (Objects.isNull(tasks)) { + throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿疆椤讹紒锛�"); + } + + if (!LocUtils.isShallowLoc(tasks.getOrgLoc())) { + String shallowLoc = LocUtils.getShallowLoc(tasks.getOrgLoc()); + Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc)); + if (Objects.isNull(loc)) { + throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒"); + } + if (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type) || loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type)) { + Task serviceOne = taskService.getOne(new LambdaQueryWrapper<Task>() + .eq(Task::getOrgLoc, loc.getCode()) + .or() + .eq(Task::getTargLoc, loc.getCode())); + if (Objects.isNull(serviceOne)) { + tasks.setSort(999); + } else { + int i = serviceOne.getSort() - 1; + tasks.setSort(i); + } + } + } + + if (!taskService.updateById(tasks)) { + throw new CoolException("缃《澶辫触锛侊紒"); + } + return null; + } + @Transactional(rollbackFor = Exception.class) public void moveInStock(Task task, Long loginUserId) { if (Objects.isNull(task)) { @@ -448,31 +489,30 @@ if (!locItemService.remove(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocCode, task.getOrgLoc()))) { throw new CoolException("婧愬簱浣嶆槑缁嗗垹闄ゅけ璐ワ紒"); } - } /**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/ if (!locService.update(new LambdaUpdateWrapper<Loc>() - .set(Loc::getBarcode, task.getBarcode()) - .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type) - .set(Loc::getUpdateBy, loginUserId) - .set(Loc::getUpdateTime, new Date()) - .eq(Loc::getCode, task.getTargLoc()))) { + .set(Loc::getBarcode, task.getBarcode()) + .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type) + .set(Loc::getUpdateBy, loginUserId) + .set(Loc::getUpdateTime, new Date()) + .eq(Loc::getCode, task.getTargLoc()))) { throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�"); } if (!locService.update(new LambdaUpdateWrapper<Loc>() - .set(Loc::getBarcode, null) - .set(Loc::getUpdateBy, loginUserId) - .set(Loc::getUpdateTime, new Date()) - .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type) + .set(Loc::getBarcode, null) + .set(Loc::getUpdateBy, loginUserId) + .set(Loc::getUpdateTime, new Date()) + .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type) .eq(Loc::getCode, task.getOrgLoc()))) { throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�"); } if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getId, task.getId()) - .set(Task::getUpdateBy, loginUserId) - .set(Task::getUpdateTime, new Date()) + .set(Task::getUpdateBy, loginUserId) + .set(Task::getUpdateTime, new Date()) .set(Task::getTaskStatus, TaskStsType.UPDATED_IN.id))) { throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�"); } @@ -857,8 +897,8 @@ if (!locService.update(new LambdaUpdateWrapper<Loc>() .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type) .set(Loc::getBarcode, null) - .set(Loc::getUpdateBy, loginUserId) - .set(Loc::getUpdateTime, new Date()) + .set(Loc::getUpdateBy, loginUserId) + .set(Loc::getUpdateTime, new Date()) .eq(Loc::getId, loc.getId()))) { throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�"); } @@ -1028,7 +1068,7 @@ if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>() .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val) - .set(WaitPakin::getUpdateBy, loginUserId) + .set(WaitPakin::getUpdateBy, loginUserId) .eq(WaitPakin::getId, pakinItem.getPakinId()))) { throw new CoolException("缁勬嫋鐘舵�佷慨鏀瑰け璐ワ紒锛�"); } -- Gitblit v1.9.1