From 0f4f4a7b27a1de2bc1ad6752881f3f9cb97f1e99 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 08 六月 2023 09:49:08 +0800
Subject: [PATCH] yml
---
src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index ed473bd..b264d65 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -1,8 +1,10 @@
package com.zy.core.model.protocol;
import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.BasShuttleErr;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.BasShuttleErrService;
import com.zy.asrs.service.BasShuttleService;
import com.zy.asrs.service.LocMastService;
@@ -41,12 +43,6 @@
*/
private Integer protocolStatus;
-// /**
-// * 灏忚溅褰撳墠鏄惁鏈夎揣
-// * true:鏈夎揣锛宖alse锛氭棤璐�
-// */
-// private Boolean loading = false;
-
/**
* 褰撳墠灏忚溅鐘舵�佹灇涓�
*/
@@ -58,7 +54,7 @@
private String sourceLocNo;
/**
- * 鐩爣搴撲綅
+ * 鐩爣搴撲綅f
*/
private String locNo;
@@ -281,6 +277,10 @@
// 鏄惁婊¤冻鍏呯數鐘舵��
public Boolean isRequireCharge() {
+ if (this.busyStatusType == null || this.pakMk == null || this.errorCodeType == null || this.taskNo == null) {
+ return false;
+ }
+
boolean res = this.busyStatusType.equals(ShuttleStatusType.IDLE)
&& this.pakMk.equals(true)
&& this.errorCodeType.equals(ShuttleErrorCodeType.NORMAL)
@@ -289,10 +289,10 @@
if (!res) {
return res;
} else {
- // 鐢甸噺
+ // 鐢甸噺灏忎簬闃堝�兼垨鐢靛帇灏忎簬48V锛岄渶瑕佽繘琛屽厖鐢�
try {
Integer chargeLine = SpringUtils.getBean(BasShuttleService.class).selectById(this.shuttleNo).getChargeLine();
- return this.getBatteryPower$() < chargeLine;
+ return this.getBatteryPower$() < chargeLine || this.currentVoltage < 480;
} catch (Exception e) {
News.error("fail", e);
return false;
@@ -323,4 +323,24 @@
return basShuttleErr.getErrName();
}
+ public void setCurrentCode(Short currentCode) {
+ this.currentCode = currentCode;
+ LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
+ if (locMastService != null) {
+ LocMast locMast = locMastService.queryByQrCode(currentCode.toString());
+ if (locMast == null) {
+ //鏌ヤ笉鍒板簱浣嶅彿锛屾煡璇㈡槸鍚︿负绔欑偣
+ BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
+ if (basDevpService != null) {
+ BasDevp basDevp = basDevpService.queryByLocNo(currentCode.toString());
+ if (basDevp != null) {
+ this.locNo = basDevp.getLocNo();
+ }
+ }
+ }else{
+ this.locNo = locMast.getLocNo();
+ }
+ }
+ }
+
}
--
Gitblit v1.9.1