~admin/HangZhouMes.git

			@@ -2,7 +2,6 @@

			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;
			@@ -36,7 +35,9 @@
			private EngineeringService engineeringService;
			@Autowired
			private OptimizeProjectService optimizeProjectService;
			@ApiOperation("显示正在出片的工程信息")


			@ApiOperation("显示选择的工程信息")
			@GetMapping("/prioritylist") //查询现在上片机的玻璃信息
			@ResponseBody
			public Result<List<UpPattenUsage>> prioritylist() {
			@@ -49,10 +50,40 @@
			@PostMapping("/selectUpPattenUsage") //查询现在上片机的玻璃信息
			@ResponseBody
			public Result<List<UpPattenUsage>> selectUpPattenUsage(@RequestBody Engineering engineering) {
			List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
			return Result.build(200, "", upPattenUsages);
			List<UpPattenUsage> upPattenUsages=null;
			UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
			if(upPattenUsage == null){
			upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
			}else {
			upPattenUsages= upPattenUsageService.selectUpPattenUsage(upPattenUsage);
			}

			if (!upPattenUsages.isEmpty()) {
			return Result.build(200, "成功", upPattenUsages);
			}else {
			return Result.build(100, "失败", upPattenUsages);
			}

			}

			@ApiOperation("切换原片上片状态")
			@PostMapping("/updateGlassState") //查询现在上片机的玻璃信息
			@ResponseBody
			public Result<Boolean> updateGlassState(@RequestBody UpPattenUsage upPattenUsage) {
			Boolean whether = upPattenUsageService.updateGlassState(upPattenUsage);
			if (whether) {
			return Result.build(200, "成功", whether);
			} else {
			return Result.build(100, "失败", whether);
			}

			}

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