From f939d20b9e587fa438a8b06848ab85e903ddbd46 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 12 一月 2021 20:25:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 29f65a1..4b5edf5 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -14,11 +14,14 @@
import com.zy.asrs.domain.vo.CrnStateTableVo;
import com.zy.asrs.entity.BasCrnError;
import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.impl.MainServiceImpl;
+import com.zy.asrs.utils.VersionUtils;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -61,6 +64,8 @@
private BasCrnpService basCrnpService;
@Autowired
private MainServiceImpl mainService;
+ @Autowired
+ private LocMastService locMastService;
@ManagerAuth(memo = "杩涜涓殑鍛戒护")
@@ -119,21 +124,32 @@
//
// }
vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵��
- vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵��
+ if (crnProtocol.getTaskFinish() == 1) {
+ vo.setStatus("绛夊緟纭");
+ } else {
+ vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵��
+ }
vo.setLoading(crnProtocol.getLoaded()==1?"鏈夌墿":"鏃犵墿"); // 鏈夌墿
vo.setBay(crnProtocol.getBay()); // 鍒�
vo.setLev(crnProtocol.getLevel()); // 灞�
- vo.setXOrigin(crnProtocol.getBay()==1?"鏄�":"鍚�"); // 璧拌鍘熺偣
- vo.setYOrigin(crnProtocol.getLevel()==1?"鏄�":"鍚�"); // 鍗囬檷鍘熺偣
+ vo.setLiftPos(crnProtocol.getLiftPosType().desc);
+ if (crnProtocol.getPlatformHigh()) {
+ vo.setSitePos("绔欏彴楂樹綅");
+ }
+ if (crnProtocol.getPlatformLow()) {
+ vo.setSitePos("绔欏彴楂樹綅");
+ }
+// vo.setXOrigin(crnProtocol.getBay()==1?"鏄�":"鍚�"); // 璧拌鍘熺偣
+// vo.setYOrigin(crnProtocol.getLevel()==1?"鏄�":"鍚�"); // 鍗囬檷鍘熺偣
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
vo.setXLocation(crnProtocol.getWalkPos() == 1?"鏄�":"鍚�"); // 璧拌瀹氫綅
vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"鍚�":"鏄�"); // 鍗囬檷瀹氫綅
// vo.setStop(crnProtocol.getCrnError1().controlStop||crnProtocol.getCrnError1().mainStop||crnProtocol.getCrnError1().remoteStop?"鏄�":"鍚�"); // 鎬ュ仠
- if (vo.getCrnNo() == 2) {
- vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()-1000)); // 寮傚父鐮�
- } else {
- vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1())); // 寮傚父鐮�
- }
+ vo.setAlarm1(String.valueOf(crnProtocol.getAlarm1()));
+ vo.setAlarm2(String.valueOf(crnProtocol.getAlarm2()));
+ vo.setAlarm3(String.valueOf(crnProtocol.getAlarm3()));
+ vo.setAlarm4(String.valueOf(crnProtocol.getAlarm4()));
+// vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1())); // 寮傚父鐮�
}
return R.ok().add(list);
@@ -236,7 +252,6 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
- staNoProcess(param, command);
return crnControl(command)?R.ok():R.error();
}
@@ -254,7 +269,6 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
- staNoProcess(param, command);
return crnControl(command)?R.ok():R.error();
}
@@ -272,7 +286,11 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
- staNoProcess(param, command);
+ LocMast sourceLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getSourcePosX())
+ .eq("bay1", command.getSourcePosY()).eq("lev1", command.getSourcePosZ()));
+ 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();
}
@@ -290,7 +308,6 @@
command.setDestinationPosX(param.getStaNo()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
- staNoProcess(param, command);
return crnControl(command)?R.ok():R.error();
}
--
Gitblit v1.9.1