From bdd676ea0246acd555fff9c98c8d0bf24865437c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 19 一月 2026 17:42:50 +0800
Subject: [PATCH] WCS功能完善
---
src/main/java/com/zy/controller/SiteController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/controller/SiteController.java b/src/main/java/com/zy/controller/SiteController.java
index 08107b6..4495b0a 100644
--- a/src/main/java/com/zy/controller/SiteController.java
+++ b/src/main/java/com/zy/controller/SiteController.java
@@ -50,8 +50,8 @@
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);
+ map2.put("modeVal", devpThread.ioModeOf101.id);
+ map2.put("modeDesc", devpThread.ioModeOf101.desc);
res.add(map2);
}
return R.ok().add(res);
@@ -83,6 +83,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 ? "楂�" : "浣�");
}
@@ -151,8 +152,21 @@
return R.error("plc宸叉帀绾�");
}
+ @PostMapping("/startScan")
+ @ManagerAuth(memo = "瑙﹀彂鎵爜",value = ManagerAuth.Auth.NONE)
+ public R startScan(@RequestParam Integer siteId){
+ SiemensDevpThread siemensDevpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = siemensDevpThread.getStation().get(siteId).clone();
+ boolean offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
+ if (!offer) {
+ return R.parse("瑙﹀彂鎵爜鍛戒护涓嬪彂澶辫触");
+ }
+
+ return R.ok("瑙﹀彂鎵爜涓嬪彂鎴愬姛");
+ }
+
@PostMapping("/detl/update")
- @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
+ @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁",value = ManagerAuth.Auth.NONE)
public R siteDetlUpdate(@RequestParam Integer siteId,
@RequestParam Integer workNo,
@RequestParam Short staNo,
--
Gitblit v1.9.1