From 93cf1a27f5d4ff504d691d68c40a622a6424e782 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 14 五月 2025 09:40:20 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/asrs/controller/SiteController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index f5aaa7f..309d83c 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -84,14 +84,15 @@
vo.setPakMk(staProtocol.isPakMk() ? "Y" : "N"); // 鍏ュ簱鏍囪
vo.setEmptyMk(staProtocol.isEmptyMk() ? "Y" : "N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
+ vo.setBarcode(staProtocol.getBarcode());
vo.setFinishWorkNo(staProtocol.getFinishWorkNo());
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
//vo.setLocType1(staProtocol.getWeight() == 1 ? "閲�" : "杞�");
vo.setFinishWorkNo(staProtocol.getFinishWorkNo());
- if (staProtocol.getSiteId() == 1031 || staProtocol.getSiteId() == 1032) {
- vo.setOutInModel((staProtocol.getOutInModel() != null && staProtocol.getOutInModel() == 1) ? "鍑�" : "鍏�");
-
- }
+// if (staProtocol.getSiteId() == 1031 || staProtocol.getSiteId() == 1032) {
+// vo.setOutInModel((staProtocol.getOutInModel() != null && staProtocol.getOutInModel() == 1) ? "鍑�" : "鍏�");
+//
+// }
}
return R.ok().add(list);
}
--
Gitblit v1.9.1