From e208aa1ef8e861dba168e8d83ab3066fc9f1e02d Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 16 四月 2024 13:30:45 +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 | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 e4b89aa..bac2fa6 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
@@ -1,32 +1,36 @@
package com.mes.temperingglass.service;
-import com.mes.temperingglass.entity.GlassInfo;
+//import com.mes.temperingglass.entity.GlassInfo;
+
import com.mes.temperingglass.entity.TemperingGlassInfo;
-import com.mes.tools.S7control;
import com.mes.temperingglass.mapper.TemperingMapper;
-import java.util.List;
+import com.mes.tools.S7control;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service
public class TemperingService {
-
+
private final TemperingMapper temperingMapper;
private S7control s7control;
public TemperingService(TemperingMapper temperingMapper) {
- this.temperingMapper =temperingMapper;
+ this.temperingMapper = temperingMapper;
}
- //鎺ユ敹id杩斿洖鍧愭爣鍜屾暟鎹�
- public GlassInfo SelectOutGlass (String glassid) {
- GlassInfo GlassInfo = temperingMapper.SelectGlass(glassid);
- return GlassInfo;
- }
+
+ // //鎺ユ敹id杩斿洖鍧愭爣鍜屾暟鎹�
+// public GlassInfo SelectOutGlass (String glassid) {
+// GlassInfo GlassInfo = temperingMapper.SelectGlass(glassid);
+// return GlassInfo;
+// }
//鍙戦�佸潗鏍囦俊鎭�
- public void SendCoordinate (short glassX,short glassY) {
+ public void SendCoordinate(short glassX, short glassY) {
s7control.WriteWord("DB100.10", glassX);
s7control.WriteWord("DB100.10", glassY);
}
+
//鍒ゆ柇鏄惁鍙互鍙戦�佽繘鐐変俊鍙�
- public int SelectTempering (String glassid) {
+ public int SelectTempering(String glassid) {
int tempering = temperingMapper.SelectTempering(glassid);
if (tempering == 1) {
return 1;
--
Gitblit v1.8.0