From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 0bd7fff..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,7 +21,7 @@
* @author wu
* @since 2024-06-25
*/
-@Api(description = "鎶ュ伐淇℃伅")
+@Api(tags = "鎶ュ伐淇℃伅")
@RestController
@RequestMapping("/damage")
@ResponseBody
@@ -29,6 +29,7 @@
@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