|
|
|
|
@ -26,8 +26,10 @@ import org.springblade.core.tool.utils.Func; |
|
|
|
|
import org.springblade.desk.quality.constant.QAModuleConst; |
|
|
|
|
import org.springblade.desk.quality.excel.InspectionTaskExcel; |
|
|
|
|
import org.springblade.desk.quality.pojo.entity.InspectionTask; |
|
|
|
|
import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; |
|
|
|
|
import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; |
|
|
|
|
import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; |
|
|
|
|
import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; |
|
|
|
|
import org.springblade.desk.quality.service.IInspectionTaskService; |
|
|
|
|
import org.springblade.desk.quality.service.InspectionTaskService2; |
|
|
|
|
import org.springblade.desk.quality.wrapper.InspectionTaskWrapper; |
|
|
|
|
@ -38,6 +40,7 @@ import java.util.Map; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [检验任务] 控制器 |
|
|
|
|
* 工序级的检验任务 |
|
|
|
|
* mes v1: rb_pr_work_check |
|
|
|
|
* |
|
|
|
|
* @author Tom Shuo |
|
|
|
|
@ -51,9 +54,9 @@ import java.util.Map; |
|
|
|
|
public class InspectionTaskController extends BladeController { |
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
private IInspectionTaskService inspectionTaskGenService; |
|
|
|
|
private IInspectionTaskService service; |
|
|
|
|
@Resource |
|
|
|
|
private InspectionTaskService2 service; |
|
|
|
|
private InspectionTaskService2 service2; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [检验任务] 详情 |
|
|
|
|
@ -62,22 +65,22 @@ public class InspectionTaskController extends BladeController { |
|
|
|
|
@ApiOperationSupport(order = 1) |
|
|
|
|
@Operation(summary = "详情", description = "传入inspectionTask") |
|
|
|
|
public R<InspectionTaskDetailVO> detail(InspectionTask inspectionTask) { |
|
|
|
|
InspectionTask detail = inspectionTaskGenService.getOne(Condition.getQueryWrapper(inspectionTask)); |
|
|
|
|
InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask)); |
|
|
|
|
return R.data(InspectionTaskWrapper.build().entityVO(detail)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [检验任务] 分页 |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/list") |
|
|
|
|
@PostMapping("/listSearch") |
|
|
|
|
@ApiOperationSupport(order = 2) |
|
|
|
|
@Operation(summary = "分页", description = "传入inspectionTask") |
|
|
|
|
public R<IPage<InspectionTaskDetailVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> inspectionTask, Query query) { |
|
|
|
|
IPage<InspectionTask> pages = inspectionTaskGenService.page(Condition.getPage(query), Condition.getQueryWrapper(inspectionTask, InspectionTask.class)); |
|
|
|
|
return R.data(InspectionTaskWrapper.build().pageVO(pages)); |
|
|
|
|
public R<IPage<InspectionTaskListVO>> listSearch( |
|
|
|
|
@Parameter(hidden = true) @RequestParam(required = false) InspectionTaskSearch search, Query query) { |
|
|
|
|
IPage<InspectionTaskListVO> pagesVO = service.listSearch(Condition.getPage(query), search); |
|
|
|
|
return R.data(pagesVO); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [检验任务] 自定义分页 |
|
|
|
|
*/ |
|
|
|
|
@ -85,7 +88,7 @@ public class InspectionTaskController extends BladeController { |
|
|
|
|
@ApiOperationSupport(order = 3) |
|
|
|
|
@Operation(summary = "分页", description = "传入inspectionTask") |
|
|
|
|
public R<IPage<InspectionTaskDetailVO>> page(InspectionTaskDetailVO inspectionTask, Query query) { |
|
|
|
|
IPage<InspectionTaskDetailVO> pages = inspectionTaskGenService.selectInspectionTaskPage(Condition.getPage(query), inspectionTask); |
|
|
|
|
IPage<InspectionTaskDetailVO> pages = service.selectInspectionTaskPage(Condition.getPage(query), inspectionTask); |
|
|
|
|
return R.data(pages); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -96,7 +99,7 @@ public class InspectionTaskController extends BladeController { |
|
|
|
|
@ApiOperationSupport(order = 4) |
|
|
|
|
@Operation(summary = "新增", description = "传入inspectionTask") |
|
|
|
|
public R save(@Valid @RequestBody InspectionTask inspectionTask) { |
|
|
|
|
return R.status(inspectionTaskGenService.save(inspectionTask)); |
|
|
|
|
return R.status(service.save(inspectionTask)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
@ -106,7 +109,7 @@ public class InspectionTaskController extends BladeController { |
|
|
|
|
@ApiOperationSupport(order = 5) |
|
|
|
|
@Operation(summary = "修改", description = "传入inspectionTask") |
|
|
|
|
public R update(@Valid @RequestBody InspectionTask inspectionTask) { |
|
|
|
|
return R.status(inspectionTaskGenService.updateById(inspectionTask)); |
|
|
|
|
return R.status(service.updateById(inspectionTask)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
@ -116,7 +119,7 @@ public class InspectionTaskController extends BladeController { |
|
|
|
|
@ApiOperationSupport(order = 6) |
|
|
|
|
@Operation(summary = "新增或修改", description = "传入inspectionTask") |
|
|
|
|
public R submit(@Valid @RequestBody InspectionTask inspectionTask) { |
|
|
|
|
return R.status(inspectionTaskGenService.saveOrUpdate(inspectionTask)); |
|
|
|
|
return R.status(service.saveOrUpdate(inspectionTask)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
@ -126,13 +129,12 @@ public class InspectionTaskController extends BladeController { |
|
|
|
|
@ApiOperationSupport(order = 7) |
|
|
|
|
@Operation(summary = "逻辑删除", description = "传入ids") |
|
|
|
|
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { |
|
|
|
|
return R.status(inspectionTaskGenService.deleteLogic(Func.toLongList(ids))); |
|
|
|
|
return R.status(service.deleteLogic(Func.toLongList(ids))); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 导出数据 |
|
|
|
|
*/ |
|
|
|
|
@IsAdmin |
|
|
|
|
@GetMapping("/export-inspectionTask") |
|
|
|
|
@ApiOperationSupport(order = 8) |
|
|
|
|
@Operation(summary = "导出数据", description = "传入inspectionTask") |
|
|
|
|
@ -142,7 +144,7 @@ public class InspectionTaskController extends BladeController { |
|
|
|
|
// queryWrapper.lambda().eq(InspectionTask::getTenantId, bladeUser.getTenantId());
|
|
|
|
|
//}
|
|
|
|
|
//queryWrapper.lambda().eq(InspectionTaskEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
|
|
|
|
|
List<InspectionTaskExcel> list = inspectionTaskGenService.exportInspectionTask(queryWrapper); |
|
|
|
|
List<InspectionTaskExcel> list = service.exportInspectionTask(queryWrapper); |
|
|
|
|
ExcelUtil.export(response, "[检验任务]数据" + DateUtil.time(), |
|
|
|
|
"[检验任务]数据表", list, InspectionTaskExcel.class); |
|
|
|
|
} |
|
|
|
|
@ -155,6 +157,26 @@ public class InspectionTaskController extends BladeController { |
|
|
|
|
@ApiOperationSupport(order = 9) |
|
|
|
|
@Operation(summary = "", description = "传入inspectionTask") |
|
|
|
|
public R save(@Valid @RequestBody InspectionTaskStartNew start) { |
|
|
|
|
return service.startNew(start); |
|
|
|
|
return service2.startNew(start); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [检验任务] 同槽 检验结果应用 |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/sameTankResultCopy") |
|
|
|
|
@ApiOperationSupport(order = 101) |
|
|
|
|
@Operation(summary = "同槽结果应用", description = "传入inspectionTask id") |
|
|
|
|
public R sameTankResultCopy(@Parameter(hidden = true) @RequestParam Long id) { |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [检验任务] 同炉 检验结果应用 |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/sameFurnaceResultCopy") |
|
|
|
|
@ApiOperationSupport(order = 102) |
|
|
|
|
@Operation(summary = "同槽结果应用", description = "传入inspectionTask id") |
|
|
|
|
public R sameFurnaceResultCopy(@Parameter(hidden = true) @RequestParam Long id) { |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
Tom Li
3 months ago