~zhoushihao/YiWuProject.git

			@@ -1,8 +1,9 @@
			package com.mes.temperingglass.controller;

			import com.mes.damage.entity.Damage;
			import com.mes.damage.service.DamageService;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.entity.LoadGlassInfo;
			import com.mes.temperingglass.eneity.request.DamageRequest;
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.temperingglass.service.TemperingGlassInfoService;
			import com.mes.utils.Result;
			@@ -49,14 +50,14 @@

			@ApiOperation("//钢化破损拿走放回")
			@PostMapping("/updateTemperingState") //钢化后显示出炉的版图信息
			public Result <Integer> updateTemperingState(@RequestBody Damage damage) {
			public Result <Integer> updateTemperingState(@RequestBody DamageRequest damage) {
			TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo();
			temperingGlassInfo.setState(damage.getStatus());
			temperingGlassInfo.setState(damage.getState());
			temperingGlassInfo.setGlassId(damage.getGlassId());
			int result=temperingGlassInfoService.updateTemperingState(temperingGlassInfo);
			if (damage.getStatus() > 5) {
			if (damage.getState() > 5) {
			damageService.autoSubmitReport(damage.getGlassId(), damage.getLine()
			, damage.getWorkingProcedure(), "钢化炉", damage.getStatus());
			, damage.getWorkingProcedure(), "钢化炉", damage.getState());
			}
			return Result.build(200, "破损成功", result);
			}
			@@ -70,8 +71,8 @@

			@ApiOperation("//查询当前工程号的钢化版图")
			@PostMapping("/selectTemperingGlass") //查询当前工程号所有的炉号
			public Result<List<GlassInfo>> selectTemperingGlass(@RequestBody GlassInfo glassInfo) {
			List<GlassInfo> glass = temperingGlassInfoService.selectTemperingGlass(glassInfo);
			public Result<List<LoadGlassInfo>> selectTemperingGlass(@RequestBody GlassInfo glassInfo) {
			List<LoadGlassInfo> glass = temperingGlassInfoService.selectTemperingGlass(glassInfo);
			return Result.build(200, "查询成功", glass);
			}