From ad67399e14815baa028564c0edce3fec3c414914 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 13 六月 2024 09:01:39 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
index 6634dc1..4862e33 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
@@ -219,7 +219,10 @@
return R.error("绌挎杞︿笉鍦ㄧ嚎");
}
ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
- if (Utils.getLev(shuttleProtocol.getCurrentLocNo()) != Utils.getLev(param.getDestSite())) {
+ if (shuttleProtocol == null) {
+ return R.error("绌挎杞︿笉鍦ㄧ嚎");
+ }
+ if (Utils.getLev(shuttleProtocol.getCurrentLocNo()) != Utils.getLev(param.getDestLoc())) {
return R.error("绌挎杞﹀拰鐩爣浣嶇疆涓嶅湪鍚屼竴妤煎眰");
}
@@ -237,7 +240,7 @@
task.setPriority(priority);
task.setOriginSite(null);
task.setOriginLoc(null);
- task.setDestSite(param.getDestSite());
+ task.setDestSite(param.getDestLoc());
task.setDestLoc(null);
task.setIoTime(new Date());
task.setStartTime(new Date());
--
Gitblit v1.9.1