From 202ca0f62257d108e95ca2e5912b86cf7b407906 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 25 三月 2024 08:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java | 60 +++++++++++++++++++++++++++++++++---------------------------
1 files changed, 33 insertions(+), 27 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 c0fa68e..886fb12 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,17 +1,25 @@
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.service.StorageCageService;
+import com.example.springboot.entity.north_glass_buffer1;
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
@@ -25,16 +33,14 @@
// \\ 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());
+ //spianService.selectAll(albaniaMapper.SelectGlass());
//璇诲彇DB14鍖烘枃浠�
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
-
+
String ExportTOMES1=plcmes.getPlcParameter("ExportTOMES1").getValue();//鍑虹墖璇锋眰涓�绾�
String ExportToMES2=plcmes.getPlcParameter("ExportToMES2").getValue();//鍑虹墖璇锋眰浜岀嚎
String PLCToMES=plcmes.getPlcParameter("PLCToMES").getValue();//杩涚墖璇锋眰
@@ -43,42 +49,42 @@
//涓�鍙风嚎璇锋眰
- if (ExportTOMES1.equals("1") == true&&B01State.equals("0")==true) {
- //灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
- spianService.selectout(1);
- }
- //浜岀嚎鍙疯姹傛椂
- if (ExportToMES2.equals("1") == true&&B01State.equals("0")==true) {
- //灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
- spianService.selectout(2);
- }
+ // if (ExportTOMES1.equals("1") == true&&B01State.equals("0")==true) {
+ // //灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
+ // S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
+ // spianService.selectout(1);
+ // }
+ // //浜岀嚎鍙疯姹傛椂
+ // if (ExportToMES2.equals("1") == true&&B01State.equals("0")==true) {
+ // //灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
+ // S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
+ // spianService.selectout(2);
+ // }
//杩涚墖璇锋眰鏃�
+ if(PLCToMES!=null && B01State!=null){
if(PLCToMES.equals("1")==true&&B01State.equals("0")==true){
//灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
+ //S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
spianService.selectAll(albaniaMapper.SelectGlass());
}
-
+
//浠诲姟瀹屾垚鏃�
if(TastState.equals("1")==true){
//瀹屾垚纭瀛�
for(int i=1;i<7;i++){
- String Glassid=plcmes.getPlcParameter("MESID"+i).getValue();//渚濇鑾峰彇浠诲姟ID
- int tastid=albaniaMapper.SelectTaskId(Glassid.substring(0,14));
+ String Tastover=plcmes.getPlcParameter("IDStatus"+i).getValue();//渚濇鑾峰彇浠诲姟绫诲瀷
+ String Glassid=plcmes.getPlcParameter("MESID"+i).getValue();//渚濇鑾峰彇浠诲姟绫诲瀷
+ if(Tastover.equals("1")){
+
//璋冪敤瀹屾垚浠诲姟 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