From 4ea361f8b7fa5fa63c650832e6b5efa150cb6693 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期四, 24 四月 2025 09:59:37 +0800
Subject: [PATCH] 初步调试
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 42bebb2..cee0f9d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -426,8 +426,12 @@
ShuttleProtocol status1 = shuttleThread1.getStatus();
ShuttleProtocol status2 = shuttleThread2.getStatus();
List<String> loc = new ArrayList<>();
- loc.add(status1.getCurrentLocNo());
- loc.add(status2.getCurrentLocNo());
+ if (status1 != null) {
+ loc.add(status1.getCurrentLocNo());
+ }
+ if (status2 != null) {
+ loc.add(status2.getCurrentLocNo());
+ }
DevpSlave devpSlave = slaveProperties.getDevp().get(0);
// 閬嶅巻鍫嗗灈鏈哄嚭搴撶珯
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devpSlave.getId());
@@ -1215,9 +1219,9 @@
//鑾峰彇鎻愬崌鏈哄懡浠�
List<LiftCommand> liftCommands = liftThread.getPalletOutCommand(wrkMast.getWrkNo(), sourceLev, wrkMast.getStaNo());
LiftCommand liftCommand = liftCommands.get(0);
- if ( wrkMast.getStaNo()==1031){
+ if (wrkMast.getStaNo() == 1031) {
liftCommand.setTaskNo(wrkMast.getWrkNo());
- }else {
+ } else {
int deviceWrk = commonService.getWorkNo(8);//鐢熸垚鎻愬崌鏈鸿澶囧伐浣滃彿
liftCommand.setTaskNo(deviceWrk);//鏇存崲闅忔満浠诲姟鍙�
}
--
Gitblit v1.9.1