From 4f966da6047cdcd9c53e254c1f1c7bdd70af0b34 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 21 四月 2025 10:08:18 +0800
Subject: [PATCH] 1、卧式理片笼配置参数由配置yml文件改为数据库配置表获取 2、磨边后参数改造，解决plc查询数据异常问题 3、大理片笼配置参数由配置yml文件改为数据库配置表获取 4、钢化配置参数由配置yml文件改为数据库配置表获取 5、配置参数常量类配置修改，提供获取配置参数的方法
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
index c21084c..bf3275c 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
@@ -21,14 +21,15 @@
* @author wu
* @since 2024-06-25
*/
-@Api(description = "鎶ュ伐淇℃伅")
+@Api(tags = "鎶ュ伐淇℃伅")
@RestController
@RequestMapping("/damage")
@ResponseBody
public class DamageController {
- @Autowired
+ @Autowired(required=true)
private DamageService damageService;
+
@ApiOperation("鎶ュ伐鏁版嵁鏌ヨ")
@PostMapping("/selectDamage")
public Result selectDamage(@RequestBody Map map) {
@@ -44,7 +45,11 @@
@PostMapping("/submitDamage")
public Result submitDamage(@RequestBody List<Damage> damageList) {
damageService.submitDamage(damageList);
- damageList.forEach(damage -> damage.setStatus(2));
+ if(damageList.get(0).getStatus()==1){
+ damageList.forEach(damage -> damage.setStatus(3));
+ }else{
+ damageList.forEach(damage -> damage.setStatus(8));
+ }
damageService.updateBatchById(damageList);
return Result.build(200,"鎶ュ伐鎴愬姛",1);
}
@@ -74,6 +79,12 @@
List<DamagePrint> damage2=damageService.selectDamagePrintDetails(damage);
return Result.build(200,"鏌ヨ鎴愬姛",damage2);
}
+ @ApiOperation("鑷姩鎶ュ伐")
+ @PostMapping("/autoSubmitReport")
+ public Result autoSubmitReport(String glassId, int deviceId, String workingProcedure, String remark, int type) {
+ damageService.autoSubmitReport(glassId,deviceId,workingProcedure,remark,type);
+ return Result.build(200,"鏌ヨ鎴愬姛","");
+ }
}
--
Gitblit v1.8.0