| | |
| | | |
| | | import com.mes.engineering.entity.Engineering; |
| | | import com.mes.engineering.service.EngineeringService; |
| | | import com.mes.glassinfo.entity.GlassInfo; |
| | | import com.mes.glassinfo.service.GlassInfoService; |
| | | import com.mes.pp.service.OptimizeProjectService; |
| | | import com.mes.uppattenusage.entity.UpPattenUsage; |
| | |
| | | private EngineeringService engineeringService; |
| | | @Autowired |
| | | private OptimizeProjectService optimizeProjectService; |
| | | |
| | | |
| | | @ApiOperation("显示选择的工程信息") |
| | | @GetMapping("/prioritylist") //查询现在上片机的玻璃信息 |
| | | @ResponseBody |
| | |
| | | List<UpPattenUsage> upPattenUsages = null; |
| | | UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId()); |
| | | if (upPattenUsage == null) { |
| | | // return Result.build(200, "失败无数据", null); |
| | | // upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId(), engineering.getFilmRemove(), engineering.getStationCell()); |
| | | upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId()); |
| | | } else { |
| | | upPattenUsages = upPattenUsageService.selectUpPattenUsage(upPattenUsage); |
| | |
| | | |
| | | } |
| | | |
| | | @ApiOperation("设置上片查询条件") |
| | | @PostMapping("/setUpPattenRequest") |
| | | public Result setRawGlassTaskRequest(@RequestBody Engineering request) { |
| | | log.info("查询上片信息:{}", request); |
| | | return Result.build(200, "查询成功", upPattenUsageService.setRawGlassTaskRequest(request)); |
| | | } |
| | | } |
| | | |