From 7a23bac143166768c577411d68b256fdf85c8bb5 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 27 五月 2024 14:43:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingOverService.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingOverService.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingOverService.java
index f6d45f3..387d325 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingOverService.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingOverService.java
@@ -1,30 +1,36 @@
package com.mes.temperingglass.service;
+
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.mapper.TemperingMapper;
-import java.util.List;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service
public class TemperingOverService {
-private final TemperingMapper temperingMapper;
- //PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
+ private final TemperingMapper temperingMapper;
+
+ //PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
public TemperingOverService(TemperingMapper temperingMapper) {
this.temperingMapper = temperingMapper;
}
+
//鎺ユ敹鍑虹倝淇″彿鍜岀倝鍙�
- public String SelectOutSignal () {
-
+ public String SelectOutSignal() {
+
//S7control.getinstance().WriteWord("鍑虹倝淇″彿", (short)1);
return "GlassInfo";
}
+
//鍙戦�佺‘璁ゆ敹鍒颁俊鍙�
- public void OverSignal () {
+ public void OverSignal() {
//S7control.getinstance().WriteWord("纭瀛�", (short)1);
}
+
//鏄剧ず閽㈠寲鍑虹倝鍚庣殑鐗堝浘淇℃伅
- public List <TemperingGlassInfo> SelectOutGlass () {
+ public List<TemperingGlassInfo> SelectOutGlass() {
return temperingMapper.SelectOutGlass();
}
-
+
}
--
Gitblit v1.8.0