From 9ff358b13905a756c535bda8f70e30fe29bd2925 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 08 一月 2025 08:58:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index c0ca6d7..0d5816b 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -89,7 +89,7 @@
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "灏�" : "澶�"); //楂樹綆搴撲綅
vo.setLocType1(devp.getLocType1$());
vo.setAutoIn(staProtocol.isEmptyInPalletRequire()?"Y":"N");
- vo.setAutoIn(staProtocol.isEmptyOutPalletRequire()?"Y":"N");
+ vo.setAutoOut(staProtocol.isEmptyOutPalletRequire()?"Y":"N");
// vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
}
return R.ok().add(list);
@@ -232,7 +232,8 @@
staProtocol.setStaNo(staNo);
}
if (pakMk != null) {
- staProtocol.setPakMk(pakMk.equals("Y"));
+ devpThread.setPakMk(staProtocol.getSiteId(),pakMk.equals("Y"));
+// staProtocol.setPakMk(pakMk.equals("Y"));
}
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (result) {
--
Gitblit v1.9.1