From 83b51a5a0774ea8ecb9a06304af3b956a21307c8 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期六, 08 三月 2025 09:06:55 +0800
Subject: [PATCH] CUT库条码T开头,截取后10位

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
index b801644..6b9e1eb 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
@@ -3,7 +3,6 @@
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
 import com.zy.asrs.framework.exception.CoolException;
 import com.zy.asrs.wms.asrs.entity.*;
 import com.zy.asrs.wms.asrs.entity.enums.*;
@@ -142,15 +141,16 @@
             }
 
             if (ruleDetl.getDetlType().equals(ShelvesRuleDetlType.COMPLETE.id)) {
+                return locUtils.getGlobalEmptyLocToCtu(locTypeHeight);
                 //浠庡叏灞�搴撲綅涓幏鍙�(瀹屾暣宸烽亾)
-                List<Loc> globalLoc = locUtils.getGlobalEmptyLoc(taskType, locTypeHeight, laneRowList, currentLev);
-                //鑾峰彇搴撲綅
-                if (!globalLoc.isEmpty()) {
-                    defaultLoc = locUtils.filterAllLoc(globalLoc);
-                    if (defaultLoc != null) {
-                        return defaultLoc;
-                    }
-                }
+//                List<Loc> globalLoc = locUtils.getGlobalEmptyLoc(taskType, locTypeHeight, laneRowList, currentLev);
+//                //鑾峰彇搴撲綅
+//                if (!globalLoc.isEmpty()) {
+//                    defaultLoc = locUtils.filterAllLoc(globalLoc);
+//                    if (defaultLoc != null) {
+//                        return defaultLoc;
+//                    }
+//                }
             }
         }
 
@@ -240,15 +240,16 @@
             }
 
             if (ruleDetl.getDetlType().equals(ShelvesRuleDetlType.COMPLETE.id)) {
+                return locUtils.getGlobalEmptyLocToCtu(locTypeHeight);
                 //浠庡叏灞�搴撲綅涓幏鍙�(瀹屾暣宸烽亾)
-                List<Loc> globalLoc = locUtils.getGlobalLoc(taskType, locTypeHeight, laneRowList, currentLev);
-                //鑾峰彇搴撲綅
-                if (!globalLoc.isEmpty()) {
-                    defaultLoc = locUtils.filterAllLoc(globalLoc);
-                    if (defaultLoc != null) {
-                        return defaultLoc;
-                    }
-                }
+//                List<Loc> globalLoc = locUtils.getGlobalLoc(taskType, locTypeHeight, laneRowList, currentLev);
+//                //鑾峰彇搴撲綅
+//                if (!globalLoc.isEmpty()) {
+//                    defaultLoc = locUtils.filterAllLoc(globalLoc);
+//                    if (defaultLoc != null) {
+//                        return defaultLoc;
+//                    }
+//                }
             }
         }
         return defaultLoc;

--
Gitblit v1.9.1