From 597694f4d57a16aeb1bdccdebfcb5375abc1fce9 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期四, 27 二月 2025 09:22:38 +0800 Subject: [PATCH] 修正破损接口,指定版图查询更新 --- hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java index f8fa7c1..1e97e4c 100644 --- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java +++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java @@ -1,9 +1,12 @@ package com.mes.temperingglass.controller; + import com.mes.damage.entity.Damage; import com.mes.damage.service.DamageService; -import com.mes.temperingglass.service.TemperingGlassInfoService; +import com.mes.glassinfo.entity.GlassInfo; import com.mes.temperingglass.entity.TemperingGlassInfo; +import com.mes.temperingglass.service.TemperingGlassInfoService; import com.mes.utils.Result; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -15,6 +18,7 @@ /** * @author SNG-010 */ +@Api(tags = "閽㈠寲鏄剧ず") @RestController @RequestMapping("/temperingGlassInfo") @Slf4j @@ -50,13 +54,26 @@ temperingGlassInfo.setState(damage.getStatus()); temperingGlassInfo.setGlassId(damage.getGlassId()); int result=temperingGlassInfoService.updateTemperingState(temperingGlassInfo); -// if(damage.getStatus()>5) { -// damage.setType(damage.getStatus()); -// damage.setStatus(1); -// damageService.insertDamage(damage); -// } + if (damage.getStatus() > 5) { + damageService.autoSubmitReport(damage.getGlassId(), damage.getLine() + , damage.getWorkingProcedure(), "閽㈠寲鐐�", damage.getStatus()); + } return Result.build(200, "鐮存崯鎴愬姛", result); } + @ApiOperation("//鏌ヨ褰撳墠宸ョ▼鍙锋墍鏈夌殑鐐夊彿") + @PostMapping("/selectTempering") //鏌ヨ褰撳墠宸ョ▼鍙锋墍鏈夌殑鐐夊彿 + public Result<GlassInfo> selectTempering(@RequestBody GlassInfo glassInfo) { + GlassInfo glass = temperingGlassInfoService.selectTempering(glassInfo); + return Result.build(200, "鏌ヨ鎴愬姛", glass); + } + + @ApiOperation("//鏌ヨ褰撳墠宸ョ▼鍙风殑閽㈠寲鐗堝浘") + @PostMapping("/selectTemperingGlass") //鏌ヨ褰撳墠宸ョ▼鍙锋墍鏈夌殑鐐夊彿 + public Result<List<GlassInfo>> selectTemperingGlass(@RequestBody GlassInfo glassInfo) { + List<GlassInfo> glass = temperingGlassInfoService.selectTemperingGlass(glassInfo); + return Result.build(200, "鏌ヨ鎴愬姛", glass); + } + } -- Gitblit v1.8.0