From 92ff7ea27e6f99c004c727d471f2f3d82c1c3a30 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 12 十二月 2025 09:54:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jsxswms' into jsxswms
---
src/main/java/com/zy/asrs/service/MobileService.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 2455c90..bfb42a1 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -2,9 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.R;
-import com.zy.asrs.entity.BasDevp;
-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;
@@ -99,4 +97,59 @@
* @version 1.0
*/
R OutCallAgv(AgvCallParams params, Long userId);
+
+ /**
+ * 鐢熸垚绔嬪簱鍑哄簱浠诲姟
+ * @author Ryan
+ * @date 2025/12/3 8:07
+ * @param 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