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 |    2 ++
 1 files changed, 2 insertions(+), 0 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 c1c4935..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
@@ -200,6 +200,8 @@
         }
         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) {

--
Gitblit v1.9.1