From ad28331c1e3ed456b72765874b41b83b49dc279f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 18 四月 2024 14:44:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java | 70 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java
index 7615a77..5dc3f77 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java
@@ -4,9 +4,9 @@
import com.mes.common.PLCAutoMes;
import com.mes.common.PlcParameterObject;
-import com.mes.common.S7object;
-import com.mes.taskcache.entity.EdgStorageCageDetails;
-import com.mes.taskcache.entity.GlassInfo;
+//import com.mes.common.S7object;
+import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
+import com.mes.glassinfo.entity.GlassInfo;
import com.mes.taskcache.mapper.HangzhouMesMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -33,38 +33,38 @@
// }
// }
// }
- //鐞嗙墖 杩�
- public boolean processInto(String Number){
- //鏌ヨ娑堟伅闃熷垪閲岀殑鐜荤拑
- GlassInfo GlassInfo=hangzhouMesMapper.selectGlassId(Number);
- PlcParameterObject plcmes= PLCAutoMes.PlcMesObject;
- if(GlassInfo!=null){//瀛樺湪姝ょ幓鐠冪紪鍙�
- //鍚岄挗鍖栫増鍥惧唴鐨勬爡鏍煎彿
- List<EdgStorageCageDetails> list=hangzhouMesMapper.selectIsExistIntoCache(GlassInfo.getTemperinglayoutid(),GlassInfo.getTemperingfeedsequence(),GlassInfo.getWidth());
- //绌烘爡鏍煎彿
- if (list.size()==0) {
- list=hangzhouMesMapper.selectCacheLeisure();
- }
- //灏忎簬姝ょ幓鐠冮挗鍖栫増鍥惧簭鍙风殑鏍呮牸鍙�
- if(list.size()==0){
- list=hangzhouMesMapper.selectIsExistIntoCache(GlassInfo.getTemperinglayoutid(),GlassInfo.getWidth());
- }
- if(list.size()>0){
- //瀛樺湪绌烘牸
- //1.鐢熸垚浠诲姟锛� 璧峰浣嶇疆0 缁撴潫浣嶇疆this.slot 浠诲姟绫诲瀷 1 锛堣繘鐗囦换鍔★級
- //2.鍥炲 1杩涚墖
- EdgStorageCageDetails item=list.get(0);
- hangzhouMesMapper.insertCacheTask(GlassInfo.getId()+"","0",item.getSlot()+"","1");
- S7object.getinstance().plccontrol.WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
- return true;
- }
-
- }else{
- // ID缂栧彿涓嶅瓨鍦� 涓嶅鐞�/鍥炲PLC 杩涜鎶ヨ鎻愮ず
- }
- //杩斿洖缁撴灉
- return false;
- }
+// //鐞嗙墖 杩�
+// public boolean processInto(String Number){
+// //鏌ヨ娑堟伅闃熷垪閲岀殑鐜荤拑
+// GlassInfo GlassInfo=hangzhouMesMapper.selectGlassId(Number);
+// PlcParameterObject plcmes= PLCAutoMes.PlcMesObject;
+// if(GlassInfo!=null){//瀛樺湪姝ょ幓鐠冪紪鍙�
+// //鍚岄挗鍖栫増鍥惧唴鐨勬爡鏍煎彿
+// List<EdgStorageCageDetails> list=hangzhouMesMapper.selectIsExistIntoCache(GlassInfo.getTemperingLayoutId(),GlassInfo.getTemperingFeedSequence(),GlassInfo.getWidth());
+// //绌烘爡鏍煎彿
+// if (list.size()==0) {
+// list=hangzhouMesMapper.selectCacheLeisure();
+// }
+// //灏忎簬姝ょ幓鐠冮挗鍖栫増鍥惧簭鍙风殑鏍呮牸鍙�
+// if(list.size()==0){
+// list=hangzhouMesMapper.selectIsExistIntoCache(GlassInfo.getTemperingLayoutId(),GlassInfo.getWidth());
+// }
+// if(list.size()>0){
+// //瀛樺湪绌烘牸
+// //1.鐢熸垚浠诲姟锛� 璧峰浣嶇疆0 缁撴潫浣嶇疆this.slot 浠诲姟绫诲瀷 1 锛堣繘鐗囦换鍔★級
+// //2.鍥炲 1杩涚墖
+// EdgStorageCageDetails item=list.get(0);
+// hangzhouMesMapper.insertCacheTask(GlassInfo.getId()+"","0",item.getSlot()+"","1");
+// S7object.getinstance().plccontrol.WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
+// return true;
+// }
+//
+// }else{
+// // ID缂栧彿涓嶅瓨鍦� 涓嶅鐞�/鍥炲PLC 杩涜鎶ヨ鎻愮ず
+// }
+// //杩斿洖缁撴灉
+// return false;
+// }
// //鐞嗙墖 鍑�
// public boolean processOut(){
// //鏌ヨ浠诲姟
--
Gitblit v1.8.0