From 8ffff6a25190ee55bd981d2d1825f0dd813dc4e9 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 25 六月 2024 16:19:36 +0800
Subject: [PATCH] 一期输送线不回退
---
src/main/java/com/zy/asrs/controller/SiteController.java | 21 +++++++++++++++++++--
1 files changed, 19 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 bbcb229..a6d5e48 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -80,7 +80,16 @@
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
- vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
+ if (staProtocol.isLow()) {
+ vo.setLocType1("浣�"); // 浣庡簱浣�
+ } else if (staProtocol.isHigh()){
+ vo.setLocType1("楂�"); // 楂樺簱浣�
+ } else if (staProtocol.isMedium()) {
+ vo.setLocType1("涓�"); //涓簱浣�
+ } else if (staProtocol.isMedium_high()) {
+ vo.setLocType1("涓珮"); //涓珮搴撲綅
+ }
+
}
return R.ok().add(list);
}
@@ -155,7 +164,15 @@
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() ? "浣�" : "楂�"); //楂樹綆搴撲綅
+ if (staProtocol.isLow()) {
+ vo.setLocType1("浣�"); // 浣庡簱浣�
+ } else if (staProtocol.isHigh()){
+ vo.setLocType1("楂�"); // 楂樺簱浣�
+ } else if (staProtocol.isMedium()) {
+ vo.setLocType1("涓�"); //涓簱浣�
+ } else if (staProtocol.isMedium_high()) {
+ vo.setLocType1("涓珮"); //涓珮搴撲綅
+ }
return R.ok().add(vo);
}
}
--
Gitblit v1.9.1