From 438ef01503b8e9e0e51bcf6655136839c0b81c15 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期四, 27 六月 2024 16:07:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 3 +
src/main/webapp/views/console-old.html | 2
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 38 +++++++++---------
src/main/java/com/zy/core/cache/MessageQueue.java | 14 +++++++
src/main/java/com/zy/asrs/entity/BasJarMast.java | 34 +++++++++++++---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 15 +++++--
6 files changed, 75 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasJarMast.java b/src/main/java/com/zy/asrs/entity/BasJarMast.java
index c8ab673..92e20f0 100644
--- a/src/main/java/com/zy/asrs/entity/BasJarMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasJarMast.java
@@ -223,32 +223,52 @@
return null;
/*
- statusList.add(15);//瀹屾垚 杈撻�佺嚎瀛樺湪宸ヤ綔鍙枫��===銆嬭浆鍘嗗彶妗ｆ
- case 5://灏忚溅绉诲姩鑷冲喎鍗存Ы浠诲姟 //鍑哄喎鍗存Ы浠诲姟 //寮�鍑烘枡闂ㄤ换鍔�
+ default:
+ statusList.add(17);//瀹屾垚 杈撻�佺嚎瀛樺湪宸ヤ綔鍙枫��===銆嬭浆鍘嗗彶妗ｆ
+ case 7://鍑哄喎鍗存Ы浠诲姟
+ case 6://灏忚溅绉诲姩鑷冲喎鍗存Ы浠诲姟
+ case 5://寮�鍑烘枡闂ㄤ换鍔�
statusList.add(10);//鍏ュ喎鍗存Ы瀹屾垚
case 4://鍑虹～鍖栫綈浠诲姟
statusList.add(11);//鍐峰嵈涓�
- if (type!=5){
+
+ if (type!=6){
statusList.add(12);//鍐峰嵈瀹屾垚
}
- statusList.add(13);//鍑哄喎鍗存Ы涓�
- statusList.add(14);//鍑哄喎鍗存Ы瀹屾垚
+ statusList.add(13);//鍐峰嵈瀹屾垚璋冨皬杞︿换鍔�
+
case 3://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
statusList.add(4);//鍏ョ～鍖栫綈瀹屾垚
+
case 2://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
statusList.add(0);//鍒濆
+
case 1://寮�杩涙枡闂ㄤ换鍔�
statusList.add(2);//杩涙枡闂ㄦ墦寮�
+
case 0://鍏ョ～鍖栫綈浠诲姟
statusList.add(1);//寮�杩涙枡闂ㄤ腑
statusList.add(3);//鍏ョ～鍖栫綈涓�
+
statusList.add(5);//纭寲涓��===銆嬪叧闂ㄥ畬鎴�
- if (type!=4){
+
+ if (type!=5){
statusList.add(6);//纭寲瀹屾垚
}
+
statusList.add(7);//寮�鍑烘枡闂ㄤ腑
- statusList.add(8);//鍑烘枡闂ㄦ墦寮�
+
+ if (type!=4){
+ statusList.add(8);//鍑烘枡闂ㄦ墦寮�
+ }
+
statusList.add(9);//鍑虹～鍖栫綈涓��===銆嬪叆鍐峰嵈妲戒腑
+
+ statusList.add(15);//鍑哄喎鍗存Ы涓�
+ statusList.add(16);//鍑哄喎鍗存Ы瀹屾垚
+ if (type!=7){
+ statusList.add(14);//灏忚溅鍒拌揪鍐峰嵈妲�
+ }
* */
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 22b8e4d..880220f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5840,7 +5840,8 @@
return false;
}
- if (staProtocolRGV.rgvBoolean(2) && staProtocolRGVOther.rgvBoolean(1)){
+// if (staProtocolRGV.rgvBoolean(2) && staProtocolRGVOther.rgvBoolean(1)){
+ if (staProtocolRGV.rgvBoolean(2)){
if (staProtocolRGV.getNowRow() != staProtocolRGVOther.getNowRow()){
//绉昏蛋 == > 2
if (!jarRgvMoveTake(wrkMastExecute,2)){
@@ -6638,11 +6639,15 @@
public synchronized boolean jarSteTake(WrkMastExecute wrkMastExecute,Integer startLoad,Integer endLoad,SteTaskModeType steTaskModeType,boolean complete){
try {
SteCommand steCommand = new SteCommand();
+ steCommand.setTaskNo(wrkMastExecute.getWrkNo().intValue());
steCommand.setSteNo(wrkMastExecute.getSteId());
steCommand.setStartLoad(startLoad);
steCommand.setEndLoad(endLoad);
steCommand.setTaskModeType(steTaskModeType);
steCommand.setComplete(complete);
+ if (!complete){
+ steCommand.setTaskMode(steTaskModeType.id.shortValue());
+ }
steCommand.setJarNo(wrkMastExecute.getJarId().shortValue());
if (!MessageQueue.offer(SlaveType.Ste, steCommand.getSteNo(), new Task(2, steCommand))) {
log.error("绌挎杞te鍛戒护涓嬪彂澶辫触锛屽爢鍨涙満鍙�={},浠诲姟鏁版嵁={},涓嬪彂鏁版嵁={},complete={}", steCommand.getSteNo(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steCommand),complete);
@@ -6727,9 +6732,9 @@
continue;
}
if (steProtocol.getMode()==(short)1 && steProtocol.taskNo!=0 && steProtocol.getChargeStatus()==0){
- if (steProtocol.statusType.equals(SteStatusType.WAITING)){
-
- }
+// if (steProtocol.statusType.equals(SteStatusType.WAITING)){
+//
+// }
WrkMastExecute wrkMastExecute = wrkMastExecuteService.getWrkMastExecuteByWrkNo(steProtocol.getTaskNo().longValue());
if (!Cools.isEmpty(wrkMastExecute)){
switch (wrkMastExecute.getIoType()){
@@ -6756,24 +6761,19 @@
if (wrkMastExecute.getWrkSts()==5){
//1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歳gv鍙栬揣銆�4锛歳gv鍙栬揣瀹屾垚銆�5锛歋te绌挎鐗堝叆纭寲缃愩��6锛氬叆缃愬畬鎴愩��7锛氭洿鏂板畬鎴� //io_type = 5
//ste浠诲姟瀹屾垚
- if (wrkMastExecute.getWrkSts()==3){//==>4
- //1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堝彇璐с��4锛氬彇璐у畬鎴愮瓑寰呬笅涓�姝ャ��5锛歋te绌挎鐗堟斁璐ц嚦鍐峰嵈姹犮��6锛氭斁璐у畬鎴愩��7锛氭洿鏂板畬鎴� //io_type = 6
- //ste浠诲姟绛夊緟瀹屾垚
- if (steProtocol.statusType.equals(SteStatusType.WAITING)){
- //ste浠诲姟瀹屾垚
- if (jarSteTake(wrkMastExecute,null,null,null,true)){
- wrkMastExecute.setWrkSts(6);
- if (!wrkMastExecuteService.updateById(wrkMastExecute)){
- log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
- wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
- }
- return true;
+ if (steProtocol.statusType.equals(SteStatusType.WAITING)){
+ //ste浠诲姟瀹屾垚
+ if (jarSteTake(wrkMastExecute,null,null,null,true)){
+ wrkMastExecute.setWrkSts(6);
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
+ log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
+ wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
}
+ return true;
}
- log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>涓嬪彂寮傚父锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
- wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
- return true;
}
+ log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>涓嬪彂寮傚父锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
+ wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
return true;
}
return false;
diff --git a/src/main/java/com/zy/core/cache/MessageQueue.java b/src/main/java/com/zy/core/cache/MessageQueue.java
index 2e40597..fcd1543 100644
--- a/src/main/java/com/zy/core/cache/MessageQueue.java
+++ b/src/main/java/com/zy/core/cache/MessageQueue.java
@@ -32,6 +32,8 @@
private static final Map<Integer, ConcurrentLinkedQueue<Task>> JAR_EXCHANGE = new ConcurrentHashMap<>();
+ private static final Map<Integer, ConcurrentLinkedQueue<Task>> STE_EXCHANGE = new ConcurrentHashMap<>();
+
/**
* mq 浜ゆ崲鏈哄垵濮嬪寲
*/
@@ -61,6 +63,9 @@
case Jar:
JAR_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
break;
+ case Ste:
+ STE_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
+ break;
default:
break;
}
@@ -88,6 +93,8 @@
return CAR_EXCHANGE.get(id).offer(task);
case Jar:
return JAR_EXCHANGE.get(id).offer(task);
+ case Ste:
+ return STE_EXCHANGE.get(id).offer(task);
default:
return false;
}
@@ -115,6 +122,8 @@
return CAR_EXCHANGE.get(id).poll();
case Jar:
return JAR_EXCHANGE.get(id).poll();
+ case Ste:
+ return STE_EXCHANGE.get(id).poll();
default:
return null;
}
@@ -141,6 +150,8 @@
return CAR_EXCHANGE.get(id).peek();
case Jar:
return JAR_EXCHANGE.get(id).peek();
+ case Ste:
+ return STE_EXCHANGE.get(id).peek();
default:
return null;
}
@@ -172,6 +183,9 @@
case Jar:
JAR_EXCHANGE.get(id).clear();
break;
+ case Ste:
+ STE_EXCHANGE.get(id).clear();
+ break;
default:
break;
}
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 0929642..902fb2b 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -194,6 +194,9 @@
*/
private void readStatus(){
try {
+ if (true){
+ return;
+ }
OperateResultExOne<byte[]> result = new OperateResultExOne<byte[]>();
if (slave.getId()>2 && slave.getId()<6){
result = siemensNet.Read("DB101.0", (short) 66);
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 98ea21d..dc39b89 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -316,23 +316,30 @@
try{
staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 0)); // 灏忚溅鐩爣浣�
- staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 0)); // 褰撳墠浣嶇疆
+ staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2)); // 褰撳墠浣嶇疆
boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRgv.Content, 4, 1);
staProtocol.setRGV1(status[0]); // 灏忚溅鏃犺揣绌洪棽
staProtocol.setRGV2(status[1]); // 灏忚溅杈撻�佺嚎鍙栬揣鍒颁綅
staProtocol.setRGV3(status[2]); // 灏忚溅杩愯涓�
-// staProtocol.setRGV11(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2)); // 灏忚溅鏃犺揣绌洪棽
-// staProtocol.setRGV22(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2)); // 灏忚溅杈撻�佺嚎鍙栬揣鍒颁綅
-// staProtocol.setRGV33(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2)); //灏忚溅杩愯涓�
+// staProtocol.setRGV1(false); // 灏忚溅鏃犺揣绌洪棽
+// staProtocol.setRGV2(true); // 灏忚溅杈撻�佺嚎鍙栬揣鍒颁綅
+// staProtocol.setRGV3(false); // 灏忚溅杩愯涓�
+
staProtocol.setRGV44(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 2));//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
staProtocol.setRGV55(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 4)); //灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
staProtocol.setRGV66(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 6)); // 涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
+//
+// staProtocol.setRGV44((short) 0);//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
+// staProtocol.setRGV55((short) 0); //灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
+// staProtocol.setRGV66((short) 0); // 涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
staProtocol.setRGV4(staProtocol.getRGV44() != 0 && staProtocol.getRGV44() != 2);//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
staProtocol.setRGV5(staProtocol.getRGV55() != 0 && staProtocol.getRGV55() != 2); //灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
staProtocol.setRGV6(staProtocol.getRGV66() != 0 && staProtocol.getRGV66() != 2); // 涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
+
+
}catch (Exception e){
log.error("璇诲彇RGV淇℃伅澶辫触"+e.getMessage());
}
diff --git a/src/main/webapp/views/console-old.html b/src/main/webapp/views/console-old.html
index 784c5de..ecd6347 100644
--- a/src/main/webapp/views/console-old.html
+++ b/src/main/webapp/views/console-old.html
@@ -22,7 +22,7 @@
<h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
</div>
<div class="head-right">
- <img src="../static/images/zy-logo.png" alt="寰愬伐姹変簯" height="44" width="80">
+ <img src="../static/images/zy-logo.png" alt="娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�" height="44" width="80">
</div>
</div>
--
Gitblit v1.9.1