From 65ae6084f552c035eb5640afbd8f73e6054e3b6c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 七月 2024 21:15:53 +0800
Subject: [PATCH] 1、大理片：fixbug:大理片出片逻辑修改，钢化版图是否到齐：sql逻辑问题，包含人工出片任务，造成钢化版图是否到齐需要获取已出片的玻璃，造成已出笼的玻璃会重复计算并准备生成钢化任务，但获取的玻璃信息为空，造成插入钢化表异常。且排除已出笼的钢化版图较复杂（暂不关联钢化小片表），目前解决方案：把所有到齐的钢化版图数据查出来，排除笼内玻璃为空的 2、移除已配置完mapperscan已扫描仍有@Mapper注解的
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
index f89f3ee..e7feaef 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
@@ -1,5 +1,6 @@
package com.mes.downstorage.controller;
+import com.mes.downstorage.entity.DownStorageCage;
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.service.DownStorageCageDetailsService;
import com.mes.downstorage.service.DownStorageCageService;
@@ -20,7 +21,7 @@
private DownStorageCageDetailsService downStorageCageDetailsService;
@Autowired
private DownStorageCageService downStorageCageService;
-
+ @ApiOperation("娣诲姞鐜荤拑")
@PostMapping("/add")
public String addDownStorageCageDetails(@RequestBody DownStorageCageDetails details) {
downStorageCageDetailsService.addDownStorageCageDetails(details);
@@ -33,40 +34,50 @@
@ApiOperation("鏌ヨ缂撳瓨鐞嗙墖绗煎唴璇︽儏")
@GetMapping("/selectStorageCage")
@ResponseBody
- public Result selectEdgStorageCage () {
- List<Map> list=downStorageCageDetailsService.getCacheInfo();
+ public Result selectDownStorageCage () {
+ List<Map<String, Object>> list=downStorageCageService.selectDownStorageCages();
return Result.build(200,"鎴愬姛",list);
}
+//
+// @ApiOperation("娣诲姞缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氱鍐呯粦瀹氱幓鐠� 鍙傛暟(DownStorageCageDetails downStorageCageDetails)")
+// @PostMapping("/insertEdgStorageCage")
+// @ResponseBody
+// public Result insertEdgStorageCage(@RequestBody DownStorageCageDetails downStorageCageDetails) {
+// boolean isSucess=downStorageCageService.updatedownStorageCageDetails(downStorageCageDetails);
+// return Result.build(200,"娣诲姞鎴愬姛",1);
+// }
- @ApiOperation("娣诲姞缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氱鍐呯粦瀹氱幓鐠� 鍙傛暟(DownStorageCageDetails downStorageCageDetails)")
- @PostMapping("/insertEdgStorageCage")
- @ResponseBody
- public Result insertEdgStorageCage(@RequestBody DownStorageCageDetails downStorageCageDetails) {
- boolean isSucess=downStorageCageDetailsService.updatedownStorageCageDetails(downStorageCageDetails);
- return Result.build(200,"娣诲姞鎴愬姛",1);
- }
+
+
@ApiOperation("淇敼缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸杩涜銆愬惎鐢�/绂佺敤銆�/ 銆愭洿鎹€�戠鍐呮爡鏍肩幓鐠冧俊鎭�")
- @PostMapping("/updateEdgStorageCage")
+ @PostMapping("/updateDownStorageCage")
@ResponseBody
- public Result updateEdgStorageCage(@RequestBody DownStorageCageDetails downStorageCageDetails) {
- boolean isSucess=downStorageCageDetailsService.updatedownStorageCageDetails(downStorageCageDetails);
- return Result.build(200,"鏇存崲鎴愬姛",1);
+ public Result updateDownStorageCage(@RequestBody DownStorageCage downStorageCage) {
+ boolean isSucess=downStorageCageService.updateDownStorageCage(downStorageCage);
+ return Result.build(200,"鏇存崲鎴愬姛",isSucess);
}
@ApiOperation("鍒犻櫎缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ��")
- @PostMapping("/deleteEdgStorageCage")
+ @PostMapping("/deleteDownStorageCage")
@ResponseBody
- public Result deleteEdgStorageCage(@RequestBody DownStorageCageDetails downStorageCageDetails) {
- boolean isSucess=downStorageCageDetailsService.updatedownStorageCageDetails(downStorageCageDetails);
+ public Result deleteDownStorageCage(@RequestBody DownStorageCageDetails downStorageCageDetails,int downStorageCageId) {
+ boolean isSucess=downStorageCageService.updateDownStorageCageDetails(downStorageCageId,downStorageCageDetails);
return Result.build(200,"鍒犻櫎鎴愬姛",1);
}
-//
+ @ApiOperation("淇敼鐜荤拑鐘舵�� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愮牬鎹�/鎷胯蛋銆� ")
+ @PostMapping("/ReportStatus")
+ @ResponseBody
+ public Result edgReportStatus(@RequestBody Map<String, String> arguments) {
+ String downStorageCageDetailsId=arguments.get("glassId");
+ int controlsId=Integer.valueOf(arguments.get("controlsId"));
+ boolean isSucess=downStorageCageDetailsService.identWorn(downStorageCageDetailsId,controlsId);
+ return Result.build(200,"銆愮牬鎹�/鎷胯蛋銆戞垚鍔�",1);
+ }
- // Other CRUD operations can be defined here
}
--
Gitblit v1.8.0