From f68d3c71819feb59e7a227a5d992b059b900916c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 28 三月 2025 08:28:26 +0800
Subject: [PATCH] 修改报表,界面添加查询流程卡个数,调整推送数据到前端的间隔

---
 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java |   18 ++++++++++++------
 1 files changed, 12 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 0efdd00..e9242ce 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
@@ -45,17 +45,23 @@
     @ApiOperation("//閽㈠寲鐮存崯鎷胯蛋鏀惧洖")
     @PostMapping("/updateTemperingState") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
     public Result <Integer> updateTemperingState(@RequestBody  Damage damage) {
-        if(damage.getStatus()>5) {
-            damage.setType(damage.getStatus());
-            damage.setStatus(1);
-            damageService.insertDamage(damage);
-        }
         TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo();
-        temperingGlassInfo.setState(damage.getType());
+        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);
+//        }
         return Result.build(200, "鐮存崯鎴愬姛", result);
     }
+    @ApiOperation("//鏁寸増鎷胯蛋")
+    @PostMapping("/updateTemperingStateAll") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
+    public Result <Boolean> updateTemperingStateAll(@RequestBody  TemperingGlassInfo glassinfo) {
 
+        boolean result=temperingGlassInfoService.updateTemperingStateAll(glassinfo);
+        return Result.build(200, "鐮存崯鎴愬姛", result);
+    }
 
 }

--
Gitblit v1.8.0