From 91d7afedf3ea51ee87ee47d4da2e1b6243f8fb84 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 05 一月 2025 21:50:21 +0800
Subject: [PATCH] 1、大理片笼进片任务新增数量校验，当收到进片请求时，拿电气的玻璃数量与mes接收到的数量作比较，相同继续执行，不相同结束本次任务 2、李赛克文件优化，合中空玻璃每个间隔框的类型可能不同，需要在界面上做选择 3、中空设备号与格子号不匹配bug解决 4、自动报工存在接口调用异常，临时将调用接口回退原版本，待最新接口调用无异常后更新接口 5、fixbug:中空大理片详情界面删除接口异常
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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 5418041..ef317bf 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
@@ -2,6 +2,7 @@
import com.mes.bigstorage.entity.BigStorageCage;
+import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
@@ -9,11 +10,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -25,25 +22,28 @@
* @author zhoush
* @since 2024-03-27
*/
-@Api(description = "閽㈠寲灏忕墖琛ㄤ俊鎭�")
+@Api(tags = "閽㈠寲灏忕墖琛ㄤ俊鎭�")
@RestController
@RequestMapping("/temperingGlassInfo")
public class TemperingGlassInfoController {
@Autowired
private TemperingGlassInfoService temperingGlassInfoService;
+ @Autowired
+ private BigStorageCageDetailsService bigStorageCageDetailsService;
- @ApiOperation("閽㈠寲灏忕墖淇℃伅")
- @GetMapping("/queryTemperingGlassInfo")
- public Result queryTemperingGlassInfo() {
- return Result.build(200,"鏌ヨ鎴愬姛",temperingGlassInfoService.list());
+ @ApiOperation("鍑虹墖浠诲姟鍒犻櫎")
+ @PostMapping("/deleteTemperingGlassInfo")
+ public Result deleteTemperingGlassInfo(@RequestBody TemperingGlassInfo temperingGlassInfo) {
+ temperingGlassInfoService.removeById(temperingGlassInfo.getId());
+ return Result.build(200,"鍒犻櫎鎴愬姛",1);
}
- @ApiOperation("鎵嬪姩娣诲姞鍑虹墖浠诲姟")
- @PostMapping("/insertTemperingGlassInfo")
- public Result insertBigStorageCageDetail(TemperingGlassInfo temperingGlassInfo) {
- temperingGlassInfoService.save(temperingGlassInfo);
- return Result.build(200,"娣诲姞鎴愬姛",1);
+ @ApiOperation("鍑虹墖浠诲姟鐮存崯0/鎷胯蛋1")
+ @PostMapping("/damageTemperingGlassInfo")
+ public Result damageTemperingGlassInfo(@RequestBody TemperingGlassInfo temperingGlassInfo,int status) {
+ bigStorageCageDetailsService.damageBigStorageCageDetails(temperingGlassInfo.getGlassId(),status);
+ return Result.build(200,"鐮存崯鎴愬姛",1);
}
}
--
Gitblit v1.8.0