From 1a30303df506698d09d106060d93d196c90c5c18 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期三, 08 三月 2023 07:57:53 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 6d2bffe..6ab6642 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -69,6 +69,12 @@
                         }
                     }
                 }
+                int row = getRow(locNo);
+                if (row<=4){
+                    return defaultIoPri == null ? 300.0D-row*2 : defaultIoPri-row*2;
+                }else {
+                    return defaultIoPri == null ? 300.0D+row*2 : defaultIoPri+row*2;
+                }
             // 鍑哄簱
             } else {
                 List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
@@ -91,17 +97,18 @@
                         }
                     }
                 }
+                int row = getRow(locNo);
+                if (row<=4){
+                    return defaultIoPri == null ? 300.0D+row*2 : defaultIoPri+row*2;
+                }else {
+                    return defaultIoPri == null ? 300.0D-row*2 : defaultIoPri-row*2;
+                }
             }
         // 绉诲簱
         } else {
 //            @Deprecated
         }
-        int row = getRow(locNo);
-        if (row<=4){
-            return defaultIoPri == null ? 300.0D+row*2 : defaultIoPri+row*2;
-        }else {
-            return defaultIoPri == null ? 300.0D+row-2 : defaultIoPri-row*2;
-        }
+        return 300.0D;
     }
     /**
      * 閫氳繃搴撲綅鍙疯幏鍙� 鎺�

--
Gitblit v1.9.1