From 7f587af8df390b4a00027d522b84eff082ca6ed8 Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Fri, 22 Sep 2023 08:45:46 +0800
Subject: [PATCH] WCS任务完成改ID锁
---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/controller/WcsController.java | 3 +--
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/controller/WcsController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/controller/WcsController.java
index 7358cc8..8123345 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/controller/WcsController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/controller/WcsController.java
@@ -157,8 +157,7 @@ public class WcsController extends HuahengBaseController {
Result result = handleMultiProcess("completeTaskByWMS", lockKey, new MultiProcessListener() {
@Override
public Result<?> doProcess() {
- Result result = taskHeaderService.completeTaskByWMS(Integer.parseInt(taskNo), foldFlag);
- return result;
+ return taskHeaderService.completeTaskByWMS(Integer.parseInt(taskNo), foldFlag);
}
});
return result;
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
index 571dc9e..18b8bb7 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
@@ -341,11 +341,10 @@ public class TaskHeaderController extends HuahengBaseController {
return Result.error("taskHeader不能为空");
}
Integer taskId = taskHeader.getId();
- Result result = handleMultiProcess("completeTaskByWMS", new MultiProcessListener() {
+ Result result = handleMultiProcess("completeTaskByWMS", taskId + "", new MultiProcessListener() {
@Override
public Result<?> doProcess() {
- Result result = taskHeaderService.completeTaskByWMS(taskId, false);
- return result;
+ return taskHeaderService.completeTaskByWMS(taskId, false);
}
});
return result;
--
libgit2 0.22.2