From 8db5b45c853fe5e49f2bca9047ea63e739cb8d79 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 25 五月 2024 08:21:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java
index 863e95b..bd7cb05 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java
@@ -25,8 +25,8 @@
// }
//鍙戦�佸潗鏍囦俊鎭�
public void SendCoordinate(short glassX, short glassY) {
- s7control.WriteWord("DB100.10", glassX);
- s7control.WriteWord("DB100.10", glassY);
+ s7control.writeWord("DB100.10", glassX);
+ s7control.writeWord("DB100.10", glassY);
}
//鍒ゆ柇鏄惁鍙互鍙戦�佽繘鐐変俊鍙�
@@ -41,16 +41,16 @@
//鍙戦�佽繘鐐変俊鍙�
public void SendIntoGlass(short start) {
- s7control.WriteWord("DB100.10", start);
+ s7control.writeWord("DB100.10", start);
}
//鎺ュ彈瀹屾垚瀛楀洖澶嶇‘璁ゅ瓧
public void SendIntoGlass() {
- s7control.WriteWord("DB100.10", (short) 1);
+ s7control.writeWord("DB100.10", (short) 1);
}
//鏄剧ず绛夊緟涓殑鐗堝浘
- public List<TemperingGlassInfo> selectWaitingGlass() {
+ public List<TemperingGlassInfo> SelectWaitingGlass() {
List<TemperingGlassInfo> WaitingGlass = temperingMapper.SelectWaitingGlass();
return WaitingGlass;
}
--
Gitblit v1.8.0