From eaa749c5939632dd1aa7aa9440570886e29e6a63 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 26 三月 2024 15:32:42 +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/Plchome.java | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index c0a1c85..592c4b3 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -121,40 +121,30 @@
// double width=Double.valueOf(plcmes.getPlcParameter("Height").getValue());//瀹�
// double height=Double.valueOf(plcmes.getPlcParameter("width").getValue());//楂�
- String PlcRequest=S7control.getinstance().ReadWord("DB14.26", 1).get(0)+"";
- double width=Double.parseDouble(S7control.getinstance().ReadWord("DB14.28", 1).get(0)+"");
- double height=Double.parseDouble(S7control.getinstance().ReadWord("DB14.30", 1).get(0)+"");
- String MesSend=S7control.getinstance().ReadWord("DB14.170", 1).get(0)+"";
+ // String PlcRequest=S7control.getinstance().ReadWord("DB14.26", 1).get(0)+"";
+ // double width=Double.parseDouble(S7control.getinstance().ReadWord("DB14.28", 1).get(0)+"");
+ // double height=Double.parseDouble(S7control.getinstance().ReadWord("DB14.30", 1).get(0)+"");
+ // String MesSend=S7control.getinstance().ReadWord("DB14.170", 1).get(0)+"";
//鑾峰彇娴嬮噺鐨勯暱锛屽
-
-
- //String url="C:\\Users\\SNG-ZDH-012\\Desktop\\闃垮皵宸村凹浜氭暟鎹姹�.xlsx";E:\
- //String url="E:\\闃垮皵宸村凹浜氭暟鎹姹�.xlsx";
- // List result= HomeService.ReadExecl(url);
- // for(int i=0;i<result.size();i++){
- // System.out.println(result.get(i));
- // }
-
-
-
- // String PlcRequest = "1";
- // String MesSend = "0";
- // double width = 402;
- // double height = 402;
+ boolean istest = false;
+ String PlcRequest = "1";
+ String MesSend = "0";
+ double width = 402;
+ double height = 402;
//鍖归厤
//System.err.println(PlcRequest+","+MesSend+","+width+","+height);
- if ("0".equals(PlcRequest)) {
+ if ("0".equals(PlcRequest)&&istest) {
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 0);
}
if ("1".equals(PlcRequest)&&"0".equals(MesSend)) {
boolean is=HomeService.Normal(width, height, "1");
- if (is) {
+ if (is&&istest) {
// 娴嬮噺鎴愬姛
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
- }else{
+ }else if(istest){
// 閲嶆柊娴嬮噺
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 4);
}
--
Gitblit v1.8.0