From 92c1cf60b4b804b97b54876b5140132a16765333 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 25 三月 2024 08:09:11 +0800
Subject: [PATCH] 测试更新
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
index 17fbf5a..c0fa68e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
@@ -1,25 +1,17 @@
package com.example.springboot.component;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
-import com.example.springboot.service.JdbcConnections;
import com.example.springboot.service.SpianServiceNew;
-import com.example.springboot.entity.north_glass_buffer1;
+import com.example.springboot.service.StorageCageService;
import com.example.springboot.entity.device.PlcParameterObject;
-import com.example.springboot.mapper.AlarmMapper;
import com.example.springboot.mapper.AlbaniaMapper;
-import com.example.springboot.mapper.SpianMapper;
public class PlcHoldNew extends Thread {
- private AlarmMapper alarmMapper;
@Autowired
- private JdbcConnections jdbcConnections;
private AlbaniaMapper albaniaMapper;
private SpianServiceNew spianService;
+ private StorageCageService storageCageService;
int aaa;
@Override
@@ -33,14 +25,15 @@
// \\ TODO Auto-generated catch block
e.printStackTrace();
}
-
+
+ //S7control.getinstance().ReadWord("DB14.0", 1);
// if (S7control.getinstance().CheckConnected() == false) {
spianService = WebSocketServer.applicationContext.getBean(SpianServiceNew.class);
albaniaMapper = WebSocketServer.applicationContext.getBean(AlbaniaMapper.class);
spianService.selectAll(albaniaMapper.SelectGlass());
//璇诲彇DB14鍖烘枃浠�
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
-
+
String ExportTOMES1=plcmes.getPlcParameter("ExportTOMES1").getValue();//鍑虹墖璇锋眰涓�绾�
String ExportToMES2=plcmes.getPlcParameter("ExportToMES2").getValue();//鍑虹墖璇锋眰浜岀嚎
@@ -75,13 +68,14 @@
//瀹屾垚纭瀛�
for(int i=1;i<7;i++){
- String Tastover=plcmes.getPlcParameter("IDStatus"+i).getValue();//渚濇鑾峰彇浠诲姟绫诲瀷
- String Glassid=plcmes.getPlcParameter("MESID"+i).getValue();//渚濇鑾峰彇浠诲姟绫诲瀷
- if(Tastover.equals("1")){
-
+ String Glassid=plcmes.getPlcParameter("MESID"+i).getValue();//渚濇鑾峰彇浠诲姟ID
+ int tastid=albaniaMapper.SelectTaskId(Glassid.substring(0,14));
//璋冪敤瀹屾垚浠诲姟 Glassid
+ storageCageService.FinishTask(tastid);
+ //鍒犻櫎queue琛ㄧ殑鏁版嵁
+ albaniaMapper.DeleteQueue(Glassid.substring(0,14));
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCStatus"+i).getAddress(), (short) 1);//瀹屾垚纭瀛�
- }
+
}
}
--
Gitblit v1.8.0