From 95db3e96a9465f137fdf16540e0c5985752894c2 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 09 四月 2024 14:27:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
TemperingGlassModule/src/main/java/com/mes/service/TemperingService.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/TemperingGlassModule/src/main/java/com/mes/service/TemperingService.java b/TemperingGlassModule/src/main/java/com/mes/service/TemperingService.java
index bdfd258..362d417 100644
--- a/TemperingGlassModule/src/main/java/com/mes/service/TemperingService.java
+++ b/TemperingGlassModule/src/main/java/com/mes/service/TemperingService.java
@@ -1,12 +1,10 @@
package com.mes.service;
-
import com.baomidou.dynamic.datasource.annotation.DS;
import com.mes.common.PlcTools.S7control;
import com.mes.entity.GlassInfo;
-import com.mes.entity.userInfo.SysError;
+import com.mes.entity.Tempering;
import com.mes.mapper.TemperingMapper;
-import com.mes.mapper.userInfo.SysErrorMapper;
-import org.springframework.beans.factory.annotation.Autowired;
+import java.util.List;
import org.springframework.stereotype.Service;
@Service
@@ -21,7 +19,7 @@
}
//鎺ユ敹id杩斿洖鍧愭爣鍜屾暟鎹�
public GlassInfo SelectOutGlass (String glassid) {
- GlassInfo GlassInfo = temperingMapper.SelectOutGlass(glassid);
+ GlassInfo GlassInfo = temperingMapper.SelectGlass(glassid);
return GlassInfo;
}
//鍙戦�佸潗鏍囦俊鎭�
@@ -38,15 +36,23 @@
else {
return 0;
}
-
}
//鍙戦�佽繘鐐変俊鍙�
public void SendIntoGlass (short start) {
s7control.WriteWord("DB100.10", start);
}
//鎺ュ彈瀹屾垚瀛楀洖澶嶇‘璁ゅ瓧
-
public void SendIntoGlass () {
s7control.WriteWord("DB100.10", (short)1);
}
+ //鏄剧ず绛夊緟涓殑鐗堝浘
+ public List <Tempering> SelectWaitingGlass () {
+ List<Tempering> WaitingGlass = temperingMapper.SelectWaitingGlass();
+ return WaitingGlass;
+ }
+ //鏄剧ず姝ｅ湪杩涚倝鐨勭増鍥�
+ public List<Tempering> SelectIntoGlass () {
+ List<Tempering> IntoGlass = temperingMapper.SelectInGlass();
+ return IntoGlass;
+ }
}
--
Gitblit v1.8.0