From 6e9136d1e4ed83f9b789af1c4db150adca3488cc Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 09 四月 2024 13:49:04 +0800
Subject: [PATCH] 前端静态数据改为接口查询数据 绑定架子和清空
---
UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java b/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java
index e092020..9197e0b 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java
@@ -113,17 +113,18 @@
boolean isOut=true;
if (list.size()>0&&isOut) {
DownStorageCageDetails item=list.get(0);
+ //
if(G06=="0"&&G11=="1"){
//鍑哄埌 G06
- selectInfo.insertCacheTask(item.getGlassId()+"","0","06","2",item.getWidth(),item.getHeight(),0,item.getThickness(),item.getFlowCardId());
+ selectInfo.insertCacheTask(item.getGlassId()+"","0","06","2",item.getWidth(),item.getHeight(),item.getFilmsid(),item.getThickness(),item.getFlowCardId());
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "1");
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
return true;
}else if(G06=="1"&&G11=="0"){
//鍑哄埌 G11
- selectInfo.insertCacheTask(item.getGlassId()+"","0","11","2",item.getWidth(),item.getHeight(),0,item.getThickness(),item.getFlowCardId());
+ selectInfo.insertCacheTask(item.getGlassId()+"","0","11","2",item.getWidth(),item.getHeight(),item.getFilmsid(),item.getThickness(),item.getFlowCardId());
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "2");
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
return true;
@@ -132,16 +133,18 @@
String endcell="06";
String SendEndcell="1";
boolean If_=false;
- GlassInfo glassInfo04= selectInfo.SelectLastOutCacheInfo("06");
- GlassInfo glassInfo05= selectInfo.SelectLastOutCacheInfo("11");
- if(glassInfo05!=null&&glassInfo05.getWidth()==item.getWidth()&&glassInfo05.getHeight()==item.getHeight()){
+ GlassInfo glassInfo06= selectInfo.SelectLastOutCacheInfo("06");
+ GlassInfo glassInfo11= selectInfo.SelectLastOutCacheInfo("11");
+ GlassInfo glassInfo13= selectInfo.SelectLastOutCacheInfo("13");
+ if(glassInfo06!=null&&glassInfo11.getWidth()==item.getWidth()&&glassInfo06.getHeight()==item.getHeight()){
endcell="11";
SendEndcell="2";
- }else if(glassInfo05!=null&&If_){
- //鍏朵粬鏉′欢
+ }else if(item.getHeight()>=3440&&item.getWidth()>=1440){
+ //鍏朵粬鏉′欢浜哄伐澶勭悊
+
}
- selectInfo.insertCacheTask(item.getGlassId()+"","0",endcell,"2",item.getWidth(),item.getHeight(),0,item.getThickness(),item.getFlowCardId());
+ selectInfo.insertCacheTask(item.getGlassId()+"","0",endcell,"2",item.getWidth(),item.getHeight(),item.getFilmsid(),item.getThickness(),item.getFlowCardId());
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
return true;
--
Gitblit v1.8.0