From 1bb91fea213a129dd71295bdef58dcbbd2ea6a7b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 四月 2024 11:48:44 +0800
Subject: [PATCH] 修改部分实体类id为Long类型防止溢出
---
UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java | 160 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 109 insertions(+), 51 deletions(-)
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java b/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java
index c631efc..9197e0b 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java
@@ -16,7 +16,12 @@
public class DownGlassCacheLogic {
@Autowired
private SelectInfo selectInfo;
- //璇嗗埆閫昏緫 涓嶄氦浜�
+
+ /**
+ * @param Number
+ * //璇嗗埆閫昏緫 涓嶄氦浜�
+ */
+
public void identify(String Number){
//鏌ヨ浠诲姟
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
@@ -32,25 +37,44 @@
}
}
//涓嬬墖鍓嶇悊鐗�
- public void Process(){
- String Result=S7control.getinstance().ReadWord("DB14.0", 1).get(0)+"";
- String Number=S7control.getinstance().ReadWord("DB14.2", 1).get(0)+"";
- if(Result=="1"){//杩涚墖璇锋眰
- processInto(Number);
- }else if(Result=="2"){//鍑虹墖璇锋眰
+ public static final String RESULT_IN = "1";
+ public static final String RESULT_OUT = "2";
+ public static final String RESULT_IN_OUT = "3";
+
+ public void process() {
+ String result = S7control.getinstance().ReadWord("DB14.0", 1).get(0) + "";
+ String number = S7control.getinstance().ReadWord("DB14.2", 1).get(0) + "";
+
+ // 杩涚墖璇锋眰
+ if (RESULT_IN.equals(result)) {
+ processInto(number);
+ }
+ // 鍑虹墖璇锋眰
+ else if (RESULT_OUT.equals(result)) {
processOut();
- }else if(Result=="3"){//杩涘嚭鐗囪姹�
- if (!processOut()) { //鍏堝嚭鍚庤繘
- processInto(Number);
- }
+ }
+ // 杩涘嚭鐗囪姹�
+ else if (RESULT_IN_OUT.equals(result)) {
+ // 鍏堝嚭鍚庤繘
+ if (!processOut()) {
+ processInto(number);
+ }
}
}
- //涓嬬墖鍓嶇悊鐗� 杩�
+
+
+ /**
+ * @param Number
+ * @return
+ * //涓嬬墖鍓嶇悊鐗� 杩�
+ */
+
public boolean processInto(String Number){
//鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- if(GlassInfo!=null){//瀛樺湪姝ょ幓鐠冪紪鍙�
+ //瀛樺湪姝ょ幓鐠冪紪鍙�
+ if(GlassInfo!=null){
//鍚岄挗鍖栫増鍥惧唴鐨勬爡鏍煎彿
List<DownStorageCageDetails> list=selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperinglayoutid(),GlassInfo.getTemperingfeedsequence(),GlassInfo.getWidth());
//绌烘爡鏍煎彿
@@ -80,42 +104,47 @@
//鐞嗙墖 鍑�
public boolean processOut(){
//鏌ヨ浠诲姟
- String G04=S7control.getinstance().ReadWord("DB14.56", 1).get(0)+"";
- String G05=S7control.getinstance().ReadWord("DB14.58", 1).get(0)+"";
+ String G06=S7control.getinstance().ReadWord("DB14.56", 1).get(0)+"";
+ 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();
- boolean isOut=true;//鍏朵粬鎯呭喌鏉′欢 濡傦細鍚庣画璁惧鏁呴殰绂佹鐞嗙墖鍑虹墖 绛�
+ //鍏朵粬鎯呭喌鏉′欢 濡傦細鍚庣画璁惧鏁呴殰绂佹鐞嗙墖鍑虹墖 绛�
+ boolean isOut=true;
if (list.size()>0&&isOut) {
DownStorageCageDetails item=list.get(0);
- if(G04=="0"&&G05=="1"){
- //鍑哄埌 G04
- //selectInfo.insertCacheTask(item.getGlassId()+"","0","04","2");
- selectInfo.insertCacheTask(item.getGlassId()+"","0","04","2",item.getWidth(),item.getHeight(),0,item.getThickness(),item.getFlowCardId());
+ //
+ if(G06=="0"&&G11=="1"){
+ //鍑哄埌 G06
+
+ 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(G04=="1"&&G05=="0"){
- //鍑哄埌 G05
- //selectInfo.insertCacheTask(item.getGlassId()+"","0","05","2");
- selectInfo.insertCacheTask(item.getGlassId()+"","0","05","2",item.getWidth(),item.getHeight(),0,item.getThickness(),item.getFlowCardId());
+ }else if(G06=="1"&&G11=="0"){
+ //鍑哄埌 G11
+
+ 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;
- }else if(G04=="0"&&G05=="0"){
+ }else if(G06=="0"&&G11=="0"){
//閮藉厑璁� G04/G05 涓婁竴鐗囨槸鍚﹀拰姝ょ墖鐜荤拑灏哄灏哄鐩稿悓
- String endcell="04";
+ String endcell="06";
String SendEndcell="1";
boolean If_=false;
- GlassInfo glassInfo04= selectInfo.SelectLastOutCacheInfo("04");
- GlassInfo glassInfo05= selectInfo.SelectLastOutCacheInfo("05");
- if(glassInfo05!=null&&glassInfo05.getWidth()==item.getWidth()&&glassInfo05.getHeight()==item.getHeight()){
- endcell="05";
+ 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");
- 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;
@@ -125,7 +154,11 @@
return false;
}
- //纾ㄨ竟 涓嶄氦浜� 鐞嗙墖鍜岀（杈规満鑷繁浜や簰
+ /**
+ * @param Number
+ * //纾ㄨ竟 涓嶄氦浜� 鐞嗙墖鍜岀（杈规満鑷繁浜や簰
+ */
+
public void processMb(String Number){
//鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
@@ -142,33 +175,58 @@
//杩斿洖缁撴灉
}
- //鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
- public boolean SelectMessageId(String Number){
+
+ /**
+ * @param Number
+ * @return
+ * 鏌ヨ娑堟伅闃熷垪閲屾鐜荤拑ID鐨勬暟鎹�
+ */
+ public boolean selectMessageId(String Number){
//鏌ヨ鏄惁瀛樺湪
+
GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
if(GlassInfo==null){
- return false;//杩斿洖 涓嶅瓨鍦�
+ //杩斿洖 涓嶅瓨鍦�
+ return false;
+
}
- return true;//杩斿洖 瀛樺湪
- }
- //鍒犻櫎娑堟伅闃熷垪閲屾鐜荤拑ID鐨勬暟鎹�
- public boolean DeleteMessageId(String Number){
- //鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
- if(GlassInfo==null){
- return false;//杩斿洖 涓嶅瓨鍦�
- }
- return true;//杩斿洖 瀛樺湪
+ //杩斿洖 瀛樺湪
+ return true;
}
- //鏄惁瀛樺湪姝ょ紪鍙风幓鐠�
+ /**
+ * @param Number
+ * @return
+ * 鍒犻櫎娑堟伅闃熷垪閲屾鐜荤拑ID鐨勬暟鎹�
+ */
+
+ public boolean deleteMessageId(String Number){
+ //鏌ヨ鏄惁瀛樺湪
+ GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
+ if(GlassInfo==null){
+ //杩斿洖 涓嶅瓨鍦�
+ return false;
+ }
+ //杩斿洖 瀛樺湪
+ return true;
+ }
+
+
+
+ /**
+ * @param Number
+ * @return
+ * //鏄惁瀛樺湪姝ょ紪鍙风幓鐠�
+ */
public boolean isExist(String Number){
//鏌ヨ鏄惁瀛樺湪
GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
if(GlassInfo==null){
- return false;//杩斿洖 涓嶅瓨鍦�
+ //杩斿洖 涓嶅瓨鍦�
+ return false;
}
- return true;//杩斿洖 瀛樺湪
+ //杩斿洖 瀛樺湪
+ return true;
}
}
--
Gitblit v1.8.0