From d694b65bb0c5e511b6d59b1f6eaeb7d6ace8f4ef Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 20 三月 2025 23:21:57 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 66 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 31 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 dc8bd4b..36cecc3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3145,9 +3145,9 @@
if (Cools.isEmpty(basDevp) || basDevp.getReportSign()!=1){
continue;
}
- if (basDevp.getWrkNo()!=0 && (basDevp.getWrkNo()<9900 || basDevp.getWrkNo()>9999)){
- continue;
- }
+// if (basDevp.getWrkNo()!=0 && (basDevp.getWrkNo()<9900 || basDevp.getWrkNo()>9999)){
+// continue;
+// }
WrkMast wrkMast = wrkMastMapper.selectWrkMastUnstackingOne202(staNo);
if (Cools.isEmpty(wrkMast)){
continue;
@@ -3166,35 +3166,35 @@
// if (inSta.getStaNo() == 203 && devpThread.ioModeOf2F == IoModeType.PAKOUT_MODE) {
// continue;
// }
-
+ if (staProtocol.isEmptyMk()){
+ log.info("{}绔欑偣鏃犵墿锛屽紓甯革紒",staNo);
+ continue;
+ }
if (!staProtocol.isLoading()){
log.info("{}绔欑偣鏃犵墿锛屽紓甯革紒",staNo);
continue;
}
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
- if (staProtocol.isAutoing()
- && staProtocol.isLoading()
- && staProtocol.isInEnable()
- && (staProtocol.getWorkNo() == 0 || (staProtocol.getWorkNo()>9899 && staProtocol.getWorkNo()<10000))
- ) {//&& staProtocol.isPakMk() && !Cools.isEmpty(barcode)) {
-
+ if (staProtocol.isAutoing() && staProtocol.getWorkNo() == 0) {//&& staProtocol.isPakMk() && !Cools.isEmpty(barcode)) {
+// && staProtocol.isInEnable()
//浠诲姟瀹屾垚
- boolean result1 = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(3, staProtocol));
- Thread.sleep(100);
-
- staProtocol.setWorkNo(wrkMast.getWrkNo());
- staProtocol.setStaNo(144);
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(2, staProtocol));
+// boolean result1 = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(3, staProtocol));
+// Thread.sleep(100);
+ StaProtocol staProtocolnew = new StaProtocol();
+ staProtocolnew.setSiteId(staProtocol.getSiteId());
+ staProtocolnew.setWorkNo(wrkMast.getWrkNo());
+ staProtocolnew.setStaNo(144);
+ devpThread.setPakMk(staProtocolnew.getSiteId(), false);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(2, staProtocolnew));
if (!result) {
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触==>椹卞姩鐮佸灈浣嶆墭鐩樺墠杩涘け璐ワ紒");
}
wrkMast.setWrkSts(52L);
wrkMastMapper.updateById(wrkMast);
- Thread.sleep(100);
+// Thread.sleep(100);
//浠诲姟瀹屾垚
- boolean result2 = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(4, staProtocol));
+// boolean result2 = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(4, staProtocol));
}
}
@@ -3401,7 +3401,7 @@
for (int staNo : staNos){
BasDevp basDevp = basDevpService.selectById(staNo);
BasDevp basDevp135 = basDevpService.selectById(135);
- if (basDevp.getWrkNo()==0 || (basDevp.getWrkNo()<10000 && basDevp.getWrkNo()>9899) ){
+ if (basDevp.getWrkNo()==0){
continue;
}
if (basDevp135.getReportSign()!=0){
@@ -3427,8 +3427,8 @@
} else {
staProtocol135 = staProtocol135.clone();
}
- if (staProtocol135.getWorkNo()<9900 || staProtocol135.getWorkNo()>9999 || staProtocol135.getWorkNo()==0
- || !staProtocol135.isLoading() || !staProtocol135.isAutoing()){
+ if ( staProtocol135.getWorkNo()!=0
+ || !staProtocol135.isLoading() || !staProtocol135.isAutoing() || !staProtocol135.isEmptyMk()){
continue;
}
StaProtocol staProtocol = devpThread.getStation().get(staNo);
@@ -3474,21 +3474,25 @@
// }
//浠诲姟瀹屾垚
- boolean result1 = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(3, staProtocol135));
- try{
- Thread.sleep(100);
- }catch (Exception e){ }
+// boolean result1 = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(3, staProtocol135));
+// try{
+// Thread.sleep(100);
+// }catch (Exception e){ }
basDevp135.setReportSign(2);
basDevpService.updateById(basDevp135);
int workNo = commonService.getWorkNo(5);
- staProtocol135.setWorkNo(workNo);
- staProtocol135.setStaNo(144);
- devpThread.setPakMk(staProtocol135.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(2, staProtocol135));
+
+ StaProtocol staProtocolnew = new StaProtocol();
+ staProtocolnew.setSiteId(staProtocol135.getSiteId());
+ staProtocolnew.setWorkNo(workNo);
+ staProtocolnew.setStaNo(144);
+
+ devpThread.setPakMk(staProtocolnew.getSiteId(), false);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(2, staProtocolnew));
if (!result) {
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触==>椹卞姩鐮佸灈浣嶆墭鐩樺墠杩涘け璐ワ紒");
}
- boolean result2 = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(4, staProtocol135));
+// boolean result2 = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(4, staProtocol135));
}
}
--
Gitblit v1.9.1