From d1099b48aecf383fcefbe7b5a7ac3c2de0f0793f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:22:03 +0800
Subject: [PATCH] 1、卧理进出片功能已完成开发，与电气调试中，新增磨边队列表 2、卧理新增历史任务表，记录卧理两台设备执行过的历史数据 3、大理片笼opc任务，新增玻璃进笼计算方式：在笼内存储同炉的多片玻璃，笼内玻璃顺序可不按照固定的顺序进笼 4、上片任务初步完成开发，新增历史任务表记录上片的历史信息
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 295e4fd..63c1825 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
@@ -1,7 +1,6 @@
package com.mes.damage.controller;
-import cn.hutool.core.date.DateTime;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
import com.mes.damage.service.DamageService;
@@ -11,7 +10,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -29,7 +27,7 @@
@ResponseBody
public class DamageController {
- @Autowired
+ @Autowired(required=true)
private DamageService damageService;
@ApiOperation("鎶ュ伐鏁版嵁鏌ヨ")
@PostMapping("/selectDamage")
@@ -39,13 +37,14 @@
int type =Integer.parseInt(map.get("type").toString());
int status =Integer.parseInt(map.get("status").toString());
String workingProcedure =map.get("workingProcedure").toString();
- return Result.build(200,"鏌ヨ鎴愬姛",damageService.selectDamage(startTime,endTime,type,status,workingProcedure));
+ return Result.build(200,"鏌ヨ鎴愬姛",damageService.selectDamage(startTime,endTime,type,status, workingProcedure));
}
@ApiOperation("鎶ュ伐")
@PostMapping("/submitDamage")
public Result submitDamage(@RequestBody List<Damage> damageList) {
damageService.submitDamage(damageList);
+ damageList.forEach(damage -> damage.setStatus(3));
damageService.updateBatchById(damageList);
return Result.build(200,"鎶ュ伐鎴愬姛",1);
}
--
Gitblit v1.8.0