From a3a40ee1800c25e280945e5ecbff7fed4b4cde2c Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期一, 15 四月 2024 09:08:12 +0800
Subject: [PATCH] 接口

---
 LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java |   76 +++++++++++++++++++++++++++----------
 1 files changed, 55 insertions(+), 21 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..95514e3 100644
--- a/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
+++ b/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
@@ -1,31 +1,65 @@
-package com.example.springboot.service;
-
-
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
+package com.mes.service;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.mes.entity.device.PLCAutoMes;
+import com.mes.common.PlcTools.S7control;
+import com.mes.entity.device.PlcParameterObject;
 
-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.UpWorkstation;
+import com.mes.mapper.LoadGlassMapper;
 
 @Service
 public class LoadGlassService {
-    @Autowired
-  
-
-    public Short selectAll(String glassid) {
-
-        
-
+    
+    private S7control s7control;
+    private LoadGlassMapper LoadGlassMapper;
+    PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
+    //鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅
+    public List<UpWorkstation> selectAll() {
+        List<UpWorkstation> glassInfo= LoadGlassMapper.selectALL();
+        return glassInfo;
     }
+    //澧炲姞浜哄伐杈撳叆鐨勫伐浣嶇幓鐠冧俊鎭�
+    public void insertGlass(UpWorkstation upwork) { 
+        LoadGlassMapper.insertGlass(upwork);
+    }  
+    //鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
+    public void deleteGlass(int id) {
+        LoadGlassMapper.deleteGlass(id);
+    }
+    //鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
+    public boolean isCanLoadGlass() {
+        String loadstate=plcmes.getPlcParameter("鍚哥墖淇″彿").getValue();
+        if(loadstate.equals("1")) {
+            return true;
+        }else{
+            return false;
+        }
+        
+    }
+    //鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
+    public void selectPriority() {
+        int loadid1=LoadGlassMapper.selectPriority(1);
+        int loadid2=LoadGlassMapper.selectPriority(2);
+        //鍒ゆ柇涓�浜屽彿宸ヤ綅鍝竟鐨勯『搴忔洿鍏�
+        if(loadid1>loadid2) {
+            s7control.WriteWord("DB100.10", (short)2);
+        }else if(loadid1==loadid2){
+            //褰撲袱涓伐浣嶄笂鐨勭幓鐠冩暟鐩稿悓鏃讹紝鍒ゆ柇鍝釜宸ヤ綅涓婄殑鐜荤拑鏁版洿灏�,浼樺厛娓呯┖涓�涓灦瀛�
+            int glassnum1=Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
+            int glassnum2=Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
+            if(glassnum1>glassnum2){
+                s7control.WriteWord("DB100.10", (short)2);
+            }else{
+                s7control.WriteWord("DB100.10", (short)1);
+            }
+        }else{
+            s7control.WriteWord("DB100.10", (short)1);
+        }
+    }
+   
+
+
 
 
 }

--
Gitblit v1.8.0