HangZhouMes.git

			@@ -35,6 +35,8 @@
			private EngineeringService engineeringService;
			@Autowired
			private OptimizeProjectService optimizeProjectService;


			@ApiOperation("显示选择的工程信息")
			@GetMapping("/prioritylist") //查询现在上片机的玻璃信息
			@ResponseBody
			@@ -51,6 +53,8 @@
			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);
			@@ -77,5 +81,11 @@

			}

			@ApiOperation("设置上片查询条件")
			@PostMapping("/setUpPattenRequest")
			public Result setRawGlassTaskRequest(@RequestBody Engineering request) {
			log.info("查询上片信息:{}", request);
			return Result.build(200, "查询成功", upPattenUsageService.setRawGlassTaskRequest(request));
			}
			}