From 8611b43a98ce6fd7a4aefa1696311241a0b5e3a5 Mon Sep 17 00:00:00 2001 From: LENOVO <1793460677@qq.com> Date: Mon, 8 Apr 2024 17:11:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BC=BA=E5=88=B6=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InstructionServiceImpl.java | 32 +++++++++++++++---- .../org/nl/acs/task/enums/TaskStatusEnum.java | 1 + .../org/nl/acs/task/rest/TaskController.java | 7 ++-- .../org/nl/acs/task/service/TaskService.java | 3 +- .../task/service/dto/TaskIdAndStatusDTO.java | 10 ++++++ .../task/service/impl/TaskServiceImpl.java | 11 +++---- .../nl/hand/service/impl/HandServiceImpl.java | 7 +++- acs2/nladmin-ui/src/api/acs/task/task.js | 6 ++-- acs2/nladmin-ui/src/i18n/langs/task/en.js | 1 + acs2/nladmin-ui/src/i18n/langs/task/in.js | 1 + acs2/nladmin-ui/src/i18n/langs/task/zh.js | 1 + acs2/nladmin-ui/src/views/acs/task/index.vue | 22 +++++++++++-- 12 files changed, 80 insertions(+), 22 deletions(-) create mode 100644 acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskIdAndStatusDTO.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 7f712bc79..65d5f5a41 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -51,11 +51,13 @@ import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.route.service.impl.RouteLineServiceImpl; import org.nl.acs.task.TaskInstructionLock; import org.nl.acs.task.domain.Task; +import org.nl.acs.task.enums.TaskStatusEnum; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; import org.nl.acs.common.base.PageInfo; import org.nl.acs.common.base.QueryHelpMybatisPlus; import org.nl.acs.common.base.impl.CommonServiceImpl; +import org.nl.acs.task.service.dto.TaskIdAndStatusDTO; import org.nl.acs.task.service.mapper.TaskMapper; import org.nl.common.exception.BadRequestException; import org.nl.acs.utils.ConvertUtil; @@ -880,7 +882,10 @@ public class InstructionServiceImpl extends CommonServiceImpl finish(@RequestBody String id) { - taskService.finish(id); + @PostMapping(value = "/finish") + public ResponseEntity finish(@RequestBody TaskIdAndStatusDTO taskIdAndStatus) { + taskService.finish(taskIdAndStatus); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java index 8860df2ef..cc47d947a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java @@ -6,6 +6,7 @@ import org.nl.acs.common.base.PageInfo; import org.nl.acs.common.base.CommonService; import org.nl.acs.task.domain.Task; import org.nl.acs.task.service.dto.TaskDto; +import org.nl.acs.task.service.dto.TaskIdAndStatusDTO; import org.nl.acs.task.service.dto.TaskQueryParam; import org.springframework.data.domain.Pageable; @@ -291,7 +292,7 @@ public interface TaskService extends CommonService { * * @param ids */ - void finish(String ids); + void finish(TaskIdAndStatusDTO ids); /** * 取消任务 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskIdAndStatusDTO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskIdAndStatusDTO.java new file mode 100644 index 000000000..6d1e4c76a --- /dev/null +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskIdAndStatusDTO.java @@ -0,0 +1,10 @@ +package org.nl.acs.task.service.dto; + +import lombok.Data; + +@Data +public class TaskIdAndStatusDTO { + private String task_id; + + private String task_status; +} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 9a60e55ce..a4e562884 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -2,7 +2,6 @@ package org.nl.acs.task.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; @@ -12,7 +11,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; @@ -48,6 +46,7 @@ import org.nl.acs.task.service.TaskFeedbackService; import org.nl.acs.common.base.PageInfo; import org.nl.acs.common.base.QueryHelpMybatisPlus; import org.nl.acs.common.base.impl.CommonServiceImpl; +import org.nl.acs.task.service.dto.TaskIdAndStatusDTO; import org.nl.common.exception.BadRequestException; import org.nl.acs.utils.ConvertUtil; import org.nl.common.utils.FileUtil; @@ -806,13 +805,13 @@ public class TaskServiceImpl extends CommonServiceImpl impleme @Override @Transactional(rollbackFor = Exception.class) - public void finish(String id) { - TaskDto entity = this.findById(id); + public void finish(TaskIdAndStatusDTO taskIdAndStatus) { + TaskDto entity = this.findById(taskIdAndStatus.getTask_id()); if (entity == null) { throw new BadRequestException(LangProcess.msg("error_sysAuth")); } - InstructionDto instdto = instructionService.findByTaskid(id, "instruction_status <2 "); + InstructionDto instdto = instructionService.findByTaskid(taskIdAndStatus.getTask_id(), "instruction_status <2 "); if (instdto != null) { throw new BadRequestException(LangProcess.msg("task_insHas")); } @@ -821,7 +820,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme String now = DateUtil.now(); entity.setUpdate_time(now); entity.setUpdate_by(currentUsername); - entity.setTask_status(TaskStatusEnum.FINISHED.getIndex()); + entity.setTask_status(taskIdAndStatus.getTask_status()); Task task = ConvertUtil.convert(entity, Task.class); taskMapper.updateById(task); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java index 48d022790..a10743649 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java @@ -25,8 +25,10 @@ import org.nl.acs.instruction.domain.InstructionMybatis; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.InstructionDto; import org.nl.acs.task.domain.Task; +import org.nl.acs.task.enums.TaskStatusEnum; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; +import org.nl.acs.task.service.dto.TaskIdAndStatusDTO; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; import org.nl.hand.dto.HeadDto; @@ -425,7 +427,10 @@ public class HandServiceImpl implements HandService { resultJson.put("data", data); return resultJson; } - taskserver.finish(task_uuid); + TaskIdAndStatusDTO taskIdAndStatusDTO = new TaskIdAndStatusDTO(); + taskIdAndStatusDTO.setTask_id(task_uuid); + taskIdAndStatusDTO.setTask_status(TaskStatusEnum.FINISHED.getIndex()); + taskserver.finish(taskIdAndStatusDTO); } resultJson.put("message", "操作成功"); resultJson.put("data", data); diff --git a/acs2/nladmin-ui/src/api/acs/task/task.js b/acs2/nladmin-ui/src/api/acs/task/task.js index 8c3e7e0b2..4238a9a4d 100644 --- a/acs2/nladmin-ui/src/api/acs/task/task.js +++ b/acs2/nladmin-ui/src/api/acs/task/task.js @@ -24,11 +24,11 @@ export function edit(data) { }) } -export function finish(task_id) { +export function finish(data) { return request({ - url: 'api/task/finish/' + task_id, + url: 'api/task/finish', method: 'post', - data: task_id + data: data }) } diff --git a/acs2/nladmin-ui/src/i18n/langs/task/en.js b/acs2/nladmin-ui/src/i18n/langs/task/en.js index 358c42903..5ff18b36a 100644 --- a/acs2/nladmin-ui/src/i18n/langs/task/en.js +++ b/acs2/nladmin-ui/src/i18n/langs/task/en.js @@ -35,6 +35,7 @@ export default { 'Ready': 'Ready', 'In_progress': 'In Progress', 'Completed': 'Completed', + 'Forced_Completed': 'Forced Completed', 'Pickup_point': 'Pickup Point', 'Delivery_point': 'Delivery Point', 'Remark': 'Remark', diff --git a/acs2/nladmin-ui/src/i18n/langs/task/in.js b/acs2/nladmin-ui/src/i18n/langs/task/in.js index bfee8b8de..e6b066706 100644 --- a/acs2/nladmin-ui/src/i18n/langs/task/in.js +++ b/acs2/nladmin-ui/src/i18n/langs/task/in.js @@ -35,6 +35,7 @@ export default { 'Ready': 'Siap', 'In_progress': 'Sedang Berlangsung', 'Completed': 'Selesai', + 'Forced_Completed': 'Penyelesaian wajib', 'Pickup_point': 'Titik Pengambilan', 'Delivery_point': 'Titik Pengiriman', 'Remark': 'Catatan', diff --git a/acs2/nladmin-ui/src/i18n/langs/task/zh.js b/acs2/nladmin-ui/src/i18n/langs/task/zh.js index 339bae542..243ed7fdb 100644 --- a/acs2/nladmin-ui/src/i18n/langs/task/zh.js +++ b/acs2/nladmin-ui/src/i18n/langs/task/zh.js @@ -35,6 +35,7 @@ export default { 'Ready': '就绪', 'In_progress': '执行中', 'Completed': '完成', + 'Forced_Completed': '强制完成', 'Pickup_point': '取货点', 'Delivery_point': '放货点', 'Remark': '备注', diff --git a/acs2/nladmin-ui/src/views/acs/task/index.vue b/acs2/nladmin-ui/src/views/acs/task/index.vue index d7dc2722f..3ddfcdd64 100644 --- a/acs2/nladmin-ui/src/views/acs/task/index.vue +++ b/acs2/nladmin-ui/src/views/acs/task/index.vue @@ -559,6 +559,15 @@ {{ $t('task.select.Create_command') }} + + + {{ $t('task.select.Forced_Completed') }} + + @@ -695,6 +704,10 @@ export default { agv_system_type: '', interactionJson: null }, + taskStatus: { + task_status: '', + task_id: null + }, extension: [{ name: '', value: '' @@ -790,7 +803,9 @@ export default { return true }, finish(index, row) { - crudTask.finish(row.task_id).then(res => { + this.taskStatus.task_id = row.task_id + this.taskStatus.task_status = index + crudTask.finish(this.taskStatus).then(res => { this.crud.toQuery() this.crud.notify('完成成功', CRUD.NOTIFICATION_TYPE.SUCCESS) }).catch(err => { @@ -831,7 +846,7 @@ export default { handleCommand(index, row, command) { switch (command) { case 'a':// 完成 - this.finish(index, row) + this.finish('3', row) break case 'b':// 取消 this.cancel(index, row) @@ -839,6 +854,9 @@ export default { case 'c':// 创建指令 this.createInst(index, row) break + case 'd':// 完成 + this.finish('4', row) + break } }, showStartStorage(val) {