From c26e8cfaf7a268516e5ec73f8b55c44641e21777 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 24 七月 2023 16:30:44 +0800
Subject: [PATCH] 捡料

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index c719605..5137274 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -938,13 +938,13 @@
                 middlePath = nodes.get(nodes.size() - 3);
                 //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
                 middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
-                middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+                middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
             } else if (nodes.size() > 5) {//涓鐮佷紶鍊掓暟绗簩涓�
                 //涓棿璺緞
                 middlePath = nodes.get(nodes.size() - 2);
                 //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
                 middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
-                middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+                middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
             }
 
             //鐩爣璺緞
@@ -1008,13 +1008,13 @@
                     middlePath = nodes.get(nodes.size() - 3);
                     //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
                     middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
-                    middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+                    middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
                 } else if (nodes.size() > 5) {//涓鐮佷紶鍊掓暟绗簩涓�
                     //涓棿璺緞
                     middlePath = nodes.get(nodes.size() - 2);
                     //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
                     middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
-                    middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+                    middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
                 }
 
                 //鐩爣璺緞
@@ -1060,13 +1060,13 @@
                 middlePath = nodes.get(nodes.size() - 3);
                 //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
                 middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
-                middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+                middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
             } else if (nodes.size() > 5) {//涓鐮佷紶鍊掓暟绗簩涓�
                 //涓棿璺緞
                 middlePath = nodes.get(nodes.size() - 2);
                 //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
                 middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
-                middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+                middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
             }
 
             //鐩爣璺緞
@@ -1343,7 +1343,7 @@
 
         //鍒ゆ柇鍏朵粬绌洪棽绌挎杞︽槸鍚︾浠诲姟鏈�杩�
         String distLocNo = null;//鐩爣鍦扮偣锛屽叆搴�=銆嬫彁鍗囨満鍙ｏ紝鍑哄簱=銆嬭揣鐗╁簱浣嶅彿
-        if (wrkMast.getIoType() == 1) {
+        if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10) {
             //鍏ュ簱
             distLocNo = Utils.levToOutInStaLocNo(lev);
         }else if(wrkMast.getIoType() == 101){

--
Gitblit v1.9.1