From 3217b507c63ee915ef826235270df3802f17600a Mon Sep 17 00:00:00 2001 From: siontion Date: Wed, 3 Jul 2024 16:03:39 +0800 Subject: [PATCH] =?UTF-8?q?APP=E6=8A=A5=E5=B7=A5=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taskdispatch/TaskDispatchController.java | 20 +++++++++---------- .../TaskDispatchDetailMapper.java | 2 +- .../taskdispatch/TaskDispatchService.java | 4 ++-- .../taskdispatch/TaskDispatchServiceImpl.java | 16 +++++++-------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/TaskDispatchController.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/TaskDispatchController.java index 0ca0194e..ca2a1d14 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/TaskDispatchController.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/TaskDispatchController.java @@ -271,15 +271,15 @@ public class TaskDispatchController { } @GetMapping("/task-dispatch-detail/page") - @Operation(summary = "获得派工明细分页") + @Operation(summary = "获得派工明细分页-app") @PreAuthorize("@ss.hasPermission('biz:task-dispatch:query')") - public CommonResult> getTaskDispatchPageDetail(@Valid TaskDispatchDetailPageReqVO pageReqVO) { - PageResult pageResult = taskDispatchService.getTaskDispatchDetailPage(pageReqVO); + public CommonResult> getTaskDispatchPageDetail(@Valid TaskDispatchDetailPageReqVO pageReqVO) { + PageResult pageResult = taskDispatchService.getTaskDispatchDetailPage(pageReqVO); return success(pageResult); } @PostMapping("/task-dispatch-detail/operate") - @Operation(summary = "操作派工任务") + @Operation(summary = "操作派工任务-app") @PreAuthorize("@ss.hasPermission('biz:task-dispatch:update')") @OperateLog(enable = false) @Transactional(rollbackFor = Exception.class) @@ -289,21 +289,21 @@ public class TaskDispatchController { } @GetMapping("/task-dispatch-detail/get") - @Operation(summary = "获得派工单明细") + @Operation(summary = "获得派工单明细-app") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('biz:task-dispatch:query')") - public CommonResult getTaskDispatchDetail(@RequestParam("id") Long id) { - TaskDispatchDetailOwnerDO taskDispatchDetailOwnerDO = taskDispatchService.getTaskDispatchDetail(id); + public CommonResult getTaskDispatchDetail(@RequestParam("id") Long id) { + TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchService.getTaskDispatchDetail(id); SystemParametersDO systemParametersDO = systemParametersMapper.selectOne("code", SystemParmetersEnum.OVERTASK_CENTER_LIST.getDescription()); Integer overTask = 0; if(systemParametersDO != null){ - overTask = Arrays.stream(systemParametersDO.getCurrentValue().split(",")).filter(o->o.equals(taskDispatchDetailOwnerDO.getWorkshopCode())).count()>0?1:0; + overTask = Arrays.stream(systemParametersDO.getCurrentValue().split(",")).filter(o->o.equals(taskDispatchDetailDO.getWorkshopCode())).count()>0?1:0; } - taskDispatchDetailOwnerDO.setOverTask(overTask); + taskDispatchDetailDO.setOverTask(overTask); - return success(taskDispatchDetailOwnerDO); + return success(taskDispatchDetailDO); } @GetMapping("/task-dispatch-procedure-detail/page") diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java index e7a9491c..8f4e8e5e 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java @@ -59,7 +59,7 @@ public interface TaskDispatchDetailMapper extends BaseMapperX0)",reqVO.getOwner()) + .eq(reqVO.getOwner() != null,TaskDispatchDetailDO::getOwner,reqVO.getOwner()) ; return selectPage(reqVO, query); diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchService.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchService.java index ac415d50..38a11bc1 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchService.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchService.java @@ -70,13 +70,13 @@ public interface TaskDispatchService { void deleteTaskDispatchDetail(Long id); - PageResult getTaskDispatchDetailPage(TaskDispatchDetailPageReqVO pageReqVO); + PageResult getTaskDispatchDetailPage(TaskDispatchDetailPageReqVO pageReqVO); PageResult getTaskDispatchProcedureDetailPage(TaskDispatchDetailPageReqVO pageReqVO); void operateDetail(TaskDispatchDetailVO operateReqVO); - TaskDispatchDetailOwnerDO getTaskDispatchDetail(Long id); + TaskDispatchDetailDO getTaskDispatchDetail(Long id); void convertAssembleProcedure(TaskDispatchDO taskDispatchDO); diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java index 3a00e208..95767d24 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java @@ -288,7 +288,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { } @Override - public PageResult getTaskDispatchDetailPage(TaskDispatchDetailPageReqVO pageReqVO) { + public PageResult getTaskDispatchDetailPage(TaskDispatchDetailPageReqVO pageReqVO) { // SystemParametersDO systemParametersDO = systemParametersMapper.selectOne("code", SystemParmetersEnum.OVERTASK_CENTER_LIST.getDescription()); // @@ -307,7 +307,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { // } // } - return taskDispatchDetailOwnerMapper.selectPage(pageReqVO); + return taskDispatchDetailMapper.selectPage(pageReqVO); } @Override public PageResult getTaskDispatchProcedureDetailPage(TaskDispatchDetailPageReqVO pageReqVO) { @@ -327,9 +327,9 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { } } - TaskDispatchDetailOwnerDO taskDispatchDetailDO = taskDispatchDetailOwnerMapper.selectOne(new LambdaQueryWrapperX(){{ - eq(TaskDispatchDetailOwnerDO::getId, operateReqVO.getId()) - .ne(TaskDispatchDetailOwnerDO::getProcedureStatus, TaskDispatchProcedureStatusEnum.COMPLETED.getCode()) + TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectOne(new LambdaQueryWrapperX(){{ + eq(TaskDispatchDetailDO::getId, operateReqVO.getId()) + .ne(TaskDispatchDetailDO::getProcedureStatus, TaskDispatchProcedureStatusEnum.COMPLETED.getCode()) .last("LIMIT 1 FOR UPDATE"); }}); TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectById(taskDispatchDetailDO.getDispatchId()); @@ -416,14 +416,14 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { break; case FINISH: taskDispatchDetailDO.setProcedureStatus(TaskDispatchProcedureStatusEnum.COMPLETED.getCode()); - taskDispatchDetailOwnerMapper.updateById(taskDispatchDetailDO); + taskDispatchDetailMapper.updateById(taskDispatchDetailDO); break; } } @Override - public TaskDispatchDetailOwnerDO getTaskDispatchDetail(Long id) { - return taskDispatchDetailOwnerMapper.getTaskDispatchDetail(id); + public TaskDispatchDetailDO getTaskDispatchDetail(Long id) { + return taskDispatchDetailMapper.getTaskDispatchDetail(id); } @Override public void saveTaskDispatchDetailList(Long dispatchId, List list){