From ea073afc6b4bc758990ac60f5e33254d1143272c Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期二, 26 三月 2024 13:58:03 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java b/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
new file mode 100644
index 0000000..c990244
--- /dev/null
+++ b/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
@@ -0,0 +1,40 @@
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.example.springboot.component.PLCAutoMes;
+import com.example.springboot.component.S7control;
+import com.example.springboot.entity.device.PlcParameterObject;
+import com.google.common.primitives.Bytes;
+import com.mes.entity.GlassInfo;
+import com.mes.entity.UpWorkstation;
+import com.mes.mapper.LoadGlassMapper;
+import com.mes.mapper.TemperingMapper;
+
+@Service
+public class LoadGlassService {
+    @Autowired
+    private com.mes.common.PlcTools.S7control s7control;
+    private LoadGlassMapper LoadGlassMapper;
+    //鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅
+    public GlassInfo selectAll() {
+        GlassInfo glassInfo = LoadGlassMapper.SelectALL();
+        return glassInfo;
+    }
+    //澧炲姞浜哄伐杈撳叆鐨勫伐浣嶇幓鐠冧俊鎭�
+    public void insertGlass(UpWorkstation upwork) {
+        LoadGlassMapper.insertGlass(upwork.Getpatternwidth(),upwork.getPatternheigth(),upwork.getPatternthickness(),1);
+    }  
+    //鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
+    public void deleteGlass(String id) {
+        LoadGlassMapper.deleteGlass(id);
+    }
+    //鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
+    public boolean isCanLoadGlass() {
+        boolean result=s7control.WriteWord("100.10", 1);
+        return result;
+    }
+
+
+}

--
Gitblit v1.8.0