From 2a79f41d727ab653638d81fcb32ed9fe08c54580 Mon Sep 17 00:00:00 2001 From: zhengxuming <739390650@QQ.COM> Date: Mon, 3 Nov 2025 23:06:51 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/util/tasks/zw/DownEmptyUpFullTask.java | 10 +++++++++- .../service/util/tasks/zw/SeparateMaterialTask.java | 8 +++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java index fa21101..8d88b32 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.sun.org.apache.xpath.internal.operations.Bool; import org.apache.commons.collections4.CollectionUtils; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; @@ -239,12 +240,19 @@ public class DownEmptyUpFullTask extends AbstractTask { .eq(GroupPlate::getStoragevehicle_code, taskObj.getVehicle_code()) .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))); + + boolean groupPlatesNotEmpty = CollectionUtils.isNotEmpty(groupPlates); + String groupId = null; + if(groupPlatesNotEmpty){ + groupId = groupPlates.get(0).getGroup_id(); + } + //点位3 pointService.update(new LambdaUpdateWrapper() .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code()) .set(SchBasePoint::getPoint_status, "3") .set(SchBasePoint::getVehicle_qty, 1) - .set(CollectionUtils.isNotEmpty(groupPlates),SchBasePoint::getRemark,groupPlates.get(0).getGroup_id()) + .set(groupPlatesNotEmpty,SchBasePoint::getRemark,groupId) .set(SchBasePoint::getUpdate_id, SecurityUtils.getCurrentUserId()) .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) .set(SchBasePoint::getUpdate_time, DateUtil.now()) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java index 5fb3dbb..c17b250 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java @@ -181,12 +181,18 @@ public class SeparateMaterialTask extends AbstractTask { .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))); + boolean groupPlatesNotEmpty = CollectionUtils.isNotEmpty(groupPlates); + String groupId = null; + if(groupPlatesNotEmpty){ + groupId = groupPlates.get(0).getGroup_id(); + } + //更改点位的托盘信息，空托盘的点位 2为空托盘放置点位 pointService.update(new LambdaUpdateWrapper() .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code()) .set(SchBasePoint::getPoint_status, "3") .set(SchBasePoint::getVehicle_qty, 1) - .set(CollectionUtils.isNotEmpty(groupPlates),SchBasePoint::getRemark,groupPlates.get(0).getGroup_id()) + .set(groupPlatesNotEmpty,SchBasePoint::getRemark,groupId) .set(SchBasePoint::getUpdate_id, SecurityUtils.getCurrentUserId()) .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) .set(SchBasePoint::getUpdate_time, DateUtil.now())