From 41411a57fc0d237577aa10ccfc1aded50556f5ba Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 28 三月 2026 13:35:23 +0800
Subject: [PATCH] Revert "添加的分属环境配置文件 暂停上报功能"
---
src/main/java/com/zy/asrs/controller/MobileController.java | 65 ++++++++++++++++++++++++++++++--
1 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 4b3cb11..93d7de8 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -187,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
@@ -214,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)) {
@@ -352,6 +361,56 @@
}
/**
+ * 绌烘澘鍑哄簱
+ * @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);
+ }
+
+ @ManagerAuth(memo = "纭鍙拌溅鍑哄簱")
+ @RequestMapping("/confirm/all/out")
+ public R confirmAllOut(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params) || Objects.isNull(params.getCarBarcode())) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.outStockByTc(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杩斿洖
@@ -363,7 +422,6 @@
if (Objects.isNull(callAgvBackParam.getOrgSite())) {
return R.error("鍙傛暟涓嶈兘涓虹┖!!");
}
-
return mobileService.agvCallback(callAgvBackParam, getUserId());
}
@@ -374,8 +432,7 @@
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