| | |
|---|
| | | private GlassInfoService glassInfoService; |
|---|
| | | @Autowired |
|---|
| | | private OptimizeProjectService optimizeProjectService; |
|---|
| | | |
|---|
| | | @ApiOperation("开始/暂停任务/传递工程号和状态,开始是1 暂停是0") |
|---|
| | | @PostMapping("/pauseTask") //暂停上片任务 |
|---|
| | | @ResponseBody |
|---|
| | |
|---|
| | | @ResponseBody |
|---|
| | | public Result <Boolean> changeTask(@RequestBody Engineering engineering) { |
|---|
| | | log.info("engineeringId:{}", engineering); |
|---|
| | | UpPattenUsage upPattenUsage = upPattenUsageService.selectedTaskEngineering(engineering.getEngineerId()); |
|---|
| | | UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId()); |
|---|
| | | if (upPattenUsage != null) { |
|---|
| | | boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState()); |
|---|
| | | List<UpPattenUsage> glass = upPattenUsageService.prioritylist(); |
|---|
| | |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("删除工程上片") |
|---|
| | | @PostMapping("/deleteTask") //调用上片任务 |
|---|
| | | @ResponseBody |
|---|
| | | public Result <List<GlassInfo>> deleteTask(@RequestBody Engineering engineering) { |
|---|
| | | //删除工程表、小片表、上片表，更改优化表状态 |
|---|
| | | // boolean work=engineeringService.deleteTask(engineering.getEngineerId()); |
|---|
| | | // glassInfoService.deleteTask(engineering.getEngineerId()); |
|---|
| | | // upPattenUsageService.deleteTask(engineering.getEngineerId()); |
|---|
| | | // optimizeProjectService.changeTask(engineering.getEngineerId(), 100); |
|---|
| | | //查询未上片的小片信息 |
|---|
| | | List<GlassInfo>glasslist=glassInfoService.selectEdgGlassInfo(engineering.getEngineerId()); |
|---|
| | | return Result.build(200, "删除成功"+engineering, glasslist); |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("查询可以上片的工程号") |
|---|
| | | @GetMapping("/selectTask") //调用上片任务 |
|---|
| | | @ResponseBody |
|---|
