From ad28331c1e3ed456b72765874b41b83b49dc279f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 18 四月 2024 14:44:11 +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 | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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..f122d7d 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
@@ -34,26 +34,29 @@
int tempering = temperingMapper.SelectTempering(glassid);
if (tempering == 1) {
return 1;
- }
- else {
+ } else {
return 0;
}
}
+
//鍙戦�佽繘鐐変俊鍙�
- public void SendIntoGlass (short 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