From aa8638651f5f488ccc714a6e73e5b351bdfbde2e Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 27 十月 2025 17:57:51 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/SiteController.java | 4 +++-
1 files changed, 3 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 acdda6d..06aa577 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -73,7 +73,7 @@
for (BasDevp devp : basDevps) {
SiteTableVo vo = new SiteTableVo();
vo.setDevNo(devp.getDevNo()); // 绔欑偣缂栧彿
-
+ vo.setWorkNo(devp.getWrkNo());
list.add(vo);
StaProtocol staProtocol = station.get(devp.getDevNo());
if (null == staProtocol) { continue; }
@@ -86,6 +86,8 @@
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
+ vo.setFull(staProtocol.isFull()?"Y":"N"); // 婊�
+ vo.setBarcode(staProtocol.getBarcode()); // 鏉＄爜
}
return R.ok().add(list);
--
Gitblit v1.9.1