From 2e87d667c674eaa5e14f912677c7e1ab77dc6eb7 Mon Sep 17 00:00:00 2001 From: zhengxuming Date: Tue, 12 Aug 2025 16:01:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9D=A5=E6=96=99=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inAndOut/service/impl/InBillServiceImpl.java | 8 +++++--- .../wms/warehouse_manage/service/util/UpdateIvtUtils.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java index 49fa455..163a4ea 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java @@ -783,7 +783,7 @@ public class InBillServiceImpl extends ServiceImpl i // 获取组盘信息 GroupPlate groupPlate = mdPbGroupplateService.getOne(new LambdaQueryWrapper() .eq(GroupPlate::getStoragevehicle_code, whereJson.get("vehicle_code")) - .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("组盘"))); + .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))); if (ObjectUtil.isEmpty(groupPlate)) { throw new BadRequestException("托盘[" + whereJson.get("vehicle_code") + "]状态为组盘的信息不存在！"); } @@ -808,9 +808,11 @@ public class InBillServiceImpl extends ServiceImpl i } else if (StatusEnum.IOBILL_TYPE_IN.code("余料入库").equals(invObj.getBill_type())) { // 获取组盘信息 GroupPlate groupPlate = mdPbGroupplateService.getOne(new LambdaQueryWrapper() - .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code()) - .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("组盘"))); + .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code())); + if (ObjectUtil.isEmpty(groupPlate)) { + throw new BadRequestException("托盘[" + ioStorInvDis.getStoragevehicle_code() + "]的信息不存在！"); + } JSONObject task = new JSONObject(); task.put("config_code", IOSConstant.BACK_IN_TASK); task.put("group_id", groupPlate.getGroup_id()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java index f56aa31..15a7e69 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java @@ -197,7 +197,7 @@ public class UpdateIvtUtils { } // 如果可用数和冻结数都为零则删除数据 if (frozen_qty == 0 && extDao.getQty().doubleValue() == 0) { - iMdPbStoragevehicleextService.removeById(extDao); + iMdPbGroupPlateService.removeById(extDao); } else { extDao.setFrozen_qty(BigDecimal.valueOf(frozen_qty)); extDao.setUpdate_id(SecurityUtils.getCurrentUserId());