From 2a525ad190855dc8cf234eeb690e0c74eff06fcf Mon Sep 17 00:00:00 2001 From: HuangHuiKang Date: Tue, 7 Jul 2026 11:36:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/service/stock/ErpStockOutServiceImpl.java | 10 +++++++++- .../service/deviceledger/DeviceLedgerServiceImpl.java | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java index 051e1936e..0cb3a6aa7 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java @@ -422,7 +422,7 @@ public class ErpStockOutServiceImpl implements ErpStockOutService { item -> copyStockOutItem(sourceItem, warehouseId, areaId)); BigDecimal palletCount = resolvePalletCount(pallet, sourceItem); if (palletCount.compareTo(BigDecimal.ZERO) <= 0) { - throw exception(STOCK_OUT_PRODUCT_PALLET_COUNT_EMPTY, pallet.getPalletId()); + throw exception(STOCK_OUT_PRODUCT_PALLET_COUNT_EMPTY, getPalletCodeOrId(pallet.getPalletId())); } palletTotalCount = palletTotalCount.add(palletCount); targetItem.setCount(defaultZero(targetItem.getCount()).add(palletCount)); @@ -440,6 +440,14 @@ public class ErpStockOutServiceImpl implements ErpStockOutService { reqVO.setItems(normalizedItems); } + private Object getPalletCodeOrId(Long palletId) { + if (palletId == null) { + return null; + } + ErpPalletDO pallet = palletMapper.selectById(palletId); + return pallet != null && pallet.getCode() != null ? pallet.getCode() : palletId; + } + private ErpStockOutSaveReqVOItem copyStockOutItem(ErpStockOutSaveReqVOItem sourceItem, Long warehouseId, Long areaId) { ErpStockOutSaveReqVOItem targetItem = BeanUtils.toBean(sourceItem, ErpStockOutSaveReqVOItem.class); targetItem.setId(null); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java index d81f972e1..2eee9f026 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java @@ -255,6 +255,9 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService { updateObj.setComponentId(updateObj.getComponentId()==null?"":updateObj.getComponentId()); updateObj.setBeijianId(updateObj.getBeijianId()==null?"":updateObj.getBeijianId()); deviceLedgerMapper.updateById(updateObj); + deviceLedgerMapper.update(null, Wrappers.lambdaUpdate() + .eq(DeviceLedgerDO::getId, updateObj.getId()) + .set(DeviceLedgerDO::getDvId, updateReqVO.getDvId())); deviceLedgerComponentRelService.replaceByDeviceLedgerId(updateObj.getId(), updateReqVO.getComponentId()); deviceLedgerSpareRelService.replaceByDeviceLedgerId(updateObj.getId(), updateReqVO.getBeijianId()); }