From cb4da9b55edfdda5beacca036b99130b33b9449b Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 08 四月 2024 10:58:24 +0800
Subject: [PATCH] 代码更新
---
LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java | 62 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 17 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..2a28e51 100644
--- a/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
+++ b/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
@@ -1,31 +1,59 @@
-package com.example.springboot.service;
-
-
+package com.mes.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.mes.entity.device.PLCAutoMes;
+import com.mes.common.PlcTools.S7control;
+import com.mes.entity.device.PlcParameterObject;
import com.google.common.primitives.Bytes;
-
+import com.mes.entity.GlassInfo;
+import com.mes.entity.UpWorkstation;
+import com.mes.mapper.LoadGlassMapper;
@Service
public class LoadGlassService {
@Autowired
-
-
- public Short selectAll(String glassid) {
-
-
-
+ private com.mes.common.PlcTools.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.getPatternwidth(),upwork.getPatternheigth(),upwork.getPatternthickness(),1);
+ }
+ //鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
+ 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 int selectPriority() {
+ int loadid1=LoadGlassMapper.SelectPriority(1);
+ int loadid2=LoadGlassMapper.SelectPriority(2);
+ if(loadid1>loadid2) {
+ return 1;
+ }else{
+ return 2;
+ }
+ }
+
+
+
}
--
Gitblit v1.8.0