From 2567eba7aff97393618e71337045345bdffdb856 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 27 三月 2026 20:40:10 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/controller/MobileController.java | 81 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 76 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 18fd4de..72347fe 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -63,6 +63,13 @@
@PostMapping("/agv/collectionPakin/view")
@ManagerAuth
public R pdaAgvCollectionPakinView(@RequestBody CollectionPakinParams params) {
+ if (Objects.isNull(params.getOrgBarcode())) {
+ return R.error("婧愭墭鐩樹笉鑳戒负绌猴紒");
+ }
+ if (Objects.isNull(params.getMatnr())) {
+ return R.error("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+
return mobileService.collectionPakinView(params);
}
@@ -180,6 +187,15 @@
return mobileService.getCacheLocs();
}
+
+ @ManagerAuth
+ @GetMapping("/cache/sites/{type}")
+ @ApiOperation("鑾峰彇缂撳瓨鍖哄叆鍑哄簱绔欑偣淇℃伅")
+ public R getCacheSites(@PathVariable String type) {
+ return mobileService.getCacheSites(type);
+
+ }
+
@PostMapping("/cache/agv/call")
@ApiOperation("缂撳啿鍖哄叆搴�")
@ManagerAuth
@@ -207,7 +223,7 @@
* @version 1.0
*/
@PostMapping("/cache/out/call")
- @ApiOperation("鍛煎彨AGV鎼繍")
+ @ApiOperation("鍛煎彨AGV鎼繍/缂撳瓨鍑哄簱")
@ManagerAuth
public R OutCallAgv(@RequestBody AgvCallParams params) {
if (Objects.isNull(params)) {
@@ -327,14 +343,14 @@
return R.ok().add(combParams);
}
- @ManagerAuth(memo = "缁勬墭")
+ @ManagerAuth(memo = "缂撳啿搴撳叆搴撶粍鎵�")
@RequestMapping("/comb/auth")
public R comb(@RequestBody CombParam combParam) {
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
- @ManagerAuth(memo = "缂撳啿搴撳叆搴撶粍鎵�")
+ @ManagerAuth(memo = "缁勬墭")
@RequestMapping("/cache/comb/auth")
public R onlineComb(@RequestBody CombParam combParam) {
if (Objects.isNull(combParam)) {
@@ -344,14 +360,69 @@
return R.ok("缁勬墭鎴愬姛");
}
+ /**
+ * 绌烘澘鍑哄簱
+ * @param params
+ * @return
+ */
+ @RequestMapping("/empty/call/out")
+ public R getEmptyOut(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.getEmptyOutStock(params);
+ }
+
+
+ /**
+ *
+ * 鑾峰彇鎹嗗寘鍑哄簱鏄庣粏
+ * @param params
+ * @return
+ */
+ @ManagerAuth(memo = "鑾峰彇鎹嗗寘鏄庣粏淇℃伅")
+ @RequestMapping("/agv/bind/info")
+ public R getAllBind(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖!!");
+ }
+ return mobileService.getAllBindInfo(params);
+ }
+
+ @ApiOperation("纭鎹嗗寘鍑哄簱")
+ @ManagerAuth(memo = "纭鎹嗗寘鍑哄簱")
+ @RequestMapping("/agv/out/confirm")
+ public R confirmOutStock(@RequestBody CombParam combParam) {
+ if (Objects.isNull(combParam)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖!!");
+ }
+
+ return mobileService.confirmOutstock(combParam);
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/9/24
+ * @description: 鍛煎彨AGV杩斿洖
+ * @version 1.0
+ */
+ @ManagerAuth(memo = "鍛煎彨AGV杩斿洖")
+ @RequestMapping("/agv/call/back")
+ public R callAgvBack(@RequestBody AgvCallParams callAgvBackParam) {
+ if (Objects.isNull(callAgvBackParam.getOrgSite())) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖!!");
+ }
+ return mobileService.agvCallback(callAgvBackParam, getUserId());
+ }
+
+
@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("涓婃灦鎴愬姛");
+ return mobileService.combInPub(combParam, 10031L);
}
@RequestMapping("/pack/get/auth")
--
Gitblit v1.9.1