From a44ccbe72b5102a593521c643fbc14cc481628eb Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 20 九月 2024 12:59:21 +0800
Subject: [PATCH] 卧式理片添加自动报工，添加合并落架流程卡打印添加，修改流程卡打印样式
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 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 9cd2ca4..295e4fd 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
@@ -3,6 +3,7 @@
import cn.hutool.core.date.DateTime;
import com.mes.damage.entity.Damage;
+import com.mes.damage.entity.DamagePrint;
import com.mes.damage.service.DamageService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
@@ -25,35 +26,55 @@
@Api(description = "鎶ュ伐淇℃伅")
@RestController
@RequestMapping("/damage")
+@ResponseBody
public class DamageController {
@Autowired
private DamageService damageService;
@ApiOperation("鎶ュ伐鏁版嵁鏌ヨ")
- @ResponseBody
@PostMapping("/selectDamage")
public Result selectDamage(@RequestBody Map map) {
String startTime=map.get("startTime").toString();
String endTime=map.get("endTime").toString();
int type =Integer.parseInt(map.get("type").toString());
int status =Integer.parseInt(map.get("status").toString());
- int workingProcedure =Integer.parseInt(map.get("workingProcedure").toString());
-// String startTime , String endTime, int type, int status, int workingProcedure
+ String workingProcedure =map.get("workingProcedure").toString();
return Result.build(200,"鏌ヨ鎴愬姛",damageService.selectDamage(startTime,endTime,type,status,workingProcedure));
}
@ApiOperation("鎶ュ伐")
@PostMapping("/submitDamage")
- public Result submitDamage(DateTime startTime , DateTime endTime,int type,int status,int workingProcedureId) {
- damageService.submitDamage(startTime,endTime,type,status,workingProcedureId);
+ public Result submitDamage(@RequestBody List<Damage> damageList) {
+ damageService.submitDamage(damageList);
+ damageService.updateBatchById(damageList);
return Result.build(200,"鎶ュ伐鎴愬姛",1);
}
@ApiOperation("鎶ュ伐鏁版嵁淇敼")
@PostMapping("/updateDamage")
- public Result updateDamage(List<Damage> damageList) {
+ public Result updateDamage(@RequestBody List<Damage> damageList) {
damageService.updateBatchById(damageList);
return Result.build(200,"淇敼鎴愬姛",1);
}
+
+ @ApiOperation("鎶ュ伐鏁版嵁鏂板")
+ @PostMapping("/insertDamage")
+ public Result insertDamage(@RequestBody Damage damage) {
+ damageService.insertDamage(damage);
+ return Result.build(200,"鏂板鎴愬姛",1);
+ }
+ @ApiOperation("鎷胯蛋鏁版嵁鏌ヨ")
+ @PostMapping("/selectDamagePrint")
+ public Result selectDamagePrint(@RequestBody Damage damage) {
+ List<DamagePrint> damage2=damageService.selectDamagePrint(damage);
+ return Result.build(200,"鏌ヨ鎴愬姛",damage2);
+ }
+ @ApiOperation("鎷胯蛋鎵撳嵃鏌ヨ")
+ @PostMapping("/selectDamagePrintDetails")
+ public Result selectDamagePrintDetails(@RequestBody Damage damage) {
+ List<DamagePrint> damage2=damageService.selectDamagePrintDetails(damage);
+ return Result.build(200,"鏌ヨ鎴愬姛",damage2);
+ }
+
}
--
Gitblit v1.8.0