From f3e116dd3bbdd132cd5cb49c99cbf9ba59f112d8 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 31 一月 2026 08:40:47 +0800
Subject: [PATCH] no message

---
 src/main/java/com/zy/common/service/CommonService.java |   39 +++++++++++++++++++++------------------
 1 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 8f8280f..305a037 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -133,23 +133,25 @@
             /**
              * 搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱  2: 骞冲簱  3: 绌挎鏉�  4: 鍥涘悜杞�  5: AGV  0: 鏈煡
              */
-            switch (rowLastnoType.getType()) {
-                case 1:
-                    return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
-                case 2:
-                    log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
-                    break;
-                case 3:
-                    log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
-                    break;
-                case 4:
-                    return getLocNoRun4(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 4, locTypeDto, 0);
-                case 5:
-                    return getLocNoRun5(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
-                default:
-                    log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
-                    break;
-            }
+            return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
+
+//            switch (rowLastnoType.getType()) {
+//                case 1:
+//                    return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
+////                case 2:
+////                    log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
+////                    break;
+////                case 3:
+////                    log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
+////                    break;
+////                case 4:
+////                    return getLocNoRun4(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 4, locTypeDto, 0);
+////                case 5:
+////                    return getLocNoRun5(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
+////                default:
+////                    log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
+////                    break;
+//            }
 
         } catch (Exception e) {
             log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
@@ -182,8 +184,9 @@
             throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�===>搴撲綅瑙勫垯鏈煡");
         }
         StartupDto startupDto = new StartupDto();
+        //TODO 闇�瑕佸尯鍒�207锛�217锛� 239绔欑偣锛屾护鑺拰涓欢闇�瑕佸尯鍒嗗紑
          locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
-                .ne("row1", rowLastno.getsRow())
+                .ge("row1", rowLastno.getsRow())
                 .le("row1", rowLastno.geteRow())
                 .eq("loc_sts", "O")
                 .orderAsc(Arrays.asList("row1", "bay1", "lev1")));

--
Gitblit v1.9.1