From 6922624789e23bbcc7f3c7609af642efb3894c88 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期一, 12 一月 2026 12:46:53 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 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 71510d6..83fcfa2 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,10 @@
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.MobileService;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.QlyIsptItem;
@@ -17,6 +20,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.*;
@@ -110,7 +114,7 @@
@ApiOperation("鑾峰彇鏀惰揣鍖�")
@GetMapping("/areas/receipt")
public R getReceiptAreas() {
- return mobileService.getReceiptAreas();
+ return mobileService.getReceiptAreas(getLoginUser());
}
@@ -168,7 +172,28 @@
if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
}
- return R.ok(mobileService.mergeItems(waitPakin, userId));
+// return R.ok(mobileService.mergeItems(waitPakin, userId));
+ try{
+ mobileService.mergeItems(waitPakin, userId);
+ if (waitPakin.getAgvSign()==1) {
+ asyncProcessAfterValidation(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')")
@@ -209,7 +234,7 @@
@ApiOperation("蹇�熻川妫�淇℃伅")
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
- @PostMapping("/inspect/query")
+// @PostMapping("/inspect/query")
public R checkObjs(@RequestBody CheckObjParams params) {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -225,7 +250,7 @@
if (Objects.isNull(params) || params.isEmpty()) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return mobileService.checkUpdate(params);
+ return mobileService.checkUpdate(params, getLoginUserId());
}
@ApiOperation("鑾峰彇涓婃灦淇℃伅")
--
Gitblit v1.9.1