From 28ded8102d83cf74bc232d1cdfc89b7f22c41952 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 03 十二月 2024 09:09:31 +0800
Subject: [PATCH] 增加点击防抖事件 增加笼子使用详情的计算优化。 增加数据推送时的报错处理 测量台交互逻辑增加 参数界面增加翻转加减速度
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
index 951a959..0024a4c 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
@@ -228,7 +228,12 @@
// 澧炲姞/鍑忓皯鐞嗙墖绗肩幓鐠冩暟
public Result UpdateStroageCageByCell(Integer cell, Integer num) {
if (num == 0) {
- homeMapper.DeleteStroageCageByCell(cell);
+ int sumcell=albaniaMapper.SelectOutTasksum(cell);
+ if(sumcell==0){
+ homeMapper.DeleteStroageCageByCell(cell);
+ }
+ }else if(num==-1){
+ homeMapper.updateStroageCageByCell(cell, num);
} else {
homeMapper.updateStroageCageByCell(cell, num);
homeMapper.UpdateStroageCageWidthByCell(cell);// 淇敼绗煎瓙瀹藉害
@@ -237,6 +242,22 @@
map.put("message", "200");
return Result.success(map);
}
+ // 鐣岄潰澧炲姞/鍑忓皯鐞嗙墖绗肩幓鐠冩暟
+ public Result UpdateStroageCageByCells(Integer cell, Integer num) {
+ if (num == 0) {
+ int sumcell=albaniaMapper.SelectOutTasksum(cell);
+ if(sumcell==0){
+ homeMapper.DeleteStroageCageByCell(cell);
+ }
+ } else {
+ homeMapper.updateStroageCageByCell(cell, num);
+ homeMapper.UpdateStroageCageWidthByCell(cell);// 淇敼绗煎瓙瀹藉害
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
// 鎸囧畾鏍煎瓙鍑虹墖
public Result AddOutGlass(Integer cell, Integer glasstype) {
@@ -304,6 +325,13 @@
// 鎵嬪姩缁撴潫浠诲姟
public Result TerminateTask(int id) {
+ PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
+ // 娓呴櫎浠诲姟鍦板潃
+ for (int i = 1; i < 7; i++) {
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCStart" + i).getAddress(), (short) 0);// 娓呴櫎浠诲姟鍦板潃
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCTarget" + i).getAddress(), (short) 0);// 娓呴櫎浠诲姟鍦板潃
+ }
+ System.out.println("缁撴潫浠诲姟鍦板潃");
for (int i = 1; i < 7; i++) {
int taskcont = albaniaMapper.SelectTaskcount(); // 姝ｅ湪杩涜鐨勪换鍔℃暟閲�
System.out.println("浠诲姟鏁伴噺:" + taskcont);
@@ -333,6 +361,13 @@
// 鎵嬪姩瀹屾垚浠诲姟
public Result FinishTask() {
+ PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
+ // 娓呴櫎浠诲姟鍦板潃
+ for (int i = 1; i < 7; i++) {
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCStart" + i).getAddress(), (short) 0);// 娓呴櫎浠诲姟鍦板潃
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCTarget" + i).getAddress(), (short) 0);// 娓呴櫎浠诲姟鍦板潃
+ }
+ System.out.println("缁撴潫浠诲姟鍦板潃");
for (int i = 1; i < 7; i++) {
int taskcont = albaniaMapper.SelectTaskcount(); // 姝ｅ湪杩涜鐨勪换鍔℃暟閲�
System.out.println("浠诲姟鏁伴噺:" + taskcont);
@@ -356,6 +391,7 @@
// storageTask.geTier());// 娣诲姞鍑虹墖瀹屾垚鏁伴噺
}
+
}
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
@@ -405,7 +441,7 @@
// 娣诲姞鐜荤拑鍒版牸瀛愬唴
public Result StorageCageAddGlass(String cell, GlassInfo glassInfo) {
homeMapper.StorageCageAddGlass(cell, glassInfo);
- UpdateStroageCageByCell(Integer.parseInt(cell), 1);
+ UpdateStroageCageByCells(Integer.parseInt(cell), 1);
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
return Result.success(map);
@@ -512,7 +548,7 @@
String A02Mes = plcmes.getPlcParameter("MESToGaStatus").getValue();
Map<String, Object> map = new HashMap<>();
// 绉婚櫎
- if ("1".equals(A02Plc)||"2".equals(A02Plc)|"1".equals(A02Mes)) {
+ if ("1".equals(A02Plc)||"2".equals(A02Plc)||"1".equals(A02Mes)) {
Queue queue = QueueMapper.selectLastQueue3();
if (queue != null) {
// 鍑忓皯鍖归厤娆℃暟
@@ -558,7 +594,6 @@
// 鍒犻櫎鍑虹墖闃熷垪
public Result DeleteOutTask(Integer id) {
-
int cell = homeMapper.SelectOutTaskId(id);
UpdateStroageCageByCell(cell, 1);// 鐜荤拑鏁伴噺+1
homeMapper.DeleteOutTask(id);
@@ -569,12 +604,17 @@
// 鍒犻櫎宸ョ▼
public Result deleteTasks(Map num) {
- String flowcard = (String) num.get("num");
- int aa = homeMapper.deleteFlowcard(flowcard.trim());
- homeMapper.deleteGlassinfo(flowcard.trim());
- System.out.println(flowcard);
Map<String, Object> map = new HashMap<>();
- map.put("message", flowcard.trim());
+ String flowcard = (String) num.get("num");
+ int cagenum=homeMapper.selectflowcardCage(flowcard);
+ if(cagenum==0){
+ int aa = homeMapper.deleteFlowcard(flowcard.trim());
+ map.put("message","200");
+ homeMapper.deleteGlassinfo(flowcard.trim());
+ }else{
+ map.put("message", "300");
+ }
+ System.out.println("鍒犻櫎宸ョ▼"+flowcard);
return Result.success(map);
}
--
Gitblit v1.8.0