From 2027077e00eff0b9fa6b0f68f803a9780f065e21 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 22 四月 2024 11:18:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
index 382665d..1aa2bdf 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
@@ -29,8 +29,11 @@
public static final String RESULT_IN_OUT = "3";
@Autowired
private DownStorageCageDetailsMapper selectInfo;
- private GlassInfoService GlassInfoService;
+ @Autowired
+ private GlassInfoService glassInfoService;
+ @Autowired
private DownStorageCageService downStorageCageService;
+ @Autowired
private DownGlassTaskService downGlassTaskService;
@@ -65,11 +68,11 @@
*/
public boolean processInto(String Number) {
- GlassInfoService = WebSocketServer.applicationContext.getBean(GlassInfoService.class);
+ glassInfoService = WebSocketServer.applicationContext.getBean(GlassInfoService.class);
downStorageCageService = WebSocketServer.applicationContext.getBean(DownStorageCageService.class);
//鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
- GlassInfo GlassInfo = GlassInfoService.selectGlassId(Number);
+ GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
//瀛樺湪姝ょ幓鐠冪紪鍙�
if (GlassInfo != null) {
@@ -92,6 +95,7 @@
selectInfo.insertCacheTask(GlassInfo.getId() + "", "0", item.getSlot() + "", "1", GlassInfo.getWidth(), GlassInfo.getHeight(), GlassInfo.getFilmsid(), GlassInfo.getThickness(), GlassInfo.getFlowcardId());
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
+
//瀹屾垚鍚庢彃鍏ュ皬鐗囨暟鎹埌缂撳瓨琛�
return true;
}
@@ -111,9 +115,12 @@
String G13 = S7control.getinstance().ReadWord("DB14.58", 1).get(0) + "";
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
+
List<DownStorageCageDetails> list = downStorageCageService.getCacheOut(1, 5);
List<DownStorageCageDetails> list2 = downStorageCageService.getCacheOut(6, 10);
List<DownStorageCageDetails> list3 = downStorageCageService.getCacheOut(1, 10);
+ GlassInfo Maxglass=glassInfoService.selectGlassId("2");;
+
// 浼樺厛 瓒呭嚭灏哄浼樺厛浜哄伐鍑虹墖 浜哄伐澶勭悊
if (!list3.isEmpty()) {
DownStorageCageDetails item3 = list3.get(0);
@@ -130,20 +137,18 @@
}
//鍚屾椂璇锋眰 浼樺厛鍚庣鍑虹墖
- else if (!list3.isEmpty()) {
+ else if (!list3.isEmpty()&&Maxglass.equals(list3.get(0))) {
DownStorageCageDetails item3 = list3.get(0);
if (G06.equals("0") && G11.equals("0")) {
-
String endcell = "11";
String SendEndcell = "1";
-
selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId());
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
return true;
}
}
- // 鎸夌収椤哄簭绗﹀悎鍓嶇鍑虹墖
+ // 鎸夌収澶у皬绗﹀悎鍓嶇鍑虹墖
else if (!list.isEmpty()) {
DownStorageCageDetails item = list.get(0);
if (G06.equals("0") && G11.equals("1")) {
@@ -185,7 +190,7 @@
public boolean selectMessageId(String Number) {
//鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo = GlassInfoService.selectGlassId(Number);
+ GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
if (GlassInfo == null) {
//杩斿洖 涓嶅瓨鍦�
return false;
@@ -202,7 +207,7 @@
public boolean deleteMessageId(String Number) {
//鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo = GlassInfoService.selectGlassId(Number);
+ GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
if (GlassInfo == null) {
//杩斿洖 涓嶅瓨鍦�
return false;
@@ -218,7 +223,7 @@
*/
public boolean isExist(String Number) {
//鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo = GlassInfoService.selectGlassId(Number);
+ GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
if (GlassInfo == null) {
//杩斿洖 涓嶅瓨鍦�
return false;
--
Gitblit v1.8.0