From c85904597bf93e0fbae321093a970dd973b0f64f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 13 五月 2024 13:54:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 131 +++++++++++++++++++++++++++++++++----------
1 files changed, 99 insertions(+), 32 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 4ef8022..8cc5317 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
@@ -1,5 +1,6 @@
package com.example.springboot.service;
+import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -9,11 +10,16 @@
import org.springframework.stereotype.Service;
import com.example.springboot.common.Result;
+import com.example.springboot.component.Plchome;
import com.example.springboot.component.S7control;
+import com.example.springboot.entity.Queue;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.StorageTask;
+import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.mapper.HomeMapper;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
@Service
public class StorageCageService {
@Autowired
@@ -25,25 +31,37 @@
@Autowired
private SpianService spianService;
+ @Autowired
+ private JdbcConnections jdbcConnections;
+
public void EndTask(int types) {
String A01glassid1 = spianService.queGlassid("DB103.128", 14).toString();
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();
+ String D02glassid = spianService.queGlassid("DB103.58", 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);
+ }
+ log.info("stopfeedid:"+storageTask.getGlassId()+"D02id:"+D02glassid+"devicestate:"+DeviceList.get(1));
+ if (storageTask.getGlassId().equals(D02glassid) && DeviceList.get(1) == 0) {
+ ClearGlassId("DB101.9.3");
outSliceServive.StopTask(storageTask.getGlassId(), types);
}
}
@@ -51,35 +69,34 @@
} else {// 缁堟鍑虹墖浠诲姟
List<StorageTask> cageLists = homeMapper.SelectTaskByState(types);
List<StorageTask> cageList2 = homeMapper.SelectTaskByState(2);
- if (cageList2.size()>0) {
+ if (cageList2.size() > 0) {
cageLists.add(cageList2.get(0));
}
for (StorageTask cageList : cageLists) {
if (cageList.getTaskType().equals("1")) {
-
System.out.println(DeviceList.get(5));
- if(cageList.getGlassId().equals(A02glassid1)&&DeviceList.get(5)==0){
+ if (cageList.getGlassId().equals(A02glassid1) && DeviceList.get(5) == 0) {
outSliceServive.StopTask(cageList.getGlassId(), types);
ClearGlassId("DB101.10.1");
}
- if(cageList.getGlassId().equals(B01glassid)&&DeviceList.get(2)==0){
+ if (cageList.getGlassId().equals(B01glassid) && DeviceList.get(2) == 0) {
outSliceServive.StopTask(cageList.getGlassId(), types);
ClearGlassId("DB101.10.2");
}
- if(cageList.getGlassId().equals(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().equals(A02glassid1)&&DeviceList.get(5)==0){
+ } else if (cageList.getTaskType().equals("2")) {
+ if (cageList.getGlassId().equals(A02glassid1) && DeviceList.get(5) == 0) {
outSliceServive.StopTask(cageList.getGlassId(), 2);
ClearGlassId("DB101.10.1");
}
- if(cageList.getGlassId().equals(B01glassid)&&DeviceList.get(2)==0){
+ if (cageList.getGlassId().equals(B01glassid) && DeviceList.get(2) == 0) {
outSliceServive.StopTask(cageList.getGlassId(), 2);
ClearGlassId("DB101.10.2");
}
- if(cageList.getGlassId().equals(B02glassid)&&DeviceList.get(3)==0){
+ if (cageList.getGlassId().equals(B02glassid) && DeviceList.get(3) == 0) {
outSliceServive.StopTask(cageList.getGlassId(), 2);
ClearGlassId("DB101.10.3");
}
@@ -88,28 +105,29 @@
// List<StorageCage> storageCages = homeMapper.selectinout(3);
// for (StorageCage storageCage : storageCages) {
- // List<StorageCage> storageCagess = homeMapper.SelectStoragesGlassById(storageCage.getGlassId());
+ // List<StorageCage> storageCagess =
+ // homeMapper.SelectStoragesGlassById(storageCage.getGlassId());
- // for (StorageCage storageCagez : storageCagess) {
+ // for (StorageCage storageCagez : storageCagess) {
- // if (storageCagez.getState().equals("2")) {// 璋冩嫧杩涚墖
- // outSliceServive.StopTask(storageCagez.getGlassId(), 0);
- // } else {// 鍑虹墖
- // outSliceServive.StopTask(storageCagez.getGlassId(), types);
- // }
+ // 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);
- // }
- // }
+ // // 鍒ゆ柇鍑虹墖浠诲姟浣嶇疆骞舵竻闄ゅ搴旂幓鐠僫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);
+ // }
+ // }
// }
}
}
@@ -174,4 +192,53 @@
return Result.success(map);
}
+ public Result InsertQueueGlassId(Short id, Queue queue) throws SQLException {
+ Map<String, Object> map = new HashMap<>();
+
+ Short zhi = 200;
+ short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
+ if (result > 0) {
+ map.put("message", "500");
+ } else {
+ if (id == 1) {
+ // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
+ north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(queue.getglassId(), "", "");
+ zhi = spianService.selectAll(north_glass_buffer1);
+ if (zhi == 200) {
+ homeMapper.InsertQueueGlassId(queue, id);
+ }
+ }
+ map.put("message", zhi);
+ }
+ if (zhi != 200) {
+ Plchome.FeedState = true;
+ }
+ return Result.success(map);
+ }
+
+ public Short InsertQueueGlassIds(Short id, Queue queue) throws SQLException {
+ Map<String, Object> map = new HashMap<>();
+
+ Short zhi = 0;
+ short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
+ if (result > 0) {
+ zhi=500;
+ map.put("message", "500");
+ } else {
+ if (id == 1) {
+ // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
+ north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(queue.getglassId(), "", "");
+ zhi = spianService.selectAll(north_glass_buffer1);
+ if (zhi == 200) {
+ homeMapper.InsertQueueGlassId(queue, id);
+ }
+ }
+ map.put("message", zhi);
+ }
+ if (zhi != 200) {
+ Plchome.FeedState = true;
+ }
+ return zhi;
+ }
+
}
--
Gitblit v1.8.0