From 5db14138646f88b780fcf90000abdd0cd925c1b9 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 一月 2024 09:54:21 +0800
Subject: [PATCH] 主界面添加扫码枪二维码显示，添加软急停，调整终止任务功能
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 115 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 78 insertions(+), 37 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 c296ec6..dc630bf 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
@@ -31,79 +31,120 @@
String A02glassid1 = spianService.queGlassid("DB103.156", 14).toString();
String B01glassid = spianService.queGlassid("DB103.184", 14).toString();
String B02glassid = spianService.queGlassid("DB103.198", 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) {
+ if ((storageTask.getGlassId() == A01glassid1 || storageTask.getGlassId() == A01glassid2)&&DeviceList.get(4)==0) {
outSliceServive.StopTask(storageTask.getGlassId(), types);
ClearGlassId("DB101.10.0");
- } else if (storageTask.getGlassId() == B01glassid) {
+ } else if (storageTask.getGlassId() == B01glassid&&DeviceList.get(2)==0) {
outSliceServive.StopTask(storageTask.getGlassId(), types);
ClearGlassId("DB101.10.2");
- } else if (storageTask.getGlassId() == B02glassid) {
+ } else if (storageTask.getGlassId() == B02glassid&&DeviceList.get(3)==0) {
ClearGlassId("DB101.10.3");
outSliceServive.StopTask(storageTask.getGlassId(), types);
- }
+ }\
}
// 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙�
} else {// 缁堟鍑虹墖浠诲姟
- List<StorageCage> storageCages = homeMapper.selectinout(3);
- for (StorageCage storageCage : storageCages) {
- List<StorageCage> storageCagess = homeMapper.SelectStoragesGlassById(storageCage.getGlassId());
- for (StorageCage storageCagez : storageCagess) {
- if (storageCagez.getState().equals("2")) {// 璋冩嫧杩涚墖
- outSliceServive.StopTask(storageCagez.getGlassId(), 0);
- } else {// 鍑虹墖
- outSliceServive.StopTask(storageCagez.getGlassId(), types);
- }
- // 鍒ゆ柇鍑虹墖浠诲姟浣嶇疆骞舵竻闄ゅ搴旂幓鐠僫d
- if (storageCagez.getGlassId() == A02glassid1) {
- outSliceServive.StopTask(storageCagez.getGlassId(), types);
+ List<StorageTask> cageLists = homeMapper.SelectTaskByState(types);
+ List<StorageTask> cageList2 = homeMapper.SelectTaskByState(2);
+ if (cageList2!=null) {
+ cageLists.add(cageList2.get(0));
+ }
+ for (StorageTask cageList : cageLists) {
+ if (cageList.getTaskType().equals("1")) {
+ if(cageList.getGlassId() ==A02glassid1&&DeviceList.get(5)==0){
+ outSliceServive.StopTask(cageList.getGlassId(), types);
ClearGlassId("DB101.10.1");
- } else if (storageCagez.getGlassId() == B01glassid) {
- outSliceServive.StopTask(storageCagez.getGlassId(), types);
+ }
+ else if(cageList.getGlassId() ==B01glassid&&DeviceList.get(2)==0){
+ outSliceServive.StopTask(cageList.getGlassId(), types);
ClearGlassId("DB101.10.2");
- } else if (storageCagez.getGlassId() == B02glassid) {
+ }
+ else if(cageList.getGlassId() ==B02glassid&&DeviceList.get(3)==0){
+ outSliceServive.StopTask(cageList.getGlassId(), types);
ClearGlassId("DB101.10.3");
- outSliceServive.StopTask(storageCagez.getGlassId(), types);
+ }
+ }else if (cageList.getTaskType().equals("2")) {
+ if(cageList.getGlassId() ==A02glassid1&&DeviceList.get(5)==0){
+ outSliceServive.StopTask(cageList.getGlassId(), 2);
+ ClearGlassId("DB101.10.1");
+ }
+ else if(cageList.getGlassId() ==B01glassid&&DeviceList.get(2)==0){
+ outSliceServive.StopTask(cageList.getGlassId(), 2);
+ ClearGlassId("DB101.10.2");
+ }
+ else if(cageList.getGlassId() ==B02glassid&&DeviceList.get(3)==0){
+ outSliceServive.StopTask(cageList.getGlassId(), 2);
+ ClearGlassId("DB101.10.3");
}
}
}
+
+ // List<StorageCage> storageCages = homeMapper.selectinout(3);
+ // for (StorageCage storageCage : storageCages) {
+ // List<StorageCage> storageCagess = homeMapper.SelectStoragesGlassById(storageCage.getGlassId());
+
+ // for (StorageCage storageCagez : storageCagess) {
+
+ // if (storageCagez.getState().equals("2")) {// 璋冩嫧杩涚墖
+ // outSliceServive.StopTask(storageCagez.getGlassId(), 0);
+ // } else {// 鍑虹墖
+ // outSliceServive.StopTask(storageCagez.getGlassId(), types);
+ // }
+
+ // // 鍒ゆ柇鍑虹墖浠诲姟浣嶇疆骞舵竻闄ゅ搴旂幓鐠僫d
+ // if (storageCagez.getGlassId() == A02glassid1&&DeviceList.get(5)==0) {
+ // outSliceServive.StopTask(storageCagez.getGlassId(), types);
+ // ClearGlassId("DB101.10.1");
+ // } else if (storageCagez.getGlassId() == B01glassid&&DeviceList.get(2)==0) {
+ // outSliceServive.StopTask(storageCagez.getGlassId(), types);
+ // ClearGlassId("DB101.10.2");
+ // } else if (storageCagez.getGlassId() == B02glassid&&DeviceList.get(3)==0) {
+ // ClearGlassId("DB101.10.3");
+ // outSliceServive.StopTask(storageCagez.getGlassId(), types);
+ // }
+ // }
+ // }
}
}
- //鎵嬪姩瀹屾垚浠诲姟
+ // 鎵嬪姩瀹屾垚浠诲姟
public void UpdateTask(Integer types, Integer shelfrack, String glassid) {
if (types == 0) {// 瀹屾垚杩涚墖
spianService.overtask(glassid);
} else if (types == 1) {// 瀹屾垚鍑虹墖
spianService.overtask(glassid);
- }
+ }
// else if (types == 2) {// 缁堟杩涚墖浠诲姟
- // outSliceServive.StopTask(glassid, 0);
- // // 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙�
+ // outSliceServive.StopTask(glassid, 0);
+ // // 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙�
// } else {// 缁堟鍑虹墖浠诲姟
- // outSliceServive.StopTask(glassid, 1);
+ // outSliceServive.StopTask(glassid, 1);
// }
}
- //鍒ゆ柇浠诲姟绫诲瀷鍚庢竻闄ゅ搴旂幓鐠僫d
+ // 鍒ゆ柇浠诲姟绫诲瀷鍚庢竻闄ゅ搴旂幓鐠僫d
public Result ClearGlassId(String position, String glassid) {
Map<String, Object> map = new HashMap<>();
if (S7control.getinstance().CheckConnected() == true) {
// 鍒ゆ柇杩涘嚭杩樻槸鍑虹墖浠诲姟
Short type = homeMapper.SelectTaskByGlassId(glassid);
- if (type == 0) {
- // 杩涚墖
- outSliceServive.StopTask(glassid, 0);
- } else if (type == 1) {
- // 鍑虹墖
- outSliceServive.StopTask(glassid, 1);
- } else {
- // 璋冩嫧
- outSliceServive.StopTask(glassid, 0);
- outSliceServive.StopTask(glassid, 1);
+ if (type != null) {
+ if (type == 0) {
+ // 杩涚墖
+ outSliceServive.StopTask(glassid, 0);
+ } else if (type == 1) {
+ // 鍑虹墖
+ outSliceServive.StopTask(glassid, 1);
+ } else {
+ // 璋冩嫧
+ outSliceServive.StopTask(glassid, 0);
+ outSliceServive.StopTask(glassid, 1);
+ }
}
ClearGlassId(position);
map.put("message", "200");
@@ -113,7 +154,7 @@
return Result.success(map);
}
- //娓呴櫎鐜荤拑id
+ // 娓呴櫎鐜荤拑id
public Result ClearGlassId(String position) {
Map<String, Object> map = new HashMap<>();
if (S7control.getinstance().CheckConnected() == true) {
--
Gitblit v1.8.0