From 22fb46f2db1714a6b450b353669d26908884653f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 24 十月 2024 10:48:06 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
index 2f16a59..b59a5cd 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -92,7 +92,8 @@
@ApiOperation("鎸囧畾閽㈠寲")
@PostMapping("/TemperingGlass")
public Result temperingGlass(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
- boolean result = bigStorageCageDetailsService.temperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(), bigStorageCageDetails.getEngineerId());
+ boolean result = bigStorageCageDetailsService
+ .temperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(), bigStorageCageDetails.getEngineerId(),bigStorageCageDetails.getTemperingFeedSequence().toString());
if (result == true) {
return Result.build(200, "鎸囧畾閽㈠寲鎴愬姛", 1);
} else {
@@ -145,7 +146,14 @@
}else{
return Result.build(200, "鎸囧畾娴佺▼鍗℃垚鍔�", 1);
}
-
}
+
+ @ApiOperation("鎸囧畾宸ョ▼")
+ @PostMapping("/appointEngineerId")
+ public Result appointEngineerId(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+ bigStorageCageDetailsService.appointEngineerId(bigStorageCageDetails.getEngineerId());
+ return Result.build(200, "淇敼鎴愬姛", 1);
+ }
+
}
--
Gitblit v1.8.0