From b48ab507b4cbbe3cf1cf11ac12b1d945478cc662 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 10 六月 2025 19:27:29 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/zy/controller/SiteController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/controller/SiteController.java b/src/main/java/com/zy/controller/SiteController.java
index 08107b6..80b54bd 100644
--- a/src/main/java/com/zy/controller/SiteController.java
+++ b/src/main/java/com/zy/controller/SiteController.java
@@ -50,8 +50,6 @@
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
Map<String, Object> map2 = new HashMap<>();
map2.put("floor", 2);
- map2.put("modeVal", devpThread.ioModeOf2F.id);
- map2.put("modeDesc", devpThread.ioModeOf2F.desc);
res.add(map2);
}
return R.ok().add(res);
@@ -83,6 +81,7 @@
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
+ vo.setWorkNo(staProtocol.getWorkNo());
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
}
@@ -179,6 +178,17 @@
}
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (result) {
+ int devId = 0;
+ switch (siteId) {
+ case 1081: devId = 4;break;
+ case 1084: devId = 5;break;
+ case 1087: devId = 6;break;
+ default:
+ }
+ if(devId != 0){ // 鍚屾椂缁欑綈瑁呯嚎鍐欏彲鍑�
+ staProtocol.setPlaceableFlag(1);
+ MessageQueue.offer(SlaveType.Devp, devId, new Task(5, staProtocol));
+ }
return R.ok();
} else {
return R.error("涓嬪彂鍛戒护澶辫触");
--
Gitblit v1.9.1