| | |
| | | @ResponseBody |
| | | public Result <List<UpPattenUsage>> pause(@RequestBody Engineering engineering) { |
| | | boolean work=engineeringService.pauseTask(engineering.getEngineerId(),engineering.getState()); |
| | | // List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message; |
| | | List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message; |
| | | if(work){ |
| | | return Result.build(200, "成功", null); |
| | | return Result.build(200,"成功",glass); |
| | | }else { |
| | | return Result.build(100, "成功", null); |
| | | return Result.build(100,"成功",glass); |
| | | } |
| | | } |
| | | |
| | |
| | | log.info("engineeringId:{}", engineering); |
| | | UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId()); |
| | | if (upPattenUsage != null) { |
| | | boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState()); |
| | | boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState()); |
| | | List<UpPattenUsage> glass = upPattenUsageService.prioritylist(); |
| | | optimizeProjectService.changeTask(engineering.getEngineerId(), 200); |
| | | return Result.build(200, "已保存过", work); |
| | |
| | | engineeringService.saveEngineering(listEngineering); |
| | | log.info("更改pp表状态为已领取"); |
| | | //将engineering表状态为正在上片 |
| | | boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState()); |
| | | boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState()); |
| | | List<UpPattenUsage> glass = upPattenUsageService.prioritylist(); |
| | | optimizeProjectService.changeTask(engineering.getEngineerId(), 200); |
| | | if (work) { |
| | | return Result.build(200, "保存成功"+engineering.getEngineerId(), true); |
| | | }else { |
| | | return Result.build(200, "保存失败"+engineering.getEngineerId(), false); |
| | | return Result.build(200, "保存成功"+engineering.getEngineerId(), false); |
| | | } |
| | | } |
| | | |
| | | } |
| | | |
| | | @ApiOperation("删除工程上片") |
| | | @PostMapping("/deleteTask") //调用上片任务 |
| | | @ResponseBody |
| | | public Result <Boolean> deleteTask(@RequestBody Engineering engineering) { |
| | | //删除工程表、小片表、上片表,更改优化表状态 |
| | | boolean work=engineeringService.deleteTask(engineering.getEngineerId()); |
| | | glassInfoService.deleteTask(engineering.getEngineerId()); |
| | | upPattenUsageService.deleteTask(engineering.getEngineerId()); |
| | | optimizeProjectService.changeTask(engineering.getEngineerId(), 100); |
| | | if (work) { |
| | | return Result.build(200, "删除成功"+engineering.getEngineerId(), true); |
| | | }else { |
| | | return Result.build(200, "删除失败"+engineering.getEngineerId(), false); |
| | | } |
| | | |
| | | } |
| | | |
| | | @ApiOperation("查询可以上片的工程号") |
| | | @GetMapping("/selectTask") //调用上片任务 |
| | | @ResponseBody |