From f39fd71eedfd828e715d33356a8c38ffbe66eb1a Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 24 五月 2024 15:28:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 bac2fa6..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);
}
//鍒ゆ柇鏄惁鍙互鍙戦�佽繘鐐変俊鍙�
@@ -34,26 +34,29 @@
int tempering = temperingMapper.SelectTempering(glassid);
if (tempering == 1) {
return 1;
- }
- else {
+ } else {
return 0;
}
}
+
//鍙戦�佽繘鐐変俊鍙�
- public void SendIntoGlass (short start) {
- s7control.WriteWord("DB100.10", start);
+ public void SendIntoGlass(short start) {
+ s7control.writeWord("DB100.10", start);
}
+
//鎺ュ彈瀹屾垚瀛楀洖澶嶇‘璁ゅ瓧
- public void SendIntoGlass () {
- s7control.WriteWord("DB100.10", (short)1);
+ public void SendIntoGlass() {
+ s7control.writeWord("DB100.10", (short) 1);
}
+
//鏄剧ず绛夊緟涓殑鐗堝浘
- public List <TemperingGlassInfo> SelectWaitingGlass () {
+ public List<TemperingGlassInfo> SelectWaitingGlass() {
List<TemperingGlassInfo> WaitingGlass = temperingMapper.SelectWaitingGlass();
return WaitingGlass;
}
+
//鏄剧ず姝ｅ湪杩涚倝鐨勭増鍥�
- public List<TemperingGlassInfo> SelectIntoGlass () {
+ public List<TemperingGlassInfo> SelectIntoGlass() {
List<TemperingGlassInfo> IntoGlass = temperingMapper.SelectInGlass();
return IntoGlass;
}
--
Gitblit v1.8.0