From 6e7575427ba0aec46d377719bc58ec0355bb335a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 09 十月 2022 14:24:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index ad76d25..332b43c 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -26,7 +26,6 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.CrnLiftPosType;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.enums.SlaveType;
@@ -118,36 +117,20 @@
continue;
}
vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
-// if (crnProtocol.getTaskNo()>0) {
-// WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
-// if (wrkMast != null) {
-// vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
-// }
-// } else {
-//
-// }
vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵��
- if (crnProtocol.statusType == com.zy.core.enums.CrnStatusType.WAITING) {
- vo.setStatus("绛夊緟纭");
- } else {
- vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵��
- }
+ vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵��
vo.setLoading(crnProtocol.getLoaded()==1?"鏈夌墿":"鏃犵墿"); // 鏈夌墿
vo.setBay(crnProtocol.getBay()); // 鍒�
vo.setLev(crnProtocol.getLevel()); // 灞�
- vo.setLiftPos(crnProtocol.getLiftPosType().desc);
+
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
- vo.setXLocation(crnProtocol.getWalkPos() == 1?"鏄�":"鍚�"); // 璧拌瀹氫綅
- vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"鍚�":"鏄�"); // 鍗囬檷瀹氫綅
+ vo.setLiftPos(crnProtocol.getLiftPosType().desc);
+ vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
+ vo.setWarnCode(String.valueOf(crnProtocol.getAlarm()));
if (crnProtocol.getAlarm() > 0) {
BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
- vo.setAlarm1(crnError==null?"鏈煡寮傚父":crnError.getErrName());
+ vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName());
}
-// vo.setAlarm1(String.valueOf(crnProtocol.getAlarm1()));
-// vo.setAlarm2(String.valueOf(crnProtocol.getAlarm2()));
-// vo.setAlarm3(String.valueOf(crnProtocol.getAlarm3()));
-// vo.setAlarm4(String.valueOf(crnProtocol.getAlarm4()));
-
}
return R.ok().add(list);
}
@@ -187,7 +170,7 @@
}
vo.setXspeed(crnProtocol.getXSpeed()); // 璧拌閫熷害锛坢/min)
vo.setYspeed(crnProtocol.getYSpeed()); // 鍗囬檷閫熷害锛坢/min)
- vo.setZspeed(crnProtocol.getZSpeed()); // 鍙夌墮閫熷害锛坢/min)
+// vo.setZspeed(crnProtocol.getZSpeed()); // 鍙夌墮閫熷害锛坢/min)
vo.setXdistance(crnProtocol.getXDistance()); // 璧拌璺濈(Km)
vo.setYdistance(crnProtocol.getYDistance()); // 鍗囬檷璺濈(Km)
vo.setXduration(crnProtocol.getXDuration()); // 璧拌鏃堕暱(H)
@@ -304,6 +287,23 @@
LocMast loc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getDestinationPosX())
.eq("bay1", command.getDestinationPosY()).eq("lev1", command.getDestinationPosZ()));
VersionUtils.locMoveCheckLocType(sourceLoc, loc);
+ return crnControl(command)?R.ok():R.error();
+ }
+
+ @ManagerAuth(memo = "绉昏溅")
+ @PostMapping("/operator/steMove")
+ public R crnSteMove(CrnOperatorParam param){
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ command.setTaskMode(CrnTaskModeType.STE_MOVE); // 浠诲姟妯″紡
+ command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓
+ command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪
+ command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰
+ command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
return crnControl(command)?R.ok():R.error();
}
@@ -437,6 +437,7 @@
crnCommand.setCrnNo(crn.getId()); // 鍫嗗灈鏈虹紪鍙�
crnCommand.setTaskMode(CrnTaskModeType.CLEAR);
crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ crnCommand.setCommand((short) 0); // 浠诲姟瀹屾垚纭浣�
// 寤舵椂鍙戦��
Thread.sleep(1000L);
if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, crnCommand))) {
--
Gitblit v1.9.1