From 7600059f8037f804b19d0da008ba34d62c43296d Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 11 十二月 2025 17:27:57 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/asrs/service/MobileService.java | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index b292777..bfb42a1 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -2,10 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.R;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.LocCache;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import java.util.Date;
@@ -107,9 +104,52 @@
* @date 2025/12/3 8:07
* @param locCaches
*/
- void generateCRNOutTask(LocCache locCaches);
+ void generateCRNOutTask(BasStation station, LocCache locCaches, Long userId);
R callEmptyCar(AgvCallParams params, Long userId);
R collectionInCall(AgvCallParams params, Long userId);
+
+
+ /**
+ * 缂撳瓨鍑哄簱缁勬墭涓婃灦
+ * @author Ryan
+ * @date 2025/12/8 13:46
+ * @param params
+ * @return com.core.common.R
+ */
+ R combOutPub(AgvCallParams params);
+
+ /**
+ * 缂撳瓨鍑哄簱缁勬墭鍒楄〃
+ * @author Ryan
+ * @date 2025/12/8 15:36
+ * @param params
+ * @return com.core.common.R
+ */
+ R combCacehList(AgvCallParams params);
+
+ /**
+ * 缂撳瓨鍖哄叆搴撶粍鎵�
+ *
+ * @param combParam
+ * @param userId
+ * @author Ryan
+ * @date 2025/12/9 13:44
+ */
+ void cacheComb(CombParam combParam, Long userId);
+
+ /**
+ * 绔嬪簱鍏ュ簱涓婃灦
+ *
+ * @param combParam
+ * @param userId
+ * @author Ryan
+ * @date 2025/12/9 15:04
+ */
+ void combInPub(CompleteParam combParam, Long userId);
+
+ R collectionPakin(CollectionPakinParams params, Long userId);
+
+ R collectionPakinView(CollectionPakinParams params);
}
--
Gitblit v1.9.1