|
|
@ -271,15 +271,15 @@ public class TaskDispatchController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("/task-dispatch-detail/page")
|
|
|
|
@GetMapping("/task-dispatch-detail/page")
|
|
|
|
@Operation(summary = "获得派工明细分页")
|
|
|
|
@Operation(summary = "获得派工明细分页-app")
|
|
|
|
@PreAuthorize("@ss.hasPermission('biz:task-dispatch:query')")
|
|
|
|
@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);
|
|
|
|
return success(pageResult);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@PostMapping("/task-dispatch-detail/operate")
|
|
|
|
@PostMapping("/task-dispatch-detail/operate")
|
|
|
|
@Operation(summary = "操作派工任务")
|
|
|
|
@Operation(summary = "操作派工任务-app")
|
|
|
|
@PreAuthorize("@ss.hasPermission('biz:task-dispatch:update')")
|
|
|
|
@PreAuthorize("@ss.hasPermission('biz:task-dispatch:update')")
|
|
|
|
@OperateLog(enable = false)
|
|
|
|
@OperateLog(enable = false)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@ -289,21 +289,21 @@ public class TaskDispatchController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("/task-dispatch-detail/get")
|
|
|
|
@GetMapping("/task-dispatch-detail/get")
|
|
|
|
@Operation(summary = "获得派工单明细")
|
|
|
|
@Operation(summary = "获得派工单明细-app")
|
|
|
|
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
|
|
|
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
|
|
|
@PreAuthorize("@ss.hasPermission('biz:task-dispatch:query')")
|
|
|
|
@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());
|
|
|
|
SystemParametersDO systemParametersDO = systemParametersMapper.selectOne("code", SystemParmetersEnum.OVERTASK_CENTER_LIST.getDescription());
|
|
|
|
|
|
|
|
|
|
|
|
Integer overTask = 0;
|
|
|
|
Integer overTask = 0;
|
|
|
|
if(systemParametersDO != null){
|
|
|
|
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")
|
|
|
|
@GetMapping("/task-dispatch-procedure-detail/page")
|
|
|
|