From 093c43638d3f9aa64fc3b396a0a2452cc28abbe3 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期五, 23 五月 2025 18:59:39 +0800 Subject: [PATCH] 生成移库任务 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 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 ebf1007..d6484af 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 @@ -465,12 +465,17 @@ if (Objects.isNull(locWorking)) { throw new CoolException("鏁版嵁閿欒锛屼綔涓氫腑搴撳瓨鏁版嵁涓㈠け锛侊紒"); } - if (locWorking.getAnfme().compareTo(taskItem.getAnfme()) >= 0) { - locWorking.setAnfme(Math.round((locWorking.getAnfme() - taskItem.getAnfme()) * 10000) / 10000.0); + if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) { + locWorking.setWorkQty(0.0); + locWorking.setAnfme(taskItem.getAnfme()); } else { - continue; + if (locWorking.getAnfme().compareTo(taskItem.getAnfme()) >= 0) { + locWorking.setWorkQty(0.0); + locWorking.setAnfme(Math.round((locWorking.getAnfme() - taskItem.getAnfme()) * 10000) / 10000.0); + } else { + continue; + } } - BeanUtils.copyProperties(locWorking, locItem); locItem.setLocCode(loc.getCode()).setLocId(loc.getId()).setId(null); items.add(locItem); @@ -721,18 +726,19 @@ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�"); } - 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::getTaskStatus, TaskStsType.UPDATED_OUT.id))) { - throw new CoolException("搴撳瓨鐘舵�佹洿鏂板け璐ワ紒锛�"); - } - } else { + 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::getTaskStatus, TaskStsType.WAVE_SEED.id))) { throw new CoolException("搴撳瓨鐘舵�佹洿鏂板け璐ワ紒锛�"); } + } else { + if (!this.update(new LambdaUpdateWrapper<Task>() + .eq(Task::getId, task.getId()) + .set(Task::getTaskStatus, TaskStsType.UPDATED_OUT.id))) { + throw new CoolException("搴撳瓨鐘舵�佹洿鏂板け璐ワ紒锛�"); + } + } } -- Gitblit v1.9.1