From c317cf8f8ceb017941d1c8cb98c4d5c115cec0ec Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 25 三月 2024 16:00: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 | 50 ++++++++++++++++++++------------------------------
1 files changed, 20 insertions(+), 30 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 65d9ed9..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
@@ -127,39 +127,29 @@
// String MesSend=S7control.getinstance().ReadWord("DB14.170", 1).get(0)+"";
//鑾峰彇娴嬮噺鐨勯暱锛屽
+ boolean istest = false;
+ String PlcRequest = "1";
+ String MesSend = "0";
+ double width = 402;
+ double height = 402;
-
- //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));
- // }
+ //鍖归厤
+ //System.err.println(PlcRequest+","+MesSend+","+width+","+height);
+ 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&&istest) {
+ // 娴嬮噺鎴愬姛
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
+ }else if(istest){
+ // 閲嶆柊娴嬮噺
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 4);
+ }
-
- // String PlcRequest = "1";
- // String MesSend = "0";
- // double width = 402;
- // double height = 402;
-
- // //鍖归厤
- // //System.err.println(PlcRequest+","+MesSend+","+width+","+height);
- // if ("0".equals(PlcRequest)) {
- // 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) {
- // // 娴嬮噺鎴愬姛
- // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
-
- // }else{
- // // 閲嶆柊娴嬮噺
- // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 4);
- // }
-
- // }
+ }
Queue LastQueue= QueueMapper.selectLastQueue();
// String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
// String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
--
Gitblit v1.8.0