From 78ca7ed85c42d183b5c0c039a9d3897f1529339a Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 18 四月 2024 14:20:25 +0800
Subject: [PATCH] 更新语句
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 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..6bd12f8 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 {
@@ -35,20 +37,20 @@
* @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 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) + "";
@@ -84,10 +86,11 @@
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
//瀛樺湪姝ょ幓鐠冪紪鍙�
if (GlassInfo != null) {
- //鍚岄挗鍖栫増鍥惧唴鐨勬爡鏍煎彿
+ //鍚岄挗鍖栫増鍥惧唴鐨勬爡鏍煎彿 鎵惧埌鐩稿悓鐗堝浘id骞朵笖澶т簬鍓嶉潰鐨勯『搴忕殑绌烘牸
List<DownStorageCageDetails> list = selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperingLayoutId(), GlassInfo.getTemperingFeedSequence(), GlassInfo.getWidth());
//绌烘爡鏍煎彿
if (list.size() == 0) {
+ //鏌ヨ绗煎瓙鍐呯┖闂�
list = selectInfo.SelectCacheLeisure();
}
//灏忎簬姝ょ幓鐠冮挗鍖栫増鍥惧簭鍙风殑鏍呮牸鍙�
@@ -102,6 +105,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,6 +123,7 @@
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);
--
Gitblit v1.8.0