From 4ac5ff223ee7757b55d86b0f34b74152874d68c9 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 23 九月 2024 15:56:11 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java
index a25d60e..ddab9df 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java
@@ -738,11 +738,13 @@
@Override
public ShuttleCommand getLiftCommand(Integer taskNo, Boolean lift) {
+ int deviceTaskNo = this.generateDeviceTaskNo(taskNo, lift ? MotionCtgType.SHUTTLE_PALLET_LIFT : MotionCtgType.SHUTTLE_PALLET_DOWN);
+
HashMap<String, Object> body = new HashMap<>();
body.put("messageName", "actionOrder");
body.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
body.put("deviceNo", Integer.parseInt(this.device.getDeviceNo()));
- body.put("taskId", taskNo);
+ body.put("taskId", deviceTaskNo);
body.put("action", lift ? 1 : 2);
ShuttleCommand command = new ShuttleCommand();
@@ -754,11 +756,13 @@
@Override
public ShuttleCommand getChargeCommand(Integer taskNo, Boolean charge) {
+ int deviceTaskNo = this.generateDeviceTaskNo(taskNo, charge ? MotionCtgType.SHUTTLE_CHARGE_ON : MotionCtgType.SHUTTLE_CHARGE_OFF);
+
HashMap<String, Object> body = new HashMap<>();
body.put("messageName", "runOrder");
body.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
body.put("deviceNo", Integer.parseInt(this.device.getDeviceNo()));
- body.put("taskId", taskNo);
+ body.put("taskId", deviceTaskNo);
body.put("action", charge ? 3 : 4);
ShuttleCommand command = new ShuttleCommand();
--
Gitblit v1.9.1