From 18f6e14f2cb0e19fc8726e9821bc4db172a04d17 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 24 四月 2024 16:32:54 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java | 81 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java
new file mode 100644
index 0000000..56b0c56
--- /dev/null
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java
@@ -0,0 +1,81 @@
+package com.mes.common;
+
+import cn.hutool.json.JSONObject;
+
+import com.mes.device.PlcParameterObject;
+import com.mes.downglassinfo.entity.DownGlassTask;
+import com.mes.downglassinfo.service.DownGlassTaskService;
+import com.mes.downstorage.entity.DownStorageCageDetails;
+import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
+import com.mes.downstorage.service.DownStorageCageService;
+import com.mes.downworkstation.service.DownWorkstationService;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.tools.WebSocketServer;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+@Slf4j
+public class Plcdownglass extends Thread {
+
+ public static final String RESULT_IN = "1";
+ public static final String RESULT_OUT = "2";
+ public static final String RESULT_IN_OUT = "3";
+
+ @Autowired
+ private DownStorageCageService downStorageCageService;
+ @Autowired
+ private DownWorkstationService downWorkstationService;
+
+// private final Supplier<DownWorkstationService> plcServiceSupplier;
+//
+// public Plcdownglass() {
+// this.plcServiceSupplier = () -> WebSocketServer.applicationContext.getBean(DownWorkstationService.class);
+// }
+
+
+
+ @Override
+ public void run() {
+ while (this != null) {
+ JSONObject jsonObject = new JSONObject();
+ try {
+ Thread.sleep(100);
+ downWorkstationService = WebSocketServer.applicationContext.getBean(DownWorkstationService.class);
+ downStorageCageService = WebSocketServer.applicationContext.getBean(DownStorageCageService.class);
+ // String result = S7control.getinstance().ReadWord("DB14.0", 1).get(0) + "";
+// String number = S7control.getinstance().ReadWord("DB14.2", 1).get(0) + "";
+ String result ="1";
+ String number ="1";
+ // 杩涚墖璇锋眰
+ if (RESULT_IN.equals(result)) {
+ downStorageCageService.processInto(number);
+ }
+ // 鍑虹墖璇锋眰
+ else if (RESULT_OUT.equals(result)) {
+ downStorageCageService.processOut();
+ }
+ // 杩涘嚭鐗囪姹�
+ else if (RESULT_IN_OUT.equals(result)) {
+ // 鍏堝嚭鍚庤繘
+ if (!downStorageCageService.processOut()) {
+ downStorageCageService.processInto(number);
+ }
+ }
+
+
+ downWorkstationService.insertdownglassinfo();
+
+
+
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0