From 40d00406a7f83c0f3a5484a9997967e0af5a8a8f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 22 一月 2026 13:15:35 +0800
Subject: [PATCH] 操作日志记录操作人
---
src/main/java/com/zy/asrs/controller/MobileController.java | 86 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 78 insertions(+), 8 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..8756d2a 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -16,6 +16,8 @@
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -29,6 +31,7 @@
*/
@RestController
@RequestMapping("mobile")
+@Slf4j
public class MobileController extends BaseController {
@Autowired
@@ -59,6 +62,40 @@
@Resource
private StaDescService staDescService;
+ // 鍏ュ簱鍚姩璋冪敤wcs缁欒緭閫佺嚎涓嬪懡浠� type 1.婊＄鍏ュ簱(榛樿),2.绌虹鍏ュ簱
+ @GetMapping("/inboundStart/auth")
+ @ManagerAuth(memo = "鍏ュ簱鍚姩")
+ public R inboundStart(@RequestParam int type){
+ log.info("pda鍏ュ簱鍚姩锛歿}",type);
+ return mobileService.inboundStart(type);
+ }
+
+ // 閫�绌烘墭鐩樿繑鍥炰骇绾� pda涓婃搷浣滅┖鎵樿繑鍥炰骇绾�(鍒�鏋惰繑鍥�)
+ @GetMapping("/djReturn/auth")
+ @ManagerAuth(memo = "鍒�鏋惰繑鍥�")
+ public R tkt(@RequestParam String djNo){
+ log.info("鍒�鏋惰繑鍥烇細{}",djNo);
+ return mobileService.djReturn(djNo);
+ }
+
+ // 绌虹鍑哄簱
+ @GetMapping("/emptyBoxOutbound/auth")
+ @ManagerAuth(memo = "绌虹鍑哄簱")
+ public R emptyBoxOutbound(@RequestParam int count){
+ log.info("绌虹鍑哄簱锛歿}",count);
+ if (count <= 0) {
+ return R.parse("鏁伴噺鏈夎锛�" + count);
+ }
+ return mobileService.emptyBoxOutbound(count,getUserId());
+ }
+
+ @RequestMapping("/comb/auth")
+ @ManagerAuth(memo = "缁勬墭")
+ public R comb(@RequestBody CombParam combParam){
+ mobileService.comb(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
@RequestMapping("/pda/WarehouseOut/v1")
@ManagerAuth(memo = "骞舵澘閫斾腑鎷ｆ枡-鍙傝�冨康鍒�")
public R WarehouseOutV1(@RequestBody CombParam combParam) {
@@ -68,10 +105,10 @@
@RequestMapping("/pda/WarehouseOutPickMerge/v1")
@ManagerAuth(memo = "鎷ｆ枡閫斾腑骞舵澘")
public R WarehouseOutPickMergeV1(@RequestBody WarehouseOutPickMergeParam param) {
- if (Cools.isEmpty(param,param.getLocNo(),param.getBarcode(),param.getCombMats())) {
+ if (Cools.isEmpty(param,param.getBarcode(),param.getCombMats())) {
return R.parse("鍙傛暟涓嶈兘涓虹┖锛�");
}
- return mobileService.WarehouseOutPickMergeV1(param, getHostId(), getUserId());
+ return mobileService.WarehouseOutPickMergeV1(param, getUserId());
}
@RequestMapping("/pick/in")
@@ -122,6 +159,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 +183,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());
+ }
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -212,12 +287,7 @@
return R.ok().add(combParams);
}
- @RequestMapping("/comb/auth")
- @ManagerAuth(memo = "缁勬墭")
- public R comb(@RequestBody CombParam combParam){
- mobileService.comb(combParam, getUserId());
- return R.ok("缁勬墭鎴愬姛");
- }
+
@RequestMapping("/pack/get/auth")
@ManagerAuth
--
Gitblit v1.9.1