From e6f3a6d92af80778897a6cf034e7d71135f7cd32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=97=AD=E6=98=8E=5C73939?= <739390650@QQ.COM> Date: Fri, 19 Dec 2025 10:04:37 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=90=88=E6=89=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HandheldServiceImpl.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java index a5797f7..0b7e873 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java @@ -871,7 +871,9 @@ public class HandheldServiceImpl implements HandheldService { try { // 4. 查询源托盘的所有物料信息 List allSourceMaterials = iSchBaseVehiclematerialgroupService.selectByVehicleCode(sourceVehicleCode); - + if(CollectionUtils.isEmpty(allSourceMaterials)){ + throw new BadRequestException("源托盘中不存在物料，无法合托"); + } // 7. 执行合托操作 for (int i = 0; i < selectedMaterials.size(); i++) { @@ -896,6 +898,19 @@ public class HandheldServiceImpl implements HandheldService { } } + + if(allSourceMaterials.size() == selectedMaterials.size()) { + //源托盘点位变成空载具状态 + iSchBasePointService.update(Wrappers.lambdaUpdate(SchBasePoint.class) + .eq(SchBasePoint::getVehicle_code, sourceVehicleCode) + .set(SchBasePoint::getPoint_status, "1")); + } + + //目标托盘变成有货状态 + iSchBasePointService.update(Wrappers.lambdaUpdate(SchBasePoint.class) + .eq(SchBasePoint::getVehicle_code, targetVehicleCode) + .set(SchBasePoint::getPoint_status, "2")); + // 8. 判断是否需要入库：如果两个托盘都不在货架上，则需要入库 boolean needStoreIn = ObjectUtil.isEmpty(sourcePoint) && ObjectUtil.isEmpty(targetPoint);