From 9c2df944ffcd3a60312ae179d347f16f2c36a0ea Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期三, 19 十一月 2025 13:13:14 +0800
Subject: [PATCH] 功能優化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 16 ++++++++--------
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 12 +++++++++---
2 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index 72bab80..2290ddf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -442,11 +442,17 @@
//// }
// }
- task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
- if (!taskService.updateById(task)) {
- throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐�");
+ try {
+ taskService.pickOrCheckTask(task.getId(), "");
+ } catch (Exception e) {
+ e.printStackTrace();
}
+// task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
+// if (!taskService.updateById(task)) {
+// throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐�");
+// }
+
return R.ok();
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index c693288..3117099 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -1207,14 +1207,14 @@
}
if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
-// if (!this.update(new LambdaUpdateWrapper<Task>()
-// .eq(Task::getId, task.getId())
-// .set(Task::getUpdateBy, loginUserId)
-// .set(Task::getUpdateTime, new Date())
-// .set(Task::getTaskStatus, TaskStsType.WAVE_SEED.id))) {
-// throw new CoolException("搴撳瓨鐘舵�佹洿鏂板け璐ワ紒锛�");
-// }
- pickOrCheckTask(task.getId(), null);
+ if (!this.update(new LambdaUpdateWrapper<Task>()
+ .eq(Task::getId, task.getId())
+ .set(Task::getUpdateBy, loginUserId)
+ .set(Task::getUpdateTime, new Date())
+ .set(Task::getTaskStatus, TaskStsType.WAVE_SEED.id))) {
+ throw new CoolException("搴撳瓨鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+
} else {
if (!this.update(new LambdaUpdateWrapper<Task>()
.eq(Task::getId, task.getId())
--
Gitblit v1.9.1