From aa360de4381100150d34a469ecc087a78cf1720e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 03 十二月 2025 16:44:10 +0800
Subject: [PATCH] #1

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

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index b525134..f25d588 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -107,9 +107,7 @@
         sourceStaNo.setLocType1(param.getLocType1());
         LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
 
-        if (param.getBarcode().startsWith("4")){
-            locTypeDto.setLocType2((short) 4);
-        }else if (param.getBarcode().startsWith("5")){
+        if (param.getBarcode().startsWith("5")){
             locTypeDto.setLocType2((short) 5);
         }else if (param.getBarcode().startsWith("6")){
             locTypeDto.setLocType2((short) 6);
@@ -117,8 +115,10 @@
             locTypeDto.setLocType2((short) 7);
         }else if (param.getBarcode().startsWith("8")){
             locTypeDto.setLocType2((short) 8);
+        }else if (param.getBarcode().startsWith("4")){
+            locTypeDto.setLocType2((short) 4);
         }else {
-            throw new CoolException("鏉$爜瑙勫垯涓嶅瓨鍦�:"+param.getBarcode());
+            return R.error("鏉$爜瑙勫垯涓嶅瓨鍦�:"+param.getBarcode());
         }
 
         StartupDto dto = null;

--
Gitblit v1.9.1