From 0321d9947724d726f4829a8f44f766c220917887 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 09 四月 2024 11:47:47 +0800
Subject: [PATCH] 代码更新
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java | 48 ++++++++++++++++++++----------------------------
1 files changed, 20 insertions(+), 28 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 5cc729d..28a0b49 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
@@ -4,13 +4,12 @@
import com.example.springboot.service.StorageCageService;
import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.device.PlcParameterObject;
-import com.example.springboot.mapper.AlarmMapper;
import com.example.springboot.mapper.AlbaniaMapper;
public class PlcHoldNew extends Thread {
- private AlarmMapper alarmMapper;
+
@Autowired
private AlbaniaMapper albaniaMapper;
@@ -24,9 +23,8 @@
while (this != null) {
try {
- Thread.sleep(100);
+ Thread.sleep(500);
} catch (InterruptedException e) {
- // \\ TODO Auto-generated catch block
e.printStackTrace();
}
@@ -39,35 +37,36 @@
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
if(plcmes.getPlcParameter("PLCToMES").getValue()!=null){
- // spianService.Mestast("1234567890123",40,0,2,"MESID1");
- // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short)2);//鍑虹墖浠诲姟鍚姩
+ //spianService.Mestast("NG0001-1",1,4,1,"MESID1",1);
+
+
String ExportTOMES1=plcmes.getPlcParameter("ExportTOMES1").getValue();//鍑虹墖璇锋眰涓�绾�
String ExportToMES2=plcmes.getPlcParameter("ExportToMES2").getValue();//鍑虹墖璇锋眰浜岀嚎
String PLCToMES=plcmes.getPlcParameter("PLCToMES").getValue();//杩愰�佽溅璇锋眰
- //String B01State=plcmes.getPlcParameter("B01State").getValue();//杩愰�佽溅璇锋眰
String IDStatus1=plcmes.getPlcParameter("IDStatus1").getValue();//1鍙蜂换鍔″畬鎴�
String MESToPLCStatus1=plcmes.getPlcParameter("MESToPLCStatus1").getValue();//1鍙风‘璁ゅ瓧
+ String MESToPLC=plcmes.getPlcParameter("MESToPLC").getValue();//鍙戦�佷换鍔″瓧
//涓�鍙风嚎璇锋眰
- if(ExportTOMES1!=null){
- if (ExportTOMES1.equals("1") == true&&PLCToMES.equals("1")==true) {
+ if(ExportTOMES1!=null&&MESToPLC!=null){
+ if (ExportTOMES1.equals("1") == true&&MESToPLC.equals("0")==true) {
//灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
spianService.selectout(1);
}
}
// //浜岀嚎鍙疯姹傛椂
- if(ExportToMES2!=null ){
- if (ExportToMES2.equals("1") == true&&PLCToMES.equals("1")==true) {
+ if(ExportToMES2!=null &&MESToPLC!=null){
+ if (ExportToMES2.equals("1") == true&&MESToPLC.equals("0")==true) {
//灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
+
spianService.selectout(2);
}
}
//杩涚墖璇锋眰鏃�
GlassInfo glass=albaniaMapper.SelectGlass();
- if(PLCToMES!=null && glass!=null){
- if(PLCToMES.equals("1")==true&&glass!=null){
+ if(PLCToMES!=null && glass!=null&&MESToPLC!=null){
+ if(PLCToMES.equals("1")==true&&MESToPLC.equals("0")==true){
spianService.selectAll(glass);
}
}
@@ -80,22 +79,18 @@
String Tastover=plcmes.getPlcParameter("IDStatus"+i).getValue();//PLC鐞嗙墖浠诲姟鐘舵�佹眹鎶�
String Glassid=plcmes.getPlcParameter("MESID"+i).getValueString();//MES鐜荤拑ID
-
- GlassInfo id=albaniaMapper.SelectTaskId(Glassid);
- if(Tastover.equals("1")){
- if(id!=null){
+ GlassInfo id=albaniaMapper.SelectTaskId(Glassid);
+ if(id!=null&&Tastover.equals("1")){
//璋冪敤瀹屾垚浠诲姟 Glassid
storageCageService.FinishTask(id.getId());
- }
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short) 0);//娓呴櫎浠诲姟瀛�
+ }
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCStatus"+i).getAddress(), (short) 1);//瀹屾垚纭瀛�
-
}
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short) 0);//娓呴櫎浠诲姟鍙戦�佸瓧
+ }
-
-
- }
- }
+
+
//姹囨姤鍙栨秷鏃�
if(IDStatus1.equals("0")==true &&MESToPLCStatus1.equals("1")){
@@ -103,10 +98,7 @@
for(int i=1;i<7;i++){
String Tastover=plcmes.getPlcParameter("IDStatus"+i).getValue();//渚濇鑾峰彇浠诲姟姹囨姤
if(Tastover.equals("0")){
- //S7control.getinstance().WriteWord(plcmes.getPlcParameter("IDStatus"+i).getAddress(), (short) 0);//娓呴櫎纭瀛�
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCStatus"+i).getAddress(), (short) 0);//娓呴櫎纭瀛�
- // System.out.println(plcmes.getPlcParameter("MESToPLCStatus1").getValue());
- // System.out.println(S7control.getinstance().ReadWord("DB14.158", 1));
}
}
}
--
Gitblit v1.8.0