From b81d0dbcf5f0899a1bf8f2b9185afdcbc5d270ac Mon Sep 17 00:00:00 2001
From: cp <513960435@qq,com>
Date: 星期三, 17 一月 2024 17:19:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs
---
src/main/java/com/zy/asrs/controller/SiteController.java | 2 +-
1 files changed, 1 insertions(+), 1 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..c9be631 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);
--
Gitblit v1.9.1