From 234415a381da98992240dc7c673614f49d1dee32 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 21 六月 2025 10:00:30 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
index 7d1fd6f..cce5d1a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
@@ -118,11 +118,9 @@
}
String str = code.trim();
- // 纭繚瀛楃涓查暱搴﹁嚦灏戜负8
- if (str.length() >= 8) {
- code = str.substring(str.length() - 8);
- } else {
- return R.error("瀛楃涓查暱搴﹀皬浜�8锛屾棤娉曡幏鍙栧悗8浣�");
+ // CUT搴撴潯鐮乀寮�澶达紝鎴彇鍚�10浣�
+ if (str.charAt(0) == 'T') {
+ code = str.substring(str.length() - 10);
}
List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, code));
@@ -153,7 +151,7 @@
return R.parse(CodeRes.USER_10003);
}
String system = null;//鐧婚檰绯荤粺
- if (wms) {
+ if (Objects.isNull(wms) || wms) {
system = String.valueOf(LoginSystemType.WMS);
}else {
system = String.valueOf(LoginSystemType.WCS);
@@ -189,11 +187,9 @@
}
String str = ordersParam.getMergeNo().trim();
- // 纭繚瀛楃涓查暱搴﹁嚦灏戜负8
- if (str.length() >= 8) {
- ordersParam.setMergeNo(str.substring(str.length() - 8));
- } else {
- return R.error("瀛楃涓查暱搴﹀皬浜�8锛屾棤娉曡幏鍙栧悗8浣�");
+ // CUT搴撴潯鐮乀寮�澶达紝鎴彇鍚�10浣�
+ if (str.charAt(0) == 'T') {
+ ordersParam.setMergeNo(str.substring(str.length() - 10));
}
boolean result = mobileService.batchMergeOrders(ordersParam);
--
Gitblit v1.9.1