From e31a077927d47bd05bcfdc3367deafb8c4069c6d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 26 十二月 2024 23:57:34 +0800
Subject: [PATCH] 1、卧式理片玻璃替换仅替换版图信息 2、指定钢化、指定工程fixbug:膜系字段修改为filmsId 3、移除大理片笼向前端推送钢化历史任务数据 4、中空领取任务界面接口改造：新增开始/暂停/结束任务按钮，流程卡列表、预览任务、删除任务接口 5、领取/强制任务接口改造：新增除膜信息、李赛克文件需要的数据信息
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 5ff1a1b..d174f6c 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
@@ -71,7 +71,7 @@
return Result.build(200, "鍒犻櫎鎴愬姛", bigStorageCageService.querybigStorageCageDetail());
}
- @ApiOperation("鐞嗙墖绗间换鍔＄牬鎹�0/鎷胯蛋1")
+ @ApiOperation("鐞嗙墖绗肩鍐呯幓鐠冪牬鎹�0/鎷胯蛋1")
@PostMapping("/damageBigStorageCageDetails")
public Result damageBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails, int status) {
bigStorageCageDetailsService.damageBigStorageCageDetails(bigStorageCageDetails.getGlassId(), status);
@@ -104,12 +104,28 @@
}
}
+ @ApiOperation("鎸囧畾閽㈠寲宸ョ▼")
+ @PostMapping("/appointTemperingEngineerId")
+ public Result appointTemperingEngineerId(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+ boolean result = bigStorageCageDetailsService.appointTemperingEngineerId(bigStorageCageDetails.getEngineerId());
+ if (result == true) {
+ return Result.build(200, "鎸囧畾閽㈠寲鎴愬姛", 1);
+ } else {
+ return Result.build(200, "宸插瓨鍦ㄩ挗鍖栦换鍔★紝璇风瓑寰呴挗鍖栧畬鎴愬啀鎸囧畾閽㈠寲", 1);
+ }
+ }
+
@ApiOperation("閽㈠寲/闈為挗鍖栨煡璇細0 闈為挗鍖� 1锛氶挗鍖�")
@PostMapping("/selectTemperingGlass")
public Result<List<TemperingGlassCountDTO>> selectTemperingGlass(int isTempering) {
return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.selectTemperingGlass(isTempering));
}
+ @ApiOperation("绗煎唴瀹為檯鏁伴噺鏌ヨ")
+ @PostMapping("/queryRealGlassInfo")
+ public Result<List<BigStorageCageDetails>> queryRealGlassInfo(@RequestBody BigStorageQueryVO bigStorageQueryVO) {
+ return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.queryRealGlassInfo(bigStorageQueryVO));
+ }
@ApiOperation("缂虹墖鏁伴噺鏌ヨ")
@PostMapping("/queryLackGlassInfo")
public Result<List<GlassInfoLackDTO>> queryLackGlassInfo(@RequestBody BigStorageQueryVO bigStorageQueryVO) {
@@ -163,13 +179,11 @@
return Result.build(200, "鎸囧畾娴佺▼鍗℃垚鍔�", 1);
}
}
-
- @ApiOperation("鎸囧畾宸ョ▼")
- @PostMapping("/appointEngineerId")
- public Result appointEngineerId(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
- bigStorageCageDetailsService.appointEngineerId(bigStorageCageDetails.getEngineerId());
- return Result.build(200, "淇敼鎴愬姛", 1);
+ @ApiOperation("澶х悊鐗囩鎶ョ牬鎹�")
+ @PostMapping("/bigStorageGlassDamageByGlassId")
+ public Result<String> bigStorageGlassDamageByGlassId(@RequestBody Map<String, String> map) {
+ String glassId=map.get("glassId");
+ return Result.build(200, "鎶ョ牬鎹熸垚鍔�", bigStorageCageDetailsService.bigStorageGlassDamageByGlassId(glassId));
}
-
}
--
Gitblit v1.8.0