From 66e2b81704718350c0a3fcf0dfbd2f9d614b044c Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 13 一月 2026 08:30:38 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 0c8f53a..0a4d3c8 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
@@ -4,7 +4,11 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.params.*;
+import com.vincent.rsf.server.api.controller.erp.params.CheckObjParams;
+import com.vincent.rsf.server.api.controller.erp.params.ManualShelvingParams;
+import com.vincent.rsf.server.api.controller.erp.params.OpStockParams;
+import com.vincent.rsf.server.api.controller.erp.params.OtherReceiptParams;
+import com.vincent.rsf.server.api.service.AgvService;
import com.vincent.rsf.server.api.service.MobileService;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.QlyIsptItem;
@@ -17,6 +21,7 @@
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.*;
@@ -43,6 +48,8 @@
private TaskService taskService;
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private AgvService agvService;
/**
* PDA鐢ㄦ埛鐧诲綍
* @param param
@@ -110,7 +117,14 @@
@ApiOperation("鑾峰彇鏀惰揣鍖�")
@GetMapping("/areas/receipt")
public R getReceiptAreas() {
- return mobileService.getReceiptAreas();
+ return mobileService.getReceiptAreas(getLoginUser());
+ }
+
+ @PreAuthorize("hasAuthority('manager:warehouseAreas:list')")
+ @ApiOperation("鑾峰彇鍙敤搴撳尯")
+ @GetMapping("/areas/user/all")
+ public R getAreasUserAll() {
+ return mobileService.getAreasUserAll(getLoginUser());
}
@@ -160,7 +174,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("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
@@ -168,7 +182,12 @@
if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
}
- return R.ok(mobileService.mergeItems(waitPakin, userId));
+ try{
+ mobileService.mergeItemsWcs(waitPakin, userId);
+ } catch (Exception e){
+ return R.error(e.getMessage());
+ }
+ return R.ok();
}
@PreAuthorize("hasAuthority('manager:waitPakin:update')")
@@ -225,7 +244,7 @@
if (Objects.isNull(params) || params.isEmpty()) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return mobileService.checkUpdate(params);
+ return mobileService.checkUpdate(params, getLoginUserId());
}
@ApiOperation("鑾峰彇涓婃灦淇℃伅")
--
Gitblit v1.9.1