From a44ccbe72b5102a593521c643fbc14cc481628eb Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 20 九月 2024 12:59:21 +0800
Subject: [PATCH] 卧式理片添加自动报工,添加合并落架流程卡打印添加,修改流程卡打印样式

---
 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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..5796939 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,15 +45,15 @@
     @ApiOperation("//閽㈠寲鐮存崯鎷胯蛋鏀惧洖")
     @PostMapping("/updateTemperingState") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
     public Result <Integer> updateTemperingState(@RequestBody  Damage damage) {
+        TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo();
+        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);
         }
-        TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo();
-        temperingGlassInfo.setState(damage.getType());
-        temperingGlassInfo.setGlassId(damage.getGlassId());
-        int result=temperingGlassInfoService.updateTemperingState(temperingGlassInfo);
         return Result.build(200, "鐮存崯鎴愬姛", result);
     }
 

--
Gitblit v1.8.0