From 97c788f31a57b4e8c3fc8091dc29aab598adeebb Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期日, 04 一月 2026 08:07:00 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/controller/SiteController.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 86c538d..7926976 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -14,6 +14,7 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
+import com.zy.core.model.command.LiftCommand;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.DevpThread;
@@ -156,7 +157,6 @@
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 闇�姹�1
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
- vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
return R.ok().add(vo);
}
}
@@ -176,26 +176,27 @@
Map<Integer, StaProtocol> station = devpThread.getStation();
for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
if (siteId.equals(entry.getKey())) {
- StaProtocol staProtocol = entry.getValue();
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
- if (workNo != null) {
- staProtocol.setWorkNo(workNo);
- }
- if (staNo != null) {
- staProtocol.setStaNo(staNo);
- }
- if (palletSize != null) {
- staProtocol.setPalletSize(palletSize);
- }
- if (pakMk != null) {
- staProtocol.setPakMk(pakMk.equals("Y"));
- }
+// StaProtocol staProtocol = entry.getValue();
+// if (staProtocol == null) {
+// continue;
+// } else {
+// staProtocol = staProtocol.clone();
+// }
+// if (workNo != null) {
+// staProtocol.setWorkNo(workNo);
+// }
+// if (staNo != null) {
+// staProtocol.setStaNo(staNo);
+// }
+// if (pakMk != null) {
+// staProtocol.setPakMk(pakMk.equals("Y"));
+// }
+ LiftCommand command = new LiftCommand();
+ command.setWorkNo(Integer.valueOf(workNo));
+ command.setSourceStaNo(siteId);
+ command.setTargetStaNo(Integer.valueOf(staNo));
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, command));
if (result) {
return R.ok();
} else {
--
Gitblit v1.9.1