From de8a641769b80abca23a344b521bcdfe0dbca31f Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 11 十二月 2025 09:00:35 +0800
Subject: [PATCH] 入库流程功能优化
---
src/main/java/com/zy/asrs/controller/MobileController.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 106 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 50b43af..a36dc7f 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -60,6 +60,13 @@
@Resource
private StaDescService staDescService;
+
+ @PostMapping("/agv/callEmptyCar")
+ @ManagerAuth
+ public R pdaAgvFinishedCall(@RequestBody AgvCallParams params){
+ return mobileService.callEmptyCar(params, getUserId());
+ }
+
@RequestMapping("/pda/WarehouseOut/v1")
@ManagerAuth(memo = "骞舵澘閫斾腑鎷ｆ枡-鍙傝�冨康鍒�")
public R WarehouseOutV1(@RequestBody CombParam combParam) {
@@ -123,6 +130,15 @@
return mobileService.pickMats(matnr, orderNo);
}
+ @PostMapping("/scan/order/mats")
+ @ManagerAuth(memo = "鎵爜鑾峰彇缁勬墭鐗╂枡")
+ public R scanMats(@RequestBody PakinMatsByQRParams params) {
+ if (Objects.isNull(params)) {
+ return R.parse("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.getMatsByQRcode(params);
+ }
+
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
@ManagerAuth
@@ -148,13 +164,75 @@
@PostMapping("/cache/agv/call")
- @ApiOperation("鍛煎彨AGV鎼繍")
+ @ApiOperation("鍛煎彨绌鸿溅")
@ManagerAuth
public R callAgvMove(@RequestBody AgvCallParams params) {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return mobileService.callAgvMove(params, getUserId());
+ }
+
+ @PostMapping("/collection/agv/call")
+ @ApiOperation("闆嗚揣鍖哄叆搴�")
+ @ManagerAuth
+ public R CollectionInCall(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.collectionInCall(params, getUserId());
+ }
+
+
+ /**
+ * @author Ryan
+ * @date 2025/11/3
+ * @description: 鍛煎彨AGV鎼繍鍏ュ簱缂撳瓨鍖�/EO/SO
+ * @version 1.0
+ */
+ @PostMapping("/cache/out/call")
+ @ApiOperation("鍛煎彨AGV鎼繍")
+ @ManagerAuth
+ public R OutCallAgv(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ 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);
}
@@ -232,12 +310,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
@@ -255,7 +358,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