From fbd31387721424c65b173cbb23b03202f3e7dce6 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 12 五月 2025 21:13:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 d6c71b1..f93875f 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
@@ -50,7 +50,7 @@
@ApiOperation("//閽㈠寲鐮存崯鎷胯蛋鏀惧洖")
@PostMapping("/updateTemperingState") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
- public Result <Integer> updateTemperingState(@RequestBody DamageRequest damage) {
+ public Result<List<LoadGlassInfo>> updateTemperingState(@RequestBody DamageRequest damage) {
TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo();
temperingGlassInfo.setState(damage.getState());
temperingGlassInfo.setGlassId(damage.getGlassId());
@@ -59,7 +59,11 @@
damageService.autoSubmitReport(damage.getGlassId(), damage.getLine()
, damage.getWorkingProcedure(), "閽㈠寲鐐�", damage.getState());
}
- return Result.build(200, "鐮存崯鎴愬姛", result);
+ GlassInfo glassInfo = new GlassInfo();
+ glassInfo.setEngineerId(damage.getEngineerId());
+ glassInfo.setTemperingLayoutId(damage.getTemperingLayoutId());
+ List<LoadGlassInfo> glass = temperingGlassInfoService.selectTemperingGlass(glassInfo);
+ return Result.build(200, "鐮存崯鎴愬姛", glass);
}
@ApiOperation("//鏌ヨ褰撳墠宸ョ▼鍙锋墍鏈夌殑鐐夊彿")
--
Gitblit v1.8.0