From e76f203f76b934d2f49dcea89649b2f616878056 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 18 三月 2024 12:36:22 +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 | 32 +++++++-------------------------
1 files changed, 7 insertions(+), 25 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 dcf9ce1..684d234 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
@@ -140,32 +140,14 @@
- // String PlcRequest = "1";
- // double width = 0;
- // double height = 0;
+ String PlcRequest = "1";
+ double width = 402;
+ double height = 402;
- // //鑾峰彇鍖归厤璁剧疆
- // if ("1".equals(PlcRequest)) {
- // List<GlassInfo> Result=HomeService.NormalGlassInfo(width, height, "1");
- // if(Result.size()==1){
- // //鍖归厤鎴愬姛 灏变竴绉嶇被鍨� 娣诲姞鏁版嵁
- // GlassInfo GlassInfo=Result.get(0);
- // QueueMapper.insert(GlassInfo.getGlassid(),width,height,1);
- // System.out.println("鍖归厤鎴愬姛");
- // //S7control.getinstance().WriteWord(plcmes.getPlcParameter("GaToMES").getAddress(), (short) 1);
- // System.out.println(GlassInfo.getGlassid());
- // }else if(Result.size()>1){
- // //鍖归厤澶辫触 鍖归厤鍒板鏉＄鍚堢殑鏁版嵁 娣诲姞鏁版嵁
- // QueueMapper.insert(null,width,height,2);
- // System.out.println("鍖归厤澶辫触");
- // }
- // else{
- // //鍖归厤澶辫触 鏈壘鍒扮鍚堢殑鏁版嵁 娣诲姞鏁版嵁
- // QueueMapper.insert(null,width,height,3);
- // System.out.println("鏈壘鍒扮鍚堢殑鏁版嵁");
- // }
-
- // }
+ //鍖归厤
+ if ("1".equals(PlcRequest)) {
+ boolean Result=HomeService.Normal(width, height, "1");
+ }
// String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
// String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
--
Gitblit v1.8.0