From a77530a0e917f8d2dca1bae55a3730471c8e10a2 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期三, 02 七月 2025 09:22:32 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/asrs/controller/SiteController.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 94 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index b2e0413..ada482c 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -105,18 +105,21 @@
StaProtocol staProtocol = station.get(devp.getDevNo());
if (null == staProtocol) { continue; }
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
- vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
- vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
- vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
- vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
+ vo.setAutoing(staProtocol.isAutoing()?"鑷姩":"闈炶嚜鍔�"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading()?"鏈夌墿":"鏃犵墿"); // 鏈夌墿
+ vo.setInEnable(staProtocol.isInEnable()?"鍙叆":"涓嶅彲鍏�"); // 鍙叆
+ vo.setOutEnable(staProtocol.isOutEnable()?"鍙嚭":"涓嶅彲鍑�"); // 鍙嚭
+ vo.setPakMk(staProtocol.isPakMk()? "鏈攣瀹�":"宸查攣瀹�"); // 鍏ュ簱鏍囪
+ vo.setEmptyMk(staProtocol.isEmptyMk()?"绌烘澘":"闈炵┖鏉�"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
- vo.setWeight(staProtocol.getGrossWt().toString());
+ vo.setWeight(staProtocol.getGrossWt().toString()+"kg");
vo.setBarcode(staProtocol.getBarcodeNow());
vo.setErrorDev(staProtocol.getErrorDev$());
+ vo.setPakMkRun(staProtocol.isPakMkRun()? "鏈攣瀹�":"宸查攣瀹�"); // 灏忚溅浠诲姟涓嬪彂鏍囪
+ vo.setPakMkTask(staProtocol.isPakMkTask()? "鏈攣瀹�":"宸查攣瀹�"); // 灏忚溅浠诲姟涓嬪彂鏍囪
+ vo.setPakMkWalk(staProtocol.isPakMkWalk()? "鏈攣瀹�":"宸查攣瀹�"); // 灏忚溅浠诲姟涓嬪彂鏍囪
}
return R.ok().add(list);
}
@@ -236,6 +239,90 @@
}
return R.error("鏇存柊澶辫触");
}
+
+ @PostMapping("/detl/pakMk")
+ @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
+ public R siteDetlPakMk(@RequestParam Integer devNo,
+ @RequestParam Integer workNo,
+ @RequestParam Integer staNo,
+ @RequestParam(required = false) String pakMk,
+ @RequestParam(required = false) Boolean inEnable,
+ @RequestParam(required = false) Boolean outEnable
+ ) {
+ BasDevp basDevp = basDevpService.selectById(devNo);
+ if (basDevp == null) {
+ return R.error("绔欑偣涓嶅瓨鍦�");
+ }
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ devpThread.setPakMk(devNo, true);
+ return R.ok("鏇存柊鎴愬姛");
+ }
+ return R.error("鏇存柊澶辫触");
+ }
+
+ @PostMapping("/detl/pakMkRun")
+ @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
+ public R siteDetlPakMkRun(@RequestParam Integer devNo,
+ @RequestParam Integer workNo,
+ @RequestParam Integer staNo,
+ @RequestParam(required = false) String pakMk,
+ @RequestParam(required = false) Boolean inEnable,
+ @RequestParam(required = false) Boolean outEnable
+ ) {
+ BasDevp basDevp = basDevpService.selectById(devNo);
+ if (basDevp == null) {
+ return R.error("绔欑偣涓嶅瓨鍦�");
+ }
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ devpThread.setPakMkRun(devNo, true);
+ return R.ok("鏇存柊鎴愬姛");
+ }
+ return R.error("鏇存柊澶辫触");
+ }
+
+ @PostMapping("/detl/pakMkTask")
+ @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
+ public R siteDetlPakMkTask(@RequestParam Integer devNo,
+ @RequestParam Integer workNo,
+ @RequestParam Integer staNo,
+ @RequestParam(required = false) String pakMk,
+ @RequestParam(required = false) Boolean inEnable,
+ @RequestParam(required = false) Boolean outEnable
+ ) {
+ BasDevp basDevp = basDevpService.selectById(devNo);
+ if (basDevp == null) {
+ return R.error("绔欑偣涓嶅瓨鍦�");
+ }
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ devpThread.setPakMkTask(devNo, true);
+ return R.ok("鏇存柊鎴愬姛");
+ }
+ return R.error("鏇存柊澶辫触");
+ }
+
+ @PostMapping("/detl/pakMkWalk")
+ @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
+ public R siteDetlPakMkWalk(@RequestParam Integer devNo,
+ @RequestParam Integer workNo,
+ @RequestParam Integer staNo,
+ @RequestParam(required = false) String pakMk,
+ @RequestParam(required = false) Boolean inEnable,
+ @RequestParam(required = false) Boolean outEnable
+ ) {
+ BasDevp basDevp = basDevpService.selectById(devNo);
+ if (basDevp == null) {
+ return R.error("绔欑偣涓嶅瓨鍦�");
+ }
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ devpThread.setPakMkWalk(devNo, true);
+ return R.ok("鏇存柊鎴愬姛");
+ }
+ return R.error("鏇存柊澶辫触");
+ }
@PostMapping("/detl/out")
@ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
public R siteDetlout(@RequestParam Integer devNo,
--
Gitblit v1.9.1