From 3c8b4f87fa61885f3c28d00eb6b9c9abde9bd462 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 01 八月 2023 16:25:02 +0800
Subject: [PATCH] 检测穿梭车是否在提升机内
---
src/main/java/com/zy/asrs/controller/SiteController.java | 48 ------------------------------------------------
1 files changed, 0 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 6bf8805..b6ae251 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -75,54 +75,6 @@
return R.ok().add(res);
}
- @PostMapping("/io/mode/action/site")
- @ManagerAuth(memo = "鍏呯數鎺у埗")
- public R ioModeAction(@RequestParam("floor") Integer floor, @RequestParam("charge") Boolean charge){
- if (null != wrkChargeService.selectWorking(null, WrkChargeType.charge)) {
- return R.error("鐩墠瀛樺湪灏忚溅鍏呯數浠诲姟锛岃绋嶅悗鍐嶈瘯");
- }
- if (null != wrkChargeService.selectWorking(null, WrkChargeType.reset)) {
- return R.error("鐩墠瀛樺湪灏忚溅澶嶄綅浠诲姟锛岃绋嶅悗鍐嶈瘯");
- }
- if (charge) {
- return R.ok();
- }
-
- SteChargeType steCharge = SteChargeType.get(floor);
- assert steCharge != null;
- Integer steNo = basSteService.hasCarOfLocNo(steCharge.locNo);
- if (Cools.isEmpty(steNo)) {
- return R.error(steNo + "鍙峰皬杞︿笉鍦�" + floor + "鍙峰厖鐢垫々锛岃妫�鏌ュ皬杞﹀畾浣�");
- }
- SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
- SteProtocol steProtocol = steThread.getSteProtocol();
- BasSte basSte = basSteService.selectById(steNo);
- if (steProtocol.getMode() == 0) {
- return R.error(steNo + "鍙峰皬杞︾绾匡紝鏃犳硶鎿嶄綔");
- }
- if (!steProtocol.getStatusType().equals(SteStatusType.IDLE)) {
- return R.error(steNo + "鍙峰皬杞︿笉鏄┖闂诧紝鏃犳硶鎿嶄綔");
- }
- WrkCharge wrkCharge = wrkChargeService.selectWorking(steNo, WrkChargeType.reset);
- if (wrkCharge == null) {
- // 寮�濮嬬┛姊溅澶嶄綅浠诲姟
- wrkCharge = new WrkCharge();
- wrkCharge.setSteNo(steNo);
- wrkCharge.setWrkNo(commonService.getChargeWorkNo(6));
- wrkCharge.setWrkSts(41L); // 41.灏忚溅鍑嗗澶嶄綅
- wrkCharge.setCrnNo(2); // 鍥哄畾2鍙峰爢鍨涙満
- wrkCharge.setIoPri((double) 10);
- wrkCharge.setSourceLocNo(steCharge.locNo);
- wrkCharge.setLocNo(basSte.getIdleLoc());
- wrkCharge.setMemo("reset");
- wrkCharge.setAppeTime(new Date());
- if (!wrkChargeService.insert(wrkCharge)) {
- News.error("淇濆瓨{}鍙风┛姊溅澶嶄綅浠诲姟澶辫触!!!", steNo);
- }
- }
- return R.ok(steNo + "鍙峰皬杞﹀噯澶囩寮�" + floor + "鍙峰厖鐢垫々");
- }
-
@PostMapping("/table/site")
@ManagerAuth(memo = "绔欑偣淇℃伅琛�")
public R siteTable(){
--
Gitblit v1.9.1