From 29de5e9bf0fcd2771836f3135214e9de9e7f5204 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 14 一月 2026 16:46:55 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 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 2fc6416..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
@@ -8,6 +8,7 @@
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;
@@ -47,6 +48,8 @@
private TaskService taskService;
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private AgvService agvService;
/**
* PDA鐢ㄦ埛鐧诲綍
* @param param
@@ -114,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());
}
@@ -164,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("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
@@ -172,28 +182,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()));
- taskService.generateFlatWarehouseTasks(waitPakin, waitPakinPda.getStaNo(), userId);
-// mobileService.mergeItemsWcs(waitPakin,userId);
- } catch (Exception e) {
-// log.error("寮傛澶勭悊AGV鍚庣画閫昏緫澶辫触", e);
- }
}
@PreAuthorize("hasAuthority('manager:waitPakin:update')")
--
Gitblit v1.9.1