From d04fe2f4e7fc1f46ef4e85e640eefdd9127b4db3 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 11 十二月 2025 15:01:48 +0800
Subject: [PATCH] 入库单功能优化
---
src/main/java/com/zy/asrs/controller/MobileController.java | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 05cbd57..e3a2df6 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -60,6 +60,18 @@
@Resource
private StaDescService staDescService;
+ @PostMapping("/agv/collectionPakin/view")
+ @ManagerAuth
+ public R pdaAgvCollectionPakinView(@RequestBody CollectionPakinParams params){
+ return mobileService.collectionPakinView(params);
+ }
+
+ @PostMapping("/agv/collectionPakin/auth")
+ @ManagerAuth
+ public R pdaAgvCollectionPakin(@RequestBody CollectionPakinParams params){
+ return mobileService.collectionPakin(params, getUserId());
+ }
+
@PostMapping("/agv/callEmptyCar")
@ManagerAuth
@@ -187,7 +199,7 @@
/**
* @author Ryan
* @date 2025/11/3
- * @description: 鍛煎彨AGV鎼繍缂撳瓨鍖�/EO/SO
+ * @description: 鍛煎彨AGV鎼繍鍏ュ簱缂撳瓨鍖�/EO/SO
* @version 1.0
*/
@PostMapping("/cache/out/call")
@@ -199,6 +211,42 @@
}
return mobileService.OutCallAgv(params, getUserId());
}
+
+ /**
+ * 缂撳瓨鍖哄嚭搴撶粍鎵樹笂鏋�
+ * @author Ryan
+ * @date 2025/12/8 13:45
+ * @param params
+ * @return com.core.common.R
+ */
+ @ManagerAuth
+ @ApiOperation("缂撳瓨鍑哄簱涓婃灦")
+ @PostMapping("/commb/task/pub")
+ public R combPub(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.combOutPub(params);
+ }
+
+
+ /**
+ * 缂撳瓨鍖哄嚭搴撶粍鎵樹笂鏋�
+ * @author Ryan
+ * @date 2025/12/8 13:45
+ * @param params
+ * @return com.core.common.R
+ */
+ @ManagerAuth
+ @ApiOperation("缂撳瓨鍑哄簱鍒楄〃")
+ @PostMapping("/cache/task/list")
+ public R combCacehList(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.combCacehList(params);
+ }
+
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -274,12 +322,37 @@
return R.ok().add(combParams);
}
- @RequestMapping("/comb/auth")
+
+
@ManagerAuth(memo = "缁勬墭")
+ @RequestMapping("/comb/auth")
public R comb(@RequestBody CombParam combParam){
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
+
+
+ @ManagerAuth(memo = "缂撳啿搴撳叆搴撶粍鎵�")
+ @RequestMapping("/cache/comb/auth")
+ public R onlineComb(@RequestBody CombParam combParam) {
+ if (Objects.isNull(combParam)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ mobileService.cacheComb(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+
+ @ManagerAuth(memo = "缂撳啿搴撶‘璁や笂鏋�(妯℃嫙鐗╃悊鎸夐挳)")
+ @RequestMapping("/cache/comb/pub")
+ public R cacheCombPub(@RequestBody CompleteParam combParam) {
+ if (Objects.isNull(combParam)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖!!");
+ }
+ mobileService.combInPub(combParam, 10031L);
+ return R.ok("涓婃灦鎴愬姛");
+ }
+
@RequestMapping("/pack/get/auth")
@ManagerAuth
@@ -297,7 +370,7 @@
@RequestMapping("/pack/comb/auth")
@ManagerAuth(memo = "涓嬬嚎缁勬墭")
public R packComb(@RequestBody CombParam combParam){
- mobileService.packComb(combParam, getUserId());
+ mobileService.packComb(combParam, 10031L);
return R.ok("缁勬墭鎴愬姛");
}
--
Gitblit v1.9.1