From 7357691a222745887ca1c336d8c458964a0d3ab8 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 19 四月 2024 11:18:21 +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 | 34 +++++++++-------------------------
1 files changed, 9 insertions(+), 25 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 65ab280..382665d 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
@@ -33,24 +33,9 @@
private DownStorageCageService downStorageCageService;
private DownGlassTaskService downGlassTaskService;
- /**
- * @param Number //璇嗗埆閫昏緫 涓嶄氦浜�
- */
-// public void identify(String Number) {
-// //鏌ヨ浠诲姟
-// PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
-// S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
-// String s = S7control.getinstance().ReadWord("DB14.26", 1).get(0) + "";
-// boolean isexist = isExist(Number);
-// if (isexist) {
-// //瀛樺湪閫昏緫 1.娣诲姞淇℃伅 2.鍥炲PLC瀛樺湪
-// //S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
-// } else {
-// //涓嶅瓨鍦ㄩ�昏緫 1.鍥炲PLC涓嶅瓨鍦�
-// //S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 2);
-// }
-// }
+
+
public void process() {
String result = S7control.getinstance().ReadWord("DB14.0", 1).get(0) + "";
@@ -89,15 +74,15 @@
//瀛樺湪姝ょ幓鐠冪紪鍙�
if (GlassInfo != null) {
//鍚岄挗鍖栫増鍥惧唴鐨勬爡鏍煎彿 鎵惧埌鐩稿悓鐗堝浘id骞朵笖澶т簬鍓嶉潰鐨勯『搴忕殑绌烘牸
- List<DownStorageCageDetails> list = selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperingLayoutId(), GlassInfo.getTemperingFeedSequence(), GlassInfo.getWidth());
+ List<DownStorageCageDetails> list = downStorageCageService.getIsExistIntoCacheByLayoutAndSequence(GlassInfo.getTemperingLayoutId(), GlassInfo.getTemperingFeedSequence(), GlassInfo.getWidth());
//绌烘爡鏍煎彿
if (list.size() == 0) {
//鏌ヨ绗煎瓙鍐呯┖闂�
- list = selectInfo.SelectCacheLeisure();
+ list = downStorageCageService.getCacheLeisure();
}
//灏忎簬姝ょ幓鐠冮挗鍖栫増鍥惧簭鍙风殑鏍呮牸鍙�
if (list.size() == 0) {
- list = selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperingLayoutId(), GlassInfo.getWidth());
+ list = downStorageCageService.getIsExistIntoCacheByLayout(GlassInfo.getTemperingLayoutId(), GlassInfo.getWidth());
}
if (list.size() > 0) {
//瀛樺湪绌烘牸
@@ -125,10 +110,10 @@
String G11 = S7control.getinstance().ReadWord("DB14.58", 1).get(0) + "";
String G13 = S7control.getinstance().ReadWord("DB14.58", 1).get(0) + "";
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
- log.println("666"); ;
- List<DownStorageCageDetails> list = selectInfo.SelectCacheOut(1, 5);
- List<DownStorageCageDetails> list2 = selectInfo.SelectCacheOut(6, 10);
- List<DownStorageCageDetails> list3 = selectInfo.SelectCacheOut(1, 10);
+
+ List<DownStorageCageDetails> list = downStorageCageService.getCacheOut(1, 5);
+ List<DownStorageCageDetails> list2 = downStorageCageService.getCacheOut(6, 10);
+ List<DownStorageCageDetails> list3 = downStorageCageService.getCacheOut(1, 10);
// 浼樺厛 瓒呭嚭灏哄浼樺厛浜哄伐鍑虹墖 浜哄伐澶勭悊
if (!list3.isEmpty()) {
DownStorageCageDetails item3 = list3.get(0);
@@ -185,7 +170,6 @@
// 杩斿洖缁撴灉
return false;
}
-
/**
--
Gitblit v1.8.0