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 | 48 +++++++++++++++++-------------------------------
1 files changed, 17 insertions(+), 31 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 3d693bf..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
@@ -18,6 +18,8 @@
import java.util.List;
+import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
+
@Data
@Service
public class DownGlassCacheLogic {
@@ -28,27 +30,12 @@
@Autowired
private DownStorageCageDetailsMapper selectInfo;
private GlassInfoService GlassInfoService;
- private DownStorageCageDetailsService downStorageCageDetailsService;
+ 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) + "";
@@ -79,20 +66,23 @@
public boolean processInto(String Number) {
GlassInfoService = WebSocketServer.applicationContext.getBean(GlassInfoService.class);
+ downStorageCageService = WebSocketServer.applicationContext.getBean(DownStorageCageService.class);
+
//鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
GlassInfo GlassInfo = GlassInfoService.selectGlassId(Number);
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
//瀛樺湪姝ょ幓鐠冪紪鍙�
if (GlassInfo != null) {
- //鍚岄挗鍖栫増鍥惧唴鐨勬爡鏍煎彿
- List<DownStorageCageDetails> list = selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperingLayoutId(), GlassInfo.getTemperingFeedSequence(), GlassInfo.getWidth());
+ //鍚岄挗鍖栫増鍥惧唴鐨勬爡鏍煎彿 鎵惧埌鐩稿悓鐗堝浘id骞朵笖澶т簬鍓嶉潰鐨勯『搴忕殑绌烘牸
+ 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) {
//瀛樺湪绌烘牸
@@ -102,6 +92,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;
}
@@ -119,9 +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;
- 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);
@@ -175,16 +167,10 @@
}
-
-
// 杩斿洖缁撴灉
return false;
}
-//鏌ヨ鏄惁缁戝畾鏋跺瓙
-// public boolean selectFlowCardId(String FlowCardId){
-//
-// }
/**
* @param Number
--
Gitblit v1.8.0