YiWuProject.git

			@@ -6,20 +6,19 @@
			import com.mes.bigstorage.entity.BigStorageCageDetails;
			import com.mes.bigstorage.entity.dto.GlassInfoLackDTO;
			import com.mes.bigstorage.entity.dto.TemperingGlassCountDTO;
			import com.mes.bigstorage.entity.request.BigCageDetailsRequest;
			import com.mes.bigstorage.entity.vo.BigStorageQueryVO;
			import com.mes.bigstorage.entity.vo.BigCageDetailsVO;
			import com.mes.bigstorage.service.BigStorageCageDetailsService;
			import com.mes.bigstorage.service.BigStorageCageService;
			import com.mes.common.config.Const;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.pp.entity.OptimizeProject;
			import com.mes.utils.RedisUtil;
			import com.mes.utils.Result;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.web.bind.annotation.PostMapping;
			import org.springframework.web.bind.annotation.RequestBody;
			import org.springframework.web.bind.annotation.RequestMapping;
			import org.springframework.web.bind.annotation.RestController;
			import org.springframework.web.bind.annotation.*;

			import javax.annotation.Resource;
			import java.util.List;
			@@ -106,12 +105,23 @@

			@ApiOperation("指定钢化工程")
			@PostMapping("/appointTemperingEngineerId")
			public Result appointTemperingEngineerId(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
			boolean result = bigStorageCageDetailsService.appointTemperingEngineerId(bigStorageCageDetails.getEngineerId());
			public Result appointTemperingEngineerId(String engineerId) {
			boolean result = bigStorageCageDetailsService.appointTemperingEngineerId(engineerId);
			if (result == true) {
			return Result.build(200, "指定钢化成功", 1);
			} else {
			return Result.build(200, "已存在钢化任务，请等待钢化完成再指定钢化", 1);
			}
			}

			@ApiOperation("取消当前钢化")
			@PostMapping("/cancelTemperingTask")
			public Result<Boolean> cancelTemperingTask() {
			boolean result = bigStorageCageDetailsService.cancelTemperingTask();
			if (result == true) {
			return Result.build(200, "取消当前钢化成功", result);
			} else {
			return Result.build(200, "取消当前钢化失败", result);
			}
			}

			@@ -126,6 +136,7 @@
			public Result<List<BigStorageCageDetails>> queryRealGlassInfo(@RequestBody BigStorageQueryVO bigStorageQueryVO) {
			return Result.build(200, "查询成功", bigStorageCageDetailsService.queryRealGlassInfo(bigStorageQueryVO));
			}

			@ApiOperation("缺片数量查询")
			@PostMapping("/queryLackGlassInfo")
			public Result<List<GlassInfoLackDTO>> queryLackGlassInfo(@RequestBody BigStorageQueryVO bigStorageQueryVO) {
			@@ -179,11 +190,34 @@
			return Result.build(200, "指定流程卡成功", 1);
			}
			}

			@ApiOperation("大理片笼报破损")
			@PostMapping("/bigStorageGlassDamageByGlassId")
			public Result<String> bigStorageGlassDamageByGlassId(@RequestBody Map<String, String> map) {
			String glassId=map.get("glassId");
			String glassId = map.get("glassId");
			return Result.build(200, "报破损成功", bigStorageCageDetailsService.bigStorageGlassDamageByGlassId(glassId));
			}

			@ApiOperation("查询工程待排产信息")
			@PostMapping("/queryEngineer") //显示工程排产信息
			@ResponseBody
			public Result<List<BigStorageCageDetails>> queryEngineer() {
			List<BigStorageCageDetails> result = bigStorageCageDetailsService.queryEngineer();
			return Result.build(200, "", result);
			}
			@ApiOperation("查询钢化排产顺序")
			@PostMapping("/queryTemperingOrder") //显示工程排产信息
			@ResponseBody
			public Result<List<OptimizeProject>> queryTemperingOrder() {
			List<OptimizeProject> result = bigStorageCageDetailsService.queryTemperingOrder();
			return Result.build(200, "", result);
			}

			@ApiOperation("（列表）按列表照查询条件（设备id、流程卡、膜系）获取设备对应的笼子玻璃信息")
			@PostMapping("/queryVerticalSheetCageDetailsList")
			public Result<List<BigCageDetailsVO>> queryVerticalSheetCageDetailsList(@RequestBody BigCageDetailsRequest request) {
			return Result.build(200, "查询成功", bigStorageCageDetailsService.queryVerticalSheetCageDetailsList(request));
			}

			}