From afd2cfd8d63a243405d49d889e4fe1084e455b3f Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 12 一月 2026 12:41:40 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 109120c..cd63789 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -5,7 +5,7 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.params.*;
+import com.vincent.rsf.server.api.controller.erp.params.*;
import com.vincent.rsf.server.api.entity.dto.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.api.service.MobileService;
@@ -243,7 +243,7 @@
throw new CoolException("鏁版嵁閿欒锛侊紒");
}
if (!one.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val)) {
- throw new CoolException("鍑哄簱鍗曟湭瀹屾垚锛屾棤娉曞畬鎴愭敹璐э紒锛�");
+ throw new CoolException("璋冩嫈鍑哄簱鍗曟湭瀹屾垚锛屼笉鍙墽琛屾敹璐ф搷浣滐紒锛�");
}
}
@@ -564,6 +564,17 @@
}
/**
+ * @author Munch D. Luffy
+ * @date 2026/01/09
+ * @description: PDA缁勬嫋
+ * @version 1.0
+ */
+ @Override
+ public WaitPakin mergeItemsWcs(WaitPakinParam waitPakin, Long userId) {
+ return waitPakinService.mergeItemsWcs(waitPakin, userId);
+ }
+
+ /**
* @param param
* @return
* @author Ryan
--
Gitblit v1.9.1