From b5bfe8b7992a5daebcb99ac6ba0fb1b8024caf57 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 10 三月 2026 10:49:14 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
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 2249ac0..8f88520 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
@@ -762,7 +762,7 @@
//绉诲簱
moveInStock(task, loginUserId);
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_IN.type)) {
- //绉诲簱
+ //绌烘澘鍏ュ簱
complateInstockE(task, loginUserId);
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type)) {
//瓒婂簱
@@ -930,7 +930,7 @@
}
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
-
+ String type = LocStsType.LOC_STS_TYPE_F.type;
if (!taskItems.isEmpty()) {
//绉诲簱鏈夊彲鑳芥槸绌烘澘
try {
@@ -943,12 +943,14 @@
if (!locItemService.remove(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocCode, task.getOrgLoc()))) {
throw new CoolException("婧愬簱浣嶆槑缁嗗垹闄ゅけ璐ワ紒");
}
+ } else {
+ type = LocStsType.LOC_STS_TYPE_D.type;
}
/**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/
if (!locService.update(new LambdaUpdateWrapper<Loc>()
.set(Loc::getBarcode, task.getBarcode())
- .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type)
+ .set(Loc::getUseStatus, type)
.set(Loc::getUpdateBy, loginUserId)
.set(Loc::getUpdateTime, new Date())
.eq(Loc::getCode, task.getTargLoc()))) {
@@ -1132,7 +1134,39 @@
if (!taskService.updateById(task)) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
+ // 鐩樼偣鍐嶅叆搴撲换鍔＄粨鏉燂細灏嗗叧鑱旂殑鐩樼偣宸紓鍗曠疆涓哄凡瀹℃牳
+ if (TaskType.TASK_TYPE_CHECK_IN.type.equals(task.getTaskType())) {
+ markCheckDiffApprovedWhenCheckInDone(task);
+ }
+ }
+ /**
+ * 鐩樼偣鍐嶅叆搴撳畬鎴愬悗锛屽皢鍏宠仈鐨勭洏鐐瑰樊寮傚崟缃负宸插鏍革紙鏈夊崟鎸� orderId锛屾棤鍗曟寜 鍑哄簱浠诲姟鍙� orderCode锛�
+ */
+ @Override
+ public void markCheckDiffApprovedWhenCheckInDone(Task checkInTask) {
+ List<TaskItem> items = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, checkInTask.getId()).last("limit 1"));
+ Long orderId = items.isEmpty() ? null : items.get(0).getOrderId();
+ CheckDiff checkDiff = null;
+ if (orderId != null && !orderId.equals(0L)) {
+ checkDiff = checkDiffService.getOne(new LambdaQueryWrapper<CheckDiff>().eq(CheckDiff::getOrderId, orderId).last("limit 1"));
+ } else {
+ Task outTask = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .eq(Task::getBarcode, checkInTask.getBarcode())
+ .eq(Task::getTaskType, TaskType.TASK_TYPE_CHECK_OUT.type)
+ .last("limit 1"));
+ if (outTask != null) {
+ checkDiff = checkDiffService.getOne(new LambdaQueryWrapper<CheckDiff>()
+ .eq(CheckDiff::getOrderCode, outTask.getTaskCode())
+ .and(w -> w.isNull(CheckDiff::getOrderId).or().eq(CheckDiff::getOrderId, 0))
+ .last("limit 1"));
+ }
+ }
+ if (checkDiff != null && !CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_END.val.equals(checkDiff.getExceStatus())) {
+ checkDiffService.update(new LambdaUpdateWrapper<CheckDiff>()
+ .eq(CheckDiff::getId, checkDiff.getId())
+ .set(CheckDiff::getExceStatus, CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_END.val));
+ }
}
/**
--
Gitblit v1.9.1