From 49ac73e622fa786e47fbf1b2a9767357edb85943 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 12 一月 2026 15:47:31 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/web/WcsController.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 7b7c41d..5ac0e36 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -134,18 +134,18 @@
         if (Cools.isEmpty(param.getCargoHeight())) {
             return Re.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
         }
-        if (!param.getBarCode().startsWith("7")&&!param.getBarCode().startsWith("8")){
-            return Re.error("鏈畾涔夌殑鎵樼洏鐮佽鍒�");
-        }
+//        if (!param.getBarCode().startsWith("7")&&!param.getBarCode().startsWith("8")){
+//            return Re.error("鏈畾涔夌殑鎵樼洏鐮佽鍒�");
+//        }
 
         // 婧愮珯鐐圭姸鎬佹娴�
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(Integer.valueOf(param.getFromPort()), true);
         sourceStaNo.setLocType1(param.getCargoHeight().shortValue()); // 楂樹綆搴撲綅
-        if (param.getBarCode().startsWith("7")){
-            sourceStaNo.setLocType2((short) 1); // 瀹界獎搴撲綅 1.绐勫簱浣�1200*1000*990  1鏈熷簱浣�
-        }else if (param.getBarCode().startsWith("8")){
-            sourceStaNo.setLocType2((short) 2); // 瀹界獎搴撲綅 2.瀹藉簱浣�1200*1000*1270  2鏈熷簱浣�
-        }
+//        if (param.getBarCode().startsWith("7")){
+//            sourceStaNo.setLocType2((short) 1); // 瀹界獎搴撲綅 1.绐勫簱浣�1200*1000*990
+//        }else if (param.getBarCode().startsWith("8")){
+//            sourceStaNo.setLocType2((short) 2); // 瀹界獎搴撲綅 2.瀹藉簱浣�1200*1000*1270
+//        }
         LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
 
         StartupDto dto = null;
@@ -548,7 +548,7 @@
         for (LocMast locMast : locMasts) {
             if (locMast.getLocSts() != "X" && locMast.getLocSts() != "G" ) {
                 HashMap<String, Object> map = new HashMap<>();
-                map.put("warehouse", "ddth");
+                map.put("warehouse", "aryd");
                 map.put("posiX", locMast.getRow1());
                 map.put("posiY", locMast.getBay1());
                 map.put("posiZ", locMast.getLev1());
@@ -562,7 +562,7 @@
             }
             if(locMast.getLocSts() == "G"){
                 HashMap<String, Object> map = new HashMap<>();
-                map.put("warehouse", "ddth");
+                map.put("warehouse", "aryd");
                 map.put("posiX", locMast.getRow1());
                 map.put("posiY", locMast.getBay1());
                 map.put("posiZ", locMast.getLev1());
@@ -572,7 +572,7 @@
             }
             if(locMast.getLocSts() == "X"){
                 HashMap<String, Object> map = new HashMap<>();
-                map.put("warehouse", "ddth");
+                map.put("warehouse", "aryd");
                 map.put("posiX", locMast.getRow1());
                 map.put("posiY", locMast.getBay1());
                 map.put("posiZ", locMast.getLev1());

--
Gitblit v1.9.1