From 27565d30bc8675ef436ff754a0cd1f2d04feff7b Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 20 六月 2024 15:29:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
index ad8b70f..eb64e0d 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -39,14 +39,14 @@
@ApiOperation("鍑虹墖浠诲姟鍒犻櫎")
@PostMapping("/deleteTemperingGlassInfo")
public Result deleteTemperingGlassInfo(TemperingGlassInfo temperingGlassInfo) {
- temperingGlassInfoService.removeById(temperingGlassInfo);
+ temperingGlassInfoService.removeById(temperingGlassInfo.getId());
return Result.build(200,"鍒犻櫎鎴愬姛",1);
}
- @ApiOperation("鍑虹墖浠诲姟鐮存崯")
+ @ApiOperation("鍑虹墖浠诲姟鐮存崯0/鎷胯蛋1")
@PostMapping("/damageTemperingGlassInfo")
- public Result damageTemperingGlassInfo(TemperingGlassInfo temperingGlassInfo) {
- bigStorageCageDetailsService.damageBigStorageCageDetails(temperingGlassInfo.getGlassId());
+ public Result damageTemperingGlassInfo(TemperingGlassInfo temperingGlassInfo,int status) {
+ bigStorageCageDetailsService.damageBigStorageCageDetails(temperingGlassInfo.getGlassId(),status);
return Result.build(200,"鐮存崯鎴愬姛",1);
}
}
--
Gitblit v1.8.0