From afd2cfd8d63a243405d49d889e4fe1084e455b3f Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 12 一月 2026 12:41:40 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/WaitPakinParam.java | 5 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java | 2 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 16 ++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 11 +++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 3 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java | 24 +++++++++++
8 files changed, 61 insertions(+), 3 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 5f368f8..2fc6416 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
@@ -20,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.*;
@@ -171,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')")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
index 5ce4eff..95dc3e3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
@@ -43,6 +43,8 @@
WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId);
+ WaitPakin mergeItemsWcs(WaitPakinParam waitPakin, Long userId);
+
WaitPakin unBind(WaitPakinParam param);
R inspect(String code, Long loginUserId);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 23933bb..cd63789 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -564,6 +564,17 @@
}
/**
+ * @author Munch D. Luffy
+ * @date 2026/01/09
+ * @description: PDA缁勬嫋
+ * @version 1.0
+ */
+ @Override
+ public WaitPakin mergeItemsWcs(WaitPakinParam waitPakin, Long userId) {
+ return waitPakinService.mergeItemsWcs(waitPakin, userId);
+ }
+
+ /**
* @param param
* @return
* @author Ryan
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index 3670db5..28dbb84 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -984,6 +984,9 @@
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
Task one = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getTaskCode, params.getSuperTaskNo()));
+ if (Cools.isEmpty(one)) {
+ return R.error(params.getSuperTaskNo()+"浠诲姟鍙�==>鏈煡璇㈠埌鐩稿叧浠诲姟锛侊紒锛�");
+ }
if (params.getMsgType().equals(WcsMsgTypeEvent.TASK_COMPLETE.event)){
if (!Cools.isEmpty(one)) {
one.setTaskStatus(one.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.AWAIT.id);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index 9c47abf..b0f4d66 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -92,7 +92,7 @@
}
@PreAuthorize("hasAuthority('manager:task:remove')")
- @ApiOperation("鍙栨秷/鍒犻櫎宸ヤ綔鏋佹。")
+ @ApiOperation("鍙栨秷/鍒犻櫎宸ヤ綔妗�")
@PostMapping("/task/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
if (Objects.isNull(ids) || ids.length < 1) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/WaitPakinParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/WaitPakinParam.java
index c1c9673..8e112ad 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/WaitPakinParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/WaitPakinParam.java
@@ -26,7 +26,10 @@
private String type;
@ApiModelProperty("AGV绔欑偣")
- private String staNo;
+ private String staNo = "";
+
+ @ApiModelProperty("AGV鍛煎彨鏍囪")
+ private int agvSign = 0;
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java
index 2df66e4..87bd8d3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java
@@ -10,6 +10,7 @@
public interface WaitPakinService extends IService<WaitPakin> {
WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId);
+ WaitPakin mergeItemsWcs(WaitPakinParam waitPakin, Long userId);
WaitPakin unBind(WaitPakinParam param);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index 926ed70..fe137f7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -174,6 +174,22 @@
return pakin;
}
+
+
+ /**
+ * @author Munch D. Luffy
+ * @date 2026/01/09
+ * @description: PDA缁勬嫋鍚庡懠鍙獳GV
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public synchronized WaitPakin mergeItemsWcs(WaitPakinParam waitPakin, Long userId) {
+
+
+ return null;
+ }
+
/**
* @param
* @return
--
Gitblit v1.9.1