From 04cb9dbbffffa5464c229dac8de63195fb70760a Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 01 四月 2024 09:48:53 +0800
Subject: [PATCH] 删除不必要文件

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

diff --git a/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java b/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
index f827088..df1f793 100644
--- a/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
+++ b/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
@@ -1,31 +1,42 @@
-package com.example.springboot.service;
-
-
 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.StorageCage;
-import com.example.springboot.entity.north_glass_buffer1;
 import com.example.springboot.entity.device.PlcParameterObject;
-import com.example.springboot.mapper.SpianMapper;
 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
-  
-
-    public Short selectAll(String glassid) {
-
-        
-
+    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