From daed20c553f77fc48695f8523cd57bc56fb5a0fd Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 10 四月 2024 08:35:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
CacheGlassModule/src/main/java/com/mes/service/CacheGlassService/LogicService.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/CacheGlassModule/src/main/java/com/mes/service/CacheGlassService/Logic.java b/CacheGlassModule/src/main/java/com/mes/service/CacheGlassService/LogicService.java
similarity index 81%
rename from CacheGlassModule/src/main/java/com/mes/service/CacheGlassService/Logic.java
rename to CacheGlassModule/src/main/java/com/mes/service/CacheGlassService/LogicService.java
index f239f84..990e50e 100644
--- a/CacheGlassModule/src/main/java/com/mes/service/CacheGlassService/Logic.java
+++ b/CacheGlassModule/src/main/java/com/mes/service/CacheGlassService/LogicService.java
@@ -11,13 +11,14 @@
import com.mes.entity.TaskCache;
import com.mes.entity.device.PLCAutoMes;
import com.mes.entity.device.PlcParameterObject;
-import com.mes.mapper.SelectInfo;
+import com.mes.mapper.HangzhouMesMapper;
+import com.mes.mapper.PpMapper;
@Service
-public class Logic {
+public class LogicService {
@Autowired
- private SelectInfo selectInfo;
+ private HangzhouMesMapper hangzhouMesMapper;
//璇嗗埆閫昏緫 涓嶄氦浜�
public void identify(String Number){
//鏌ヨ浠诲姟
@@ -50,25 +51,25 @@
//鐞嗙墖 杩�
public boolean processInto(String Number){
//鏌ヨ娑堟伅闃熷垪閲岀殑鐜荤拑
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
+ GlassInfo GlassInfo=hangzhouMesMapper.selectGlassId(Number);
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
if(GlassInfo!=null){//瀛樺湪姝ょ幓鐠冪紪鍙�
//鍚岄挗鍖栫増鍥惧唴鐨勬爡鏍煎彿
- List<EdgStorageCageDetails> list=selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperinglayoutid(),GlassInfo.getTemperingfeedsequence(),GlassInfo.getWidth());
+ List<EdgStorageCageDetails> list=hangzhouMesMapper.selectIsExistIntoCache(GlassInfo.getTemperinglayoutid(),GlassInfo.getTemperingfeedsequence(),GlassInfo.getWidth());
//绌烘爡鏍煎彿
if (list.size()==0) {
- list=selectInfo.SelectCacheLeisure();
+ list=hangzhouMesMapper.selectCacheLeisure();
}
//灏忎簬姝ょ幓鐠冮挗鍖栫増鍥惧簭鍙风殑鏍呮牸鍙�
if(list.size()==0){
- list=selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperinglayoutid(),GlassInfo.getWidth());
+ list=hangzhouMesMapper.selectIsExistIntoCache(GlassInfo.getTemperinglayoutid(),GlassInfo.getWidth());
}
if(list.size()>0){
//瀛樺湪绌烘牸
//1.鐢熸垚浠诲姟锛� 璧峰浣嶇疆0 缁撴潫浣嶇疆this.slot 浠诲姟绫诲瀷 1 锛堣繘鐗囦换鍔★級
//2.鍥炲 1杩涚墖
EdgStorageCageDetails item=list.get(0);
- selectInfo.insertCacheTask(GlassInfo.getId()+"","0",item.getSlot()+"","1");
+ hangzhouMesMapper.insertCacheTask(GlassInfo.getId()+"","0",item.getSlot()+"","1");
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
return true;
}
@@ -85,19 +86,19 @@
String A09=S7control.getinstance().ReadWord("DB14.56", 1).get(0)+"";
String A10=S7control.getinstance().ReadWord("DB14.58", 1).get(0)+"";
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- List<EdgStorageCageDetails> list=selectInfo.SelectCacheOut();
+ List<EdgStorageCageDetails> list=hangzhouMesMapper.selectCacheOut();
boolean isOut=true;//鍏朵粬鎯呭喌鏉′欢 濡傦細鍚庣画璁惧鏁呴殰绂佹鐞嗙墖鍑虹墖 绛�
if (list.size()>0&&isOut) {
EdgStorageCageDetails item=list.get(0);
if(A09=="0"&&A10=="1"){
//鍑哄埌 A09
- selectInfo.insertCacheTask(item.getGlassid()+"","0","09","2");
+ hangzhouMesMapper.insertCacheTask(item.getGlassid()+"","0","09","2");
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "1");
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
return true;
}else if(A09=="1"&&A10=="0"){
//鍑哄埌 A10
- selectInfo.insertCacheTask(item.getGlassid()+"","0","10","2");
+ hangzhouMesMapper.insertCacheTask(item.getGlassid()+"","0","10","2");
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "2");
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
return true;
@@ -106,15 +107,15 @@
String endcell="09";
String SendEndcell="1";
boolean If_=false;
- GlassInfo glassInfo09= selectInfo.SelectLastOutCacheInfo("09");
- GlassInfo glassInfo10= selectInfo.SelectLastOutCacheInfo("10");
+ GlassInfo glassInfo09= hangzhouMesMapper.selectLastOutCacheInfo("09");
+ GlassInfo glassInfo10= hangzhouMesMapper.selectLastOutCacheInfo("10");
if(glassInfo10!=null&&glassInfo10.getWidth()==item.getWidth()&&glassInfo10.getHeight()==item.getHeight()){
endcell="10";
SendEndcell="2";
}else if(glassInfo10!=null&&If_){
//鍏朵粬鏉′欢
}
- selectInfo.insertCacheTask(item.getGlassid()+"","0",endcell,"2");
+ hangzhouMesMapper.insertCacheTask(item.getGlassid()+"","0",endcell,"2");
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
return true;
@@ -127,7 +128,7 @@
//纾ㄨ竟 涓嶄氦浜� 鐞嗙墖鍜岀（杈规満鑷繁浜や簰
public void processMb(String Number){
//鏌ヨ浠诲姟
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
+ GlassInfo GlassInfo=hangzhouMesMapper.selectGlassId(Number);
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
if(GlassInfo!=null){
//鍙戦�佷换鍔� ID 闀� 瀹� 鍘� 鍊掕 宸ヨ壓鍔熻兘绛�
@@ -144,7 +145,7 @@
//鏌ヨ娑堟伅闃熷垪閲屾鐜荤拑ID鐨勬暟鎹�
public boolean SelectMessageId(String Number){
//鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
+ GlassInfo GlassInfo=hangzhouMesMapper.selectGlassId(Number);
if(GlassInfo==null){
return false;//杩斿洖 涓嶅瓨鍦�
}
@@ -153,7 +154,7 @@
//鍒犻櫎娑堟伅闃熷垪閲屾鐜荤拑ID鐨勬暟鎹�
public boolean DeleteMessageId(String Number){
//鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
+ GlassInfo GlassInfo=hangzhouMesMapper.selectGlassId(Number);
if(GlassInfo==null){
return false;//杩斿洖 涓嶅瓨鍦�
}
@@ -163,7 +164,7 @@
//鏄惁瀛樺湪姝ょ紪鍙风幓鐠�
public boolean isExist(String Number){
//鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
+ GlassInfo GlassInfo=hangzhouMesMapper.selectGlassId(Number);
if(GlassInfo==null){
return false;//杩斿洖 涓嶅瓨鍦�
}
--
Gitblit v1.8.0