From 400632d7ffb626413b8e232e1b7ccbe1e61e3bf3 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期一, 10 十月 2022 18:58:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 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 dff3e8f..adf2da1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2019,6 +2019,16 @@
newStatus = 0;
newSingle = 0;//娴嬭瘯澶嶆牳锛屽瘎瀛樺櫒鍦板潃锛�8===>>0
break;
+ case 11://鍏ュ簱鍓嶅垽鏂厖鐢电嚎鏄惁鏀惧ソ
+ olsStatus = 99;
+ newStatus = 0;
+ newSingle = 11;//涓嶅彉
+ break;
+ case 12://鍏呯數绾挎斁濂�
+ olsStatus = 99;
+ newStatus = 0;
+ newSingle = 0;//娴嬭瘯澶嶆牳锛屽瘎瀛樺櫒鍦板潃锛�12===>>0
+ break;
}
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
@@ -2044,6 +2054,7 @@
}
}else if (devpThread.startSignal[i] == 5){
SearchLocParam param = new SearchLocParam();
+ param.setBarcode(i+1+"");
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/mobile/test/suspend/auth")
@@ -2097,7 +2108,34 @@
} else {
devpThread.startSignal[i] = newSingle;
}
- }
+ }else if (devpThread.startSignal[i] == 11){
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("channel",(i+1)));
+ if (locMast.getLocSts().equals("O")){
+ locMast.setLocSts("X");
+ locMastService.update(locMast,new EntityWrapper<LocMast>()
+ .eq("channel",(i+1)));
+ }
+ }else if (devpThread.startSignal[i] == 12){
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("channel",(i+1)));
+ if (locMast.getLocSts().equals("X")){
+ locMast.setLocSts("O");
+ locMastService.update(locMast,new EntityWrapper<LocMast>()
+ .eq("channel",(i+1)));
+ //澶嶄綅PLC淇″彿锛屽�熺敤杈撻�佺珯鐐瑰疄浣撶被
+ StaProtocol staProtocol = new StaProtocol();
+ staProtocol.setSiteId(i*2);//瀵勫瓨鍣ㄥ湴鍧�
+ staProtocol.setStaNo(newSingle);//淇敼PLC瀵勫瓨鍣ㄥ湴鍧�鍊�,12==>0
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
+ if(!result){
+// log.error("鏇存柊搴撲綅绱ф�ュ嚭搴撲俊鍙峰け璐�===>>[channel:{},locNo:{},barcode:{}]", i+1, locMast.getLocNo(), locMast.getBarcode());
+// throw new CoolException("鏇存柊娴嬭瘯淇″彿澶辫触===>>" + i);
+ } else {
+ devpThread.startSignal[i] = newSingle;
+ }
+ }
+ }else { }
}
--
Gitblit v1.9.1