From a68bf17ab81df98882e19b79628e6876bb260468 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 18 六月 2025 10:04:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs
---
src/main/java/com/zy/asrs/utils/Utils.java | 100 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 88 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index d8dd70e..e614247 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -1,41 +1,48 @@
package com.zy.asrs.utils;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.WrkMastService;
+import com.zy.common.model.NavigateNode;
+import com.zy.common.model.enums.NavigationMapType;
import com.zy.common.utils.NavigatePositionConvert;
+import com.zy.common.utils.NavigateUtils;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.ShuttleSlave;
import com.zy.core.model.protocol.ShuttleProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.ShuttleThread;
-import java.text.DecimalFormat;
-import java.util.*;
-/**
- * Created by vincent on 2020/8/27
- */
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+
public class Utils {
private static final DecimalFormat fmt = new DecimalFormat("##0.00");
- public static float scale(Float f){
+ public static float scale(Float f) {
if (f == null || f == 0f || Float.isNaN(f)) {
return 0f;
}
return (float) Arith.multiplys(2, f, 1);
}
- public static String zerofill(String msg, Integer count){
- if (msg.length() == count){
+ public static String zerofill(String msg, Integer count) {
+ if (msg.length() == count) {
return msg;
- } else if (msg.length() > count){
+ } else if (msg.length() > count) {
return msg.substring(0, 16);
} else {
StringBuilder msgBuilder = new StringBuilder(msg);
- for (int i = 0; i<count-msg.length(); i++){
- msgBuilder.insert(0,"0");
+ for (int i = 0; i < count - msg.length(); i++) {
+ msgBuilder.insert(0, "0");
}
return msgBuilder.toString();
}
@@ -80,6 +87,29 @@
}
//鑾峰彇闄ょ櫧鍚嶅崟澶栫殑鎸囧畾妤煎眰鍏ㄩ儴绌挎杞y鍧愭爣鐐�
+ public static int[] getShuttlePoint(Integer shuttleNo) {
+ //鑾峰彇绌挎杞︽墍鍦ㄨ妭鐐逛綅缃�
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
+ if (shuttleThread == null) {
+ return null;
+ }
+ ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
+ if (shuttleProtocol == null) {
+ return null;
+ }
+
+ String currentLocNo = shuttleProtocol.getCurrentLocNo();
+ if (currentLocNo == null) {
+ return null;
+ }
+
+ if (shuttleProtocol.getCurrentLocNo() == null) {
+ return null;
+ }
+ return NavigatePositionConvert.positionToXY(shuttleProtocol.getCurrentLocNo());
+ }
+
+ //鑾峰彇闄ょ櫧鍚嶅崟澶栫殑鎸囧畾妤煎眰鍏ㄩ儴绌挎杞y鍧愭爣鐐�
public static List<int[]> getShuttlePoints(Integer whiteShuttle, Integer lev) {
SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
ArrayList<int[]> list = new ArrayList<>();
@@ -116,9 +146,10 @@
return list;
}
- //妫�娴嬫ゼ灞傛槸鍚︽湁绌挎杞�
+ //妫�娴嬫ゼ灞傛槸鍚︽湁鍙敤绌挎杞�
public static boolean checkLevHasShuttle(Integer lev) {
SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
+ WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
for (ShuttleSlave shuttle : slaveProperties.getShuttle()) {
//鑾峰彇鍥涘悜绌挎杞︾嚎绋�
ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttle.getId());
@@ -131,6 +162,22 @@
}
String currentLocNo = shuttleProtocol.getCurrentLocNo();
if (currentLocNo == null) {
+ continue;
+ }
+
+ //灏忚溅姝ｅ湪鍏呯數
+ if (shuttleThread.isCharging()) {
+ continue;
+ }
+
+ //灏忚溅鏈夊厖鐢典换鍔�
+ WrkMast chargeWorking = wrkMastService.selectChargeWorking(shuttleProtocol.getShuttleNo());
+ if (chargeWorking != null) {//宸叉湁鍏呯數浠诲姟
+ continue;
+ }
+
+ //灏忚溅澶勪簬鏁呴殰鐘舵��
+ if (shuttleThread.isFault()) {
continue;
}
@@ -182,4 +229,33 @@
return null;
}
+
+ //鑾峰彇灏忚溅寰呮満浣�
+ public static String getShuttleStandbyLocNo(String locNo) {
+ LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
+ NavigateUtils navigateUtils = SpringUtils.getBean(NavigateUtils.class);
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_type", "standby")
+ .eq("lev1", Utils.getLev(locNo)));
+ if (locMasts.isEmpty()) {
+ return null;
+ }
+
+ Integer recentDistance = Integer.MAX_VALUE;
+ String recentLocNo = null;
+ for (LocMast locMast : locMasts) {
+ //寰呮満浣嶅埌鐩爣鐐硅窛绂�
+ List<NavigateNode> currentShuttlePath = navigateUtils.calc(locNo, locMast.getLocNo(), NavigationMapType.NORMAL.id, Utils.getShuttlePoints(0, Utils.getLev(locNo)), null);//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝ｅ父閫氶亾鍦板浘
+ if (currentShuttlePath == null) {
+ continue;
+ }
+ Integer currentAllDistance = navigateUtils.getOriginPathAllDistance(currentShuttlePath);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
+ if (currentAllDistance < recentDistance) {
+ recentDistance = currentAllDistance;
+ recentLocNo = locMast.getLocNo();
+ }
+ }
+
+ return recentLocNo;
+ }
}
--
Gitblit v1.9.1