From 2a693c6842788d1011d69e62af3df6dfd06ecf16 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 19 一月 2024 14:43:50 +0800
Subject: [PATCH] 增加汇报写入判断限制
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 dc630bf..619fd1b 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
@@ -30,54 +30,57 @@
String A01glassid2 = spianService.queGlassid("DB103.142", 14).toString();
String A02glassid1 = spianService.queGlassid("DB103.156", 14).toString();
String B01glassid = spianService.queGlassid("DB103.184", 14).toString();
- String B02glassid = spianService.queGlassid("DB103.198", 14).toString();
+ String B02glassid = spianService.queGlassid("DB103.212", 14).toString();
List<Short> DeviceList = S7control.getinstance().ReadWord("DB103.0", 10);
if (types == 0) {// 缁堟杩涚墖浠诲姟
List<StorageTask> cageList = homeMapper.SelectTaskByState(types);
for (StorageTask storageTask : cageList) {
// 鍒ゆ柇鍑虹墖浠诲姟浣嶇疆骞舵竻闄ゅ搴旂幓鐠僫d
- if ((storageTask.getGlassId() == A01glassid1 || storageTask.getGlassId() == A01glassid2)&&DeviceList.get(4)==0) {
+ if ((storageTask.getGlassId().equals(A01glassid1)|| storageTask.getGlassId().equals(A01glassid2))&&DeviceList.get(4)==0) {
outSliceServive.StopTask(storageTask.getGlassId(), types);
ClearGlassId("DB101.10.0");
- } else if (storageTask.getGlassId() == B01glassid&&DeviceList.get(2)==0) {
+ }
+ if (storageTask.getGlassId().equals(B01glassid)&&DeviceList.get(2)==0) {
outSliceServive.StopTask(storageTask.getGlassId(), types);
ClearGlassId("DB101.10.2");
- } else if (storageTask.getGlassId() == B02glassid&&DeviceList.get(3)==0) {
+ }
+ if (storageTask.getGlassId().equals(B02glassid)&&DeviceList.get(3)==0) {
ClearGlassId("DB101.10.3");
outSliceServive.StopTask(storageTask.getGlassId(), types);
- }\
+ }
}
// 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙�
} else {// 缁堟鍑虹墖浠诲姟
List<StorageTask> cageLists = homeMapper.SelectTaskByState(types);
List<StorageTask> cageList2 = homeMapper.SelectTaskByState(2);
- if (cageList2!=null) {
+ if (cageList2.size()>0) {
cageLists.add(cageList2.get(0));
}
for (StorageTask cageList : cageLists) {
if (cageList.getTaskType().equals("1")) {
- if(cageList.getGlassId() ==A02glassid1&&DeviceList.get(5)==0){
+ System.out.println(DeviceList.get(5));
+ if(cageList.getGlassId().equals(A02glassid1)&&DeviceList.get(5)==0){
outSliceServive.StopTask(cageList.getGlassId(), types);
ClearGlassId("DB101.10.1");
}
- else if(cageList.getGlassId() ==B01glassid&&DeviceList.get(2)==0){
+ if(cageList.getGlassId().equals(B01glassid)&&DeviceList.get(2)==0){
outSliceServive.StopTask(cageList.getGlassId(), types);
ClearGlassId("DB101.10.2");
}
- else if(cageList.getGlassId() ==B02glassid&&DeviceList.get(3)==0){
+ if(cageList.getGlassId().equals(B02glassid)&&DeviceList.get(3)==0){
outSliceServive.StopTask(cageList.getGlassId(), types);
ClearGlassId("DB101.10.3");
}
}else if (cageList.getTaskType().equals("2")) {
- if(cageList.getGlassId() ==A02glassid1&&DeviceList.get(5)==0){
+ if(cageList.getGlassId().equals(A02glassid1)&&DeviceList.get(5)==0){
outSliceServive.StopTask(cageList.getGlassId(), 2);
ClearGlassId("DB101.10.1");
}
- else if(cageList.getGlassId() ==B01glassid&&DeviceList.get(2)==0){
+ if(cageList.getGlassId().equals(B01glassid)&&DeviceList.get(2)==0){
outSliceServive.StopTask(cageList.getGlassId(), 2);
ClearGlassId("DB101.10.2");
}
- else if(cageList.getGlassId() ==B02glassid&&DeviceList.get(3)==0){
+ if(cageList.getGlassId().equals(B02glassid)&&DeviceList.get(3)==0){
outSliceServive.StopTask(cageList.getGlassId(), 2);
ClearGlassId("DB101.10.3");
}
--
Gitblit v1.8.0