APP报工接口调整

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<PageResult<TaskDispatchDetailOwnerDO>> getTaskDispatchPageDetail(@Valid TaskDispatchDetailPageReqVO pageReqVO) {
+    public CommonResult<PageResult<TaskDispatchDetailDO>> getTaskDispatchPageDetail(@Valid TaskDispatchDetailPageReqVO pageReqVO) {
-        PageResult<TaskDispatchDetailOwnerDO> pageResult = taskDispatchService.getTaskDispatchDetailPage(pageReqVO);
+        PageResult<TaskDispatchDetailDO> 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<TaskDispatchDetailOwnerDO> getTaskDispatchDetail(@RequestParam("id") Long id) {
+    public CommonResult<TaskDispatchDetailDO> getTaskDispatchDetail(@RequestParam("id") Long id) {
-        TaskDispatchDetailOwnerDO taskDispatchDetailOwnerDO = taskDispatchService.getTaskDispatchDetail(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")

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 BaseMapperX<TaskDispatchDetail
                 .eq(reqVO.getTaskId() != null, TaskDispatchDO::getTaskId, reqVO.getTaskId())
                 .eq(reqVO.getBomDetailId() != null, TaskDispatchDO::getBomDetailId, reqVO.getBomDetailId())
                 .eq(reqVO.getDispatchStatus() != null, TaskDispatchDO::getDispatchStatus, reqVO.getDispatchStatus())
-                .apply(reqVO.getOwner() != null,"(t.owner={0} or INSTR(t.owner_ids,{0})>0)",reqVO.getOwner())
+                .eq(reqVO.getOwner() != null,TaskDispatchDetailDO::getOwner,reqVO.getOwner())
         ;
 
         return selectPage(reqVO, query);

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<TaskDispatchDetailOwnerDO> getTaskDispatchDetailPage(TaskDispatchDetailPageReqVO pageReqVO);
+    PageResult<TaskDispatchDetailDO> getTaskDispatchDetailPage(TaskDispatchDetailPageReqVO pageReqVO);
 
     PageResult<TaskDispatchDetailDO> getTaskDispatchProcedureDetailPage(TaskDispatchDetailPageReqVO pageReqVO);
 
     void operateDetail(TaskDispatchDetailVO operateReqVO);
 
-    TaskDispatchDetailOwnerDO getTaskDispatchDetail(Long id);
+    TaskDispatchDetailDO getTaskDispatchDetail(Long id);
 
     void convertAssembleProcedure(TaskDispatchDO taskDispatchDO);
 

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<TaskDispatchDetailOwnerDO> getTaskDispatchDetailPage(TaskDispatchDetailPageReqVO pageReqVO) {
+    public PageResult<TaskDispatchDetailDO> 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<TaskDispatchDetailDO> getTaskDispatchProcedureDetailPage(TaskDispatchDetailPageReqVO pageReqVO) {
@@ -327,9 +327,9 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
             }
         }
 
-        TaskDispatchDetailOwnerDO taskDispatchDetailDO = taskDispatchDetailOwnerMapper.selectOne(new LambdaQueryWrapperX<TaskDispatchDetailOwnerDO>(){{
+        TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectOne(new LambdaQueryWrapperX<TaskDispatchDetailDO>(){{
-            eq(TaskDispatchDetailOwnerDO::getId, operateReqVO.getId())
+            eq(TaskDispatchDetailDO::getId, operateReqVO.getId())
-                    .ne(TaskDispatchDetailOwnerDO::getProcedureStatus, TaskDispatchProcedureStatusEnum.COMPLETED.getCode())
+                    .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) {
+    public TaskDispatchDetailDO getTaskDispatchDetail(Long id) {
-        return taskDispatchDetailOwnerMapper.getTaskDispatchDetail(id);
+        return taskDispatchDetailMapper.getTaskDispatchDetail(id);
     }
     @Override
     public void saveTaskDispatchDetailList(Long dispatchId, List<TaskDispatchDetailOwnerDO> list){