From 089775b8956ae5ecc65b49ab1859f36ca76678d8 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 27 一月 2024 08:31:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 910788e..a8f376d 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -84,8 +84,8 @@
vo.setPakMk(staProtocol.isPakMk() ? "Y" : "N"); // 鍏ュ簱鏍囪
vo.setEmptyMk(staProtocol.isEmptyMk() ? "Y" : "N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
-// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
- vo.setLocType1(devp.getDevNo() == 102 ? "楂�" : "浣�");
+ vo.setLocType1(staProtocol.isWeight() ? "閲�" : "杞�"); //楂樹綆搴撲綅
+// vo.setLocType1(devp.getDevNo() == 102 ? "楂�" : "浣�");
}
return R.ok().add(list);
}
@@ -160,7 +160,7 @@
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() ? "浣�" : "楂�"); //楂樹綆搴撲綅
+ vo.setLocType1(staProtocol.isWeight() ? "閲�" : "杞�");
return R.ok().add(vo);
}
}
--
Gitblit v1.9.1