From aad5ff1dbc5fb61ad5a01d13573560ed5aae9b04 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 07 十月 2025 13:17:35 +0800
Subject: [PATCH] #和得服务器
---
src/main/java/com/zy/asrs/controller/SiteController.java | 11 ++++++++++-
1 files changed, 10 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 e6b9711..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);
@@ -253,6 +255,13 @@
vo.setPlcDesc("椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
vo.setError("椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
+ /*
+ * 瀹滅瀹氬埗 150绔欑偣寮傚父淇℃伅锛氬ぇ鎵樼洏鐩殑绔欓敊璇�
+ * */
+ if (entry.getKey()==150){
+ vo.setPlcDesc("150绔欑偣澶ф墭鐩樼洰鐨勭珯閿欒");
+ vo.setError("150绔欑偣澶ф墭鐩樼洰鐨勭珯閿欒");
+ }
list.add(vo);
}
if (staProtocol.isFrontErr()){
--
Gitblit v1.9.1