From 80459108843177082c119647c480cc571e739fbc Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 17 二月 2023 15:19:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
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 679c3da..9c919d3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2014,10 +2014,14 @@
newStatus = 3;
newSingle = 2;//娴嬭瘯澶嶆牳锛屽瘎瀛樺櫒鍦板潃锛�1===>>2
break;
- case 3://瀹屾垚娴嬭瘯淇″彿
+ case 2://瀹屾垚娴嬭瘯淇″彿
+ olsStatus = 3;
+ newStatus = 3;
+ newSingle = 3;//娴嬭瘯瀹屾垚锛屽瘎瀛樺櫒鍦板潃娓呴浂锛�2===>>3
+ case 4://瀹屾垚娴嬭瘯淇″彿
olsStatus = 3;
newStatus = 4;
- newSingle = 0;//娴嬭瘯瀹屾垚锛屽瘎瀛樺櫒鍦板潃娓呴浂锛�3===>>0
+ newSingle = 0;//娴嬭瘯瀹屾垚锛屽瘎瀛樺櫒鍦板潃娓呴浂锛�4===>>0
break;
case 5://鏆傚仠淇″彿
olsStatus = 99;//plc缁欏嚭鏆傚仠淇″彿
@@ -2067,6 +2071,24 @@
} else {
devpThread.startSignal[i] = newSingle;
}
+ }else if (null != testMast && devpThread.startSignal[i] == 2){
+ if (testMast.getStatus()==3){
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("channel",(i+1)));
+ if (locMast.getLocSts().equals("F") && locMast.getPackStatus()==3){
+ //澶嶄綅PLC淇″彿锛屽�熺敤杈撻�佺珯鐐瑰疄浣撶被
+ StaProtocol staProtocol = new StaProtocol();
+ staProtocol.setSiteId(i*2);//瀵勫瓨鍣ㄥ湴鍧�
+ staProtocol.setStaNo(newSingle);//淇敼PLC瀵勫瓨鍣ㄥ湴鍧�鍊�,2==>3
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
+ if(!result){
+ log.error("鏇存柊娴嬭瘯淇″彿澶辫触===>>[channel:{},locNo:{},barcode:{}]", i+1, testMast.getLocNo(), testMast.getBarcode());
+// throw new CoolException("鏇存柊娴嬭瘯淇″彿澶辫触===>>" + i);
+ } else {
+ devpThread.startSignal[i] = newSingle;
+ }
+ }
+ }
}else if (devpThread.startSignal[i] == 5){
SearchLocParam param = new SearchLocParam();
param.setBarcode(i+1+"");
--
Gitblit v1.9.1