From eed51ce47f20afb0661acc42baa680fcb6351a39 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 26 一月 2026 13:16:14 +0800
Subject: [PATCH] 6.8 查询所有库位状态和物料-二机床信息化数字孪生用
---
src/main/java/com/zy/asrs/controller/MobileController.java | 66 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 6a9a1e9..63780c7 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -16,6 +16,7 @@
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -122,6 +123,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
@@ -137,6 +147,35 @@
return R.ok("涓嬫灦鎴愬姛");
}
+
+ @GetMapping("/cache/locs")
+ @ManagerAuth
+ @ApiOperation("鑾峰彇缂撳瓨鍖哄簱浣嶄俊鎭�")
+ public R getCacheLocs() {
+ return mobileService.getCacheLocs();
+ }
+
+
+ @PostMapping("/cache/agv/call")
+ @ApiOperation("鍛煎彨AGV鎼繍")
+ @ManagerAuth
+ public R callAgvMove(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.callAgvMove(params, getUserId());
+ }
+
+
+ @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());
+ }
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -486,4 +525,31 @@
return R.ok("鍑哄簱鎴愬姛");
}
+ // pda鍛煎彨绌烘枡妗嗗嚭搴�
+ @PostMapping("/callEmptyBinOutBound")
+ @ManagerAuth(memo = "pda鍛煎彨绌烘枡妗嗗嚭搴�")
+ public synchronized R callEmptyBinOutBound(@RequestBody JSONObject param) {
+ if(!param.containsKey("staNo") || !param.containsKey("locType") || !param.containsKey("count")){ // 1.绐勶紝2.瀹�
+ return R.parse(BaseRes.PARAM);
+ }
+ int count = param.getInteger("count");
+ if (count <= 0 || count > 10) {
+ return R.parse("鏁伴噺鏈夎锛宑ount:" + count);
+ }
+ return mobileService.callEmptyBinOutBound(null,param.getString("staNo"),param.getString("locType"),count,getUserId());
+ }
+
+ @PostMapping("/callEmptyBinInBound")
+ @ManagerAuth(memo = "pda鍛煎彨鏂欐鍥炲簱")
+ public synchronized R callEmptyBinInBound(@RequestBody JSONObject param) {
+ if (!param.containsKey("site") || !param.containsKey("barcode") || !param.containsKey("emptyFlag")) {
+ return R.parse(BaseRes.PARAM);
+ }
+ String site = param.getString("site"); // 璧峰绔欑偣
+ String barcode = param.getString("barcode"); // 鎵樼洏鏉＄爜
+ String emptyFlag = param.getString("emptyFlag"); // 1.鏈夎揣(榛樿)锛�2.绌烘墭
+
+ return mobileService.callEmptyBinInBound(site, barcode, emptyFlag, getUserId());
+ }
+
}
--
Gitblit v1.9.1