From 328f9b1f7a046378ef5d8f2b8337770fff372cc7 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期六, 26 十月 2024 19:12:07 +0800
Subject: [PATCH] 更新测试后代码
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 a716c1e..ecee1cc 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
@@ -47,34 +47,40 @@
String IDStatus1=plcmes.getPlcParameter("IDStatus1").getValue();//1鍙蜂换鍔″畬鎴�
String MESToPLCStatus1=plcmes.getPlcParameter("MESToPLCStatus1").getValue();//1鍙风‘璁ゅ瓧
String MESToPLC=plcmes.getPlcParameter("MESToPLC").getValue();//鍙戦�佷换鍔″瓧
+ // String scan=plcmes.getPlcParameter("scan").getValue();//鍙戦�佹壂鐮佷俊鎭�
+ // if(scan.equals("1")==true){
+ // spianService.scan(scan);
+ // }
//涓�鍙风嚎璇锋眰
+
if(ExportTOMES1!=null&&MESToPLC!=null){
if (ExportTOMES1.equals("1") == true&&MESToPLC.equals("0")==true) {
+
spianService.selectout(1);
}
}
// //浜岀嚎鍙疯姹傛椂
- if(ExportToMES2!=null &&MESToPLC!=null){
- if (ExportToMES2.equals("1") == true&&MESToPLC.equals("0")==true) {
- spianService.selectout(2);
- }
- }
+ // if(ExportToMES2!=null &&MESToPLC!=null){
+ // if (ExportToMES2.equals("1") == true&&MESToPLC.equals("0")==true) {
+ // spianService.selectout(2);
+ // }
+ // }
//杩涚墖璇锋眰鏃�
GlassInfo glass=albaniaMapper.SelectGlass();
if(PLCToMES!=null && glass!=null&&MESToPLC!=null){
if(PLCToMES.equals("1")==true&&MESToPLC.equals("0")==true){
+
spianService.selectAll(glass);
}
}
-
+ // System.out.println("IDStatus1:"+IDStatus1+"MESToPLCStatus1:"+MESToPLCStatus1);
//浠诲姟瀹屾垚鏃�
if(IDStatus1.equals("1")==true && MESToPLCStatus1.equals("0")==true){
//瀹屾垚纭瀛�
for(int i=1;i<7;i++){
-
String Tastover=plcmes.getPlcParameter("IDStatus"+i).getValue();//PLC鐞嗙墖浠诲姟鐘舵�佹眹鎶�
String Glassid=plcmes.getPlcParameter("MESID"+i).getValueString();//MES鐜荤拑ID
GlassInfo id=albaniaMapper.SelectTaskId(Glassid);
@@ -83,8 +89,12 @@
storageCageService.FinishTask(id.getId());
}
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCStatus"+i).getAddress(), (short) 1);//瀹屾垚纭瀛�
+ System.out.println("瀹屾垚纭瀛桵ESToPLCStatus");
+
}
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short) 0);//娓呴櫎浠诲姟鍙戦�佸瓧
+ System.out.println("娓呴櫎浠诲姟鍙戦�佸瓧MESToPLC");
+
}
@@ -97,6 +107,7 @@
String Tastover=plcmes.getPlcParameter("IDStatus"+i).getValue();//渚濇鑾峰彇浠诲姟姹囨姤
if(Tastover.equals("0")){
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCStatus"+i).getAddress(), (short) 0);//娓呴櫎纭瀛�
+ System.out.println("娓呴櫎纭瀛桵ESToPLCStatus");
}
}
}
--
Gitblit v1.8.0