From 29742997e749cd38a83f7d70b125124832c16a27 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 24 一月 2024 11:35:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 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 7aeadc4..a1fb9cc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -602,6 +602,11 @@
case 5://鏀�//鎷嗙洏
stnToCrnStnPick4();
return;
+ default:
+ return;
+ }
+ } else if (staProtocol.isAutoing() && staProtocol.isLoading()){
+ switch (sign){
case 3://婊℃斁
case 6://婊℃斁
stnToCrnStnPick5();
@@ -618,8 +623,7 @@
* 2妤�212鍛煎彨绌烘澘
*/
public synchronized void stnToCrnStnPick3() {
- int workNo = 20211;
- WrkMast wrkMast = wrkMastMapper.selectPakInStep3(workNo);
+ WrkMast wrkMast = wrkMastMapper.selectWrkMastUnstackingOne212();
if (Cools.isEmpty(wrkMast) || wrkMast.getWrkSts()!=61){//61銆佺瓑寰呯┖鏉�
return;
}
@@ -640,7 +644,7 @@
|| (staProtocol.getWorkNo()>9899 && staProtocol.getWorkNo()<10000)) ){
boolean result1 = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
- staProtocol.setWorkNo(workNo-1);
+ staProtocol.setWorkNo(wrkMast.getWrkNo()-1);
staProtocol.setStaNo(driveSta.getStaNo()==215? 217:221);
boolean result2 = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (!result2) {
@@ -660,8 +664,7 @@
* 2妤�212鍛煎彨绌烘澘
*/
public synchronized void stnToCrnStnPick4() {
- int workNo = 20211;
- WrkMast wrkMast = wrkMastMapper.selectPakInStep3(workNo);
+ WrkMast wrkMast = wrkMastMapper.selectWrkMastUnstackingOne212();
if (Cools.isEmpty(wrkMast) || wrkMast.getWrkSts()!=62){//62銆佺瓑寰呭皬杞︽惉杩�
return;
}
@@ -686,10 +689,10 @@
}
if (staProtocol212.isAutoing() && !staProtocol212.isLoading() && staProtocol212.getWorkNo()==0){
if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo()==0
- || (staProtocol.getWorkNo()>9899 && staProtocol.getWorkNo()<10000) || staProtocol.getWorkNo()==20210) ){
- boolean result1 = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
+ || (staProtocol.getWorkNo()>9899 && staProtocol.getWorkNo()<10000) || staProtocol.getWorkNo()==wrkMast.getWrkNo()-1) ){
+// boolean result1 = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
- staProtocol.setWorkNo(workNo-1);
+ staProtocol.setWorkNo(wrkMast.getWrkNo());
staProtocol.setStaNo(212);
boolean result2 = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (!result2) {
@@ -698,7 +701,7 @@
wrkMast.setWrkSts(63L);
wrkMastMapper.updateById(wrkMast);
- boolean result3 = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, staProtocol));
+// boolean result3 = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, staProtocol));
return;
}
}
@@ -710,8 +713,7 @@
* 2妤�212鍛煎彨绌烘澘
*/
public synchronized void stnToCrnStnPick5() {
- int workNo = 20211;
- WrkMast wrkMast = wrkMastMapper.selectPakInStep3(workNo);
+ WrkMast wrkMast = wrkMastMapper.selectWrkMastUnstackingOne212();
if (Cools.isEmpty(wrkMast) || wrkMast.getWrkSts()!=63){//63銆佺瓑寰呭畬鎴�
return;
}
@@ -724,13 +726,13 @@
} else {
staProtocol = staProtocol.clone();
}
- if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo()==workNo ){
- boolean result1 = MessageQueue.offer(SlaveType.Devp, 2, new Task(3, staProtocol));
+ if (staProtocol.isAutoing() && staProtocol.isLoading()){
+// boolean result1 = MessageQueue.offer(SlaveType.Devp, 2, new Task(3, staProtocol));
wrkMast.setWrkSts(64L);
wrkMastMapper.updateById(wrkMast);
- boolean result3 = MessageQueue.offer(SlaveType.Devp, 2, new Task(4, staProtocol));
+// boolean result3 = MessageQueue.offer(SlaveType.Devp, 2, new Task(4, staProtocol));
return;
}
}
@@ -2289,6 +2291,10 @@
ledCommand.setTitle("绌烘澘鍑哄簱");
ledCommand.setEmptyMk(true);
break;
+ case 212:
+ ledCommand.setTitle("绌烘澘鍑哄簱");
+ ledCommand.setEmptyMk(true);
+ break;
default:
log.error("浠诲姟鍏ュ嚭搴撶被鍨嬮敊璇紒锛侊紒[宸ヤ綔鍙凤細{}] [鍏ュ嚭搴撶被鍨嬶細{}]", wrkMast.getWrkNo(), wrkMast.getIoType());
break;
@@ -3235,9 +3241,9 @@
&& staProtocol.isLoading()
&& basDevp.getReportSign()==0
) {//&& staProtocol.isPakMk() && !Cools.isEmpty(barcode)) {
- if (true){
- return;
- }
+// if (true){
+// return;
+// }
//浠诲姟瀹屾垚
boolean result1 = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(3, staProtocol135));
--
Gitblit v1.9.1