From dbdf9238c808566a0cef6cd3858f6f3ee2d7bacd Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 21 七月 2024 08:22:52 +0800
Subject: [PATCH] 1、大理片笼：选择工程号没有是否旋转字段的值 2、将钢化小片表中电气需要的字段改为int（宽高厚、旋转角度）
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 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 bca9539..d83399e 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
@@ -34,21 +34,25 @@
@PostMapping("/selectBigStorageCageDetails")
public Result selectBigStorageCageDetails(@RequestBody Map map) {
List<BigStorageCageDetails> bigStorageCageDetails=bigStorageCageDetailsService.selectBigStorageCageDetails(map.get("glassId").toString());
- return Result.build(200,"鏌ヨ鎴愬姛",bigStorageCageDetails);
+ if (bigStorageCageDetails.size()>0){
+ return Result.build(200,"鏌ヨ鎴愬姛",bigStorageCageDetails);
+ }else{
+ return Result.build(200,"鏌ヨ澶辫触锛屾棤姝ょ幓鐠僫d",bigStorageCageDetails);
+ }
}
@ApiOperation("鐞嗙墖绗艰鎯呮坊鍔�")
@PostMapping("/insertBigStorageCageDetails")
public Result insertBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
bigStorageCageDetailsService.insertBigStorageCageDetails(bigStorageCageDetails);
- return Result.build(200,"娣诲姞鎴愬姛",bigStorageCageService.querybigStorageCageDetail(0));
+ return Result.build(200,"娣诲姞鎴愬姛",bigStorageCageService.querybigStorageCageDetail());
}
@ApiOperation("鐞嗙墖绗艰鎯呭垹闄�")
@PostMapping("/deleteBigStorageCageDetails")
public Result deleteBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
bigStorageCageDetailsService.deleteBigStorageCageDetails(bigStorageCageDetails);
- return Result.build(200,"鍒犻櫎鎴愬姛",bigStorageCageService.querybigStorageCageDetail(0));
+ return Result.build(200,"鍒犻櫎鎴愬姛",bigStorageCageService.querybigStorageCageDetail());
}
@ApiOperation("鐞嗙墖绗间换鍔＄牬鎹�0/鎷胯蛋1")
@@ -68,10 +72,25 @@
@ApiOperation("鐞嗙墖绗间换鍔″嚭鐗�")
@PostMapping("/outBigStorageCageDetails")
public Result outBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
-
bigStorageCageDetailsService.outBigStorageCageDetails(bigStorageCageDetails);
return Result.build(200,"鍑虹墖娣诲姞鎴愬姛",1);
}
+ @ApiOperation("鎸囧畾閽㈠寲")
+ @PostMapping("/TemperingGlass")
+ public Result TemperingGlass(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+ boolean result=bigStorageCageDetailsService.TemperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(),bigStorageCageDetails.getEngineerId());
+ if(result==true){
+ return Result.build(200,"鎸囧畾閽㈠寲鎴愬姛",1);
+ }else {
+ return Result.build(200, "宸插瓨鍦ㄩ挗鍖栦换鍔�", 1);
+ }
+ }
+
+ @ApiOperation("閽㈠寲鏌ヨ")
+ @PostMapping("/selectTemperingGlass")
+ public Result selectTemperingGlass() {
+ return Result.build(200,"鏌ヨ鎴愬姛",bigStorageCageDetailsService.selectTemperingGlass());
+ }
}
--
Gitblit v1.8.0