From 8e2ba687b00f230ade708fa82b8c9f67cf842f0d Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 15 一月 2026 13:52:34 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
index 97a907b..2670539 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
@@ -21,7 +21,6 @@
import io.swagger.annotations.ApiOperation;
import org.apache.tika.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -120,6 +119,13 @@
return mobileService.getReceiptAreas(getLoginUser());
}
+ @PreAuthorize("hasAuthority('manager:warehouseAreas:list')")
+ @ApiOperation("鑾峰彇鍙敤搴撳尯")
+ @GetMapping("/areas/user/all")
+ public R getAreasUserAll() {
+ return mobileService.getAreasUserAll(getLoginUser());
+ }
+
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@GetMapping("/orders/asn")
@@ -157,7 +163,7 @@
if (!Objects.isNull(params.get("type")) && params.get("type").equals("unbind")) {
return mobileService.getUnItemByContainer(params);
} else {
- return mobileService.getItemByContainer(params);
+ return mobileService.getItemByContainer(params,getLoginUser());
}
}
@@ -167,7 +173,7 @@
public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
Long userId = getLoginUserId();
if (Objects.isNull(waitPakin)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return R.error( "鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
if (org.apache.commons.lang3.StringUtils.isBlank(waitPakin.getBarcode())) {
return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
@@ -175,28 +181,12 @@
if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
}
-// return R.ok(mobileService.mergeItems(waitPakin, userId));
try{
- mobileService.mergeItems(waitPakin, userId);
- if (waitPakin.getAgvSign()==1) {
- asyncProcessAfterValidation(waitPakin,userId);
- }
+ mobileService.mergeItemsWcs(waitPakin, userId);
} catch (Exception e){
return R.error(e.getMessage());
}
return R.ok();
- }
-
- @Async
- public void asyncProcessAfterValidation(WaitPakinParam waitPakinPda,Long userId) {
- try {
- Thread.sleep(500);
-// WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, waitPakinPda.getBarcode()));
- agvService.AGVBindAndInTaskStart(waitPakinPda, userId);
-// mobileService.mergeItemsWcs(waitPakin,userId);
- } catch (Exception e) {
-// log.error("寮傛澶勭悊AGV鍚庣画閫昏緫澶辫触", e);
- }
}
@PreAuthorize("hasAuthority('manager:waitPakin:update')")
@@ -318,7 +308,7 @@
if (Objects.isNull(map)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return mobileService.getItemByContainer(map);
+ return mobileService.getItemByContainer(map,getLoginUser());
}
@ApiOperation("鑾峰彇璁㈠崟涓嶈壇鐗╂枡")
--
Gitblit v1.9.1