From 0e7fdc664a6af076c32ed0178f14dc4ca3799c6a Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 02 二月 2026 17:47:37 +0800
Subject: [PATCH] 任务管理页面，目标站点名称错误
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
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 732a3fa..78b6fc2 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
@@ -154,7 +154,7 @@
.setTaskType(TaskType.TASK_TYPE_IN.type)
.setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)
.setTargLoc(targetLoc)
- .setTargSite(targSite)
+ //.setTargSite(targSite)//鍏ュ簱娌℃湁鐩爣绔欑偣
.setOrgSite(orgSta)
.setBarcode(pakin.getBarcode())
.setCreateBy(loginUserId)
@@ -366,7 +366,7 @@
}
Task task = new Task();
task.setTaskCode(ruleCode)
- .setTaskStatus(TaskStsType.MISSION_INITIAL.id)
+ .setTaskStatus(TaskStsType.GENERATE_IN.id)
.setTaskType(TaskType.TASK_TYPE_IN.type)
.setResource(TaskResouceType.TASK_RESOUCE_PAKIN_TYPE.val)
.setTargLoc(targetLoc)
@@ -776,7 +776,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Task taskToTop(Long id, Long loginUserId) throws Exception {
- List<Integer> longs = Arrays.asList(TaskStsType.MISSION_INITIAL.id, TaskStsType.MISSION_INITIAL.id);
+ 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("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿疆椤讹紒锛�");
@@ -800,7 +800,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Task operateComplete(Long id, Long loginUserId) {
- List<Integer> longs = Arrays.asList(TaskStsType.MISSION_INITIAL.id, TaskStsType.MISSION_INITIAL.id);
+ List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
Task task = taskService.getOne(new LambdaQueryWrapper<Task>()
.eq(Task::getId, id)
.in(Task::getTaskStatus, longs));
@@ -1071,7 +1071,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R removeTask(Long[] ids, Long loginUserId) {
- List<Integer> longs = Arrays.asList(TaskStsType.MISSION_INITIAL.id, TaskStsType.MISSION_INITIAL.id);
+ List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_PICK_AGAIN_OUT.type,
TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_EMPTY_IN.type, TaskType.TASK_TYPE_LOC_MOVE.type,
TaskType.TASK_TYPE_EMPTY_OUT.type, TaskType.TASK_TYPE_MERGE_OUT.type);
@@ -1084,7 +1084,7 @@
}
for (Task task : tasks) {
//鍙栨秷绉诲簱浠诲姟
- if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type) && task.getTaskStatus().equals(TaskStsType.MISSION_INITIAL.id)) {
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type) && task.getTaskStatus().equals(TaskStsType.GENERATE_IN.id)) {
if (!locService.update(new LambdaUpdateWrapper<Loc>()
.eq(Loc::getCode, task.getOrgLoc())
.set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type))) {
@@ -1312,7 +1312,7 @@
task.setTaskCode(ruleCode)
.setTaskType(type)
.setBarcode(task.getBarcode())
- .setTaskStatus(TaskStsType.MISSION_INITIAL.id);
+ .setTaskStatus(TaskStsType.GENERATE_IN.id);
TaskInParam param = new TaskInParam();
param.setSourceStaNo(task.getTargSite())
@@ -1693,7 +1693,7 @@
if (Objects.isNull(ids) || ids.isEmpty()) {
return R.error("浠诲姟缂栫爜涓嶈兘涓虹┖锛侊紒");
}
- List<Integer> integers = Arrays.asList(TaskStsType.MISSION_INITIAL.id, TaskStsType.MISSION_INITIAL.id);
+ List<Integer> integers = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
.in(Task::getId, ids)
.in(Task::getTaskStatus, integers)
@@ -1739,7 +1739,7 @@
}
}
- /**鍒ゆ柇鏄惁鏅鸿兘绔欑偣锛岄潪鍏夊簵绔欑偣闇�绠℃帶绔欑偣鐘舵��*/
+ /**鍒ゆ柇鏄惁鍏夌數绔欑偣锛岄潪鍏夊簵绔欑偣闇�绠℃帶绔欑偣鐘舵��*/
if (!Objects.isNull(station) && station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
if (task.getTaskType() <= TaskType.TASK_TYPE_CHECK_IN.type && !task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
--
Gitblit v1.9.1