From 5ea3b39452ccaae4dac4a45479a741b12970a96f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 11 四月 2024 13:49: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 |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 56 insertions(+), 0 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
new file mode 100644
index 0000000..e4b89aa
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java
@@ -0,0 +1,56 @@
+package com.mes.temperingglass.service;
+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 org.springframework.stereotype.Service;
+
+@Service
+public class TemperingService {
+   
+    private final TemperingMapper temperingMapper;
+    private S7control s7control;
+
+    public TemperingService(TemperingMapper temperingMapper) {
+        this.temperingMapper =temperingMapper;
+    }
+    //鎺ユ敹id杩斿洖鍧愭爣鍜屾暟鎹�
+    public GlassInfo SelectOutGlass (String glassid) {
+        GlassInfo GlassInfo = temperingMapper.SelectGlass(glassid);
+        return GlassInfo;
+    }
+    //鍙戦�佸潗鏍囦俊鎭�
+    public void SendCoordinate (short glassX,short glassY) {
+        s7control.WriteWord("DB100.10", glassX);
+        s7control.WriteWord("DB100.10", glassY);
+    }
+    //鍒ゆ柇鏄惁鍙互鍙戦�佽繘鐐変俊鍙�
+    public int SelectTempering (String glassid) {
+        int tempering = temperingMapper.SelectTempering(glassid);
+        if (tempering == 1) {
+            return 1;
+        }
+        else {
+            return 0;
+        }
+    }
+    //鍙戦�佽繘鐐変俊鍙�
+    public void SendIntoGlass (short start) {
+        s7control.WriteWord("DB100.10", start);
+    }
+    //鎺ュ彈瀹屾垚瀛楀洖澶嶇‘璁ゅ瓧
+    public void SendIntoGlass () {
+        s7control.WriteWord("DB100.10", (short)1);
+    }
+    //鏄剧ず绛夊緟涓殑鐗堝浘
+    public List <TemperingGlassInfo> SelectWaitingGlass () {
+        List<TemperingGlassInfo> WaitingGlass = temperingMapper.SelectWaitingGlass();
+        return WaitingGlass;
+    }
+    //鏄剧ず姝e湪杩涚倝鐨勭増鍥�
+    public List<TemperingGlassInfo> SelectIntoGlass () {
+        List<TemperingGlassInfo> IntoGlass = temperingMapper.SelectInGlass();
+        return IntoGlass;
+    }
+}

--
Gitblit v1.8.0