From 714d8ba0d3a83fa802b30deac7cc594813d06d0e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 26 六月 2025 14:46:15 +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 | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 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..db9e923 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
@@ -13,6 +13,7 @@
import com.zy.asrs.wms.asrs.entity.dto.OrderInfoDto;
import com.zy.asrs.wms.asrs.entity.dto.PickSheetDetlDto;
import com.zy.asrs.wms.asrs.entity.dto.ShippingOrderDetlDto;
+import com.zy.asrs.wms.asrs.entity.enums.OrderType;
import com.zy.asrs.wms.asrs.entity.param.BatchMergeOrdersParam;
import com.zy.asrs.wms.asrs.entity.param.PakinOnShelvesParams;
import com.zy.asrs.wms.asrs.service.MobileService;
@@ -118,11 +119,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 +152,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);
@@ -176,6 +175,12 @@
}
+ /**
+ * @author Ryan
+ * @date 2025/6/25
+ * @description: 缁勬墭
+ * @version 1.0
+ */
@PostMapping("/comb/auth")
public R combMats(@RequestBody BatchMergeOrdersParam ordersParam) {
if (StringUtil.isNullOrEmpty(ordersParam.getOrderNo())) {
@@ -189,13 +194,15 @@
}
String str = ordersParam.getMergeNo().trim();
- // 纭繚瀛楃涓查暱搴﹁嚦灏戜负8
- if (str.length() >= 8) {
- ordersParam.setMergeNo(str.substring(str.length() - 8));
- } else {
- return R.error("瀛楃涓查暱搴﹀皬浜�8锛屾棤娉曡幏鍙栧悗8浣�");
+ // CTU搴撴潯鐮乀寮�澶达紝鎴彇鍚�10浣�
+ if (str.charAt(0) == 'T') {
+ ordersParam.setMergeNo(str.substring(str.length() - 10));
}
-
+ if (str.startsWith("PK")) {
+ ordersParam.setInType(OrderType.PK_IN_ORDER.id);
+ } else {
+ ordersParam.setInType(OrderType.UTC_OUT_ORDER.id);
+ }
boolean result = mobileService.batchMergeOrders(ordersParam);
if (result) {
return R.ok("缁勬墭鎴愬姛锛侊紒");
@@ -299,7 +306,4 @@
}
return mobileService.confirmShippingDetl(params);
}
-
-
-
}
--
Gitblit v1.9.1