From b047606665a6ff18dca3084cf979600a3deb7a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Mon, 13 Jan 2025 08:42:24 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=BA=93=E5=AD=98=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8A=A5=E6=8D=9F=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8A=A5=E6=8D=9F=E6=9B=B4=E6=96=B0=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=9F=A5=E8=AF=A2service=E6=96=B9=E6=B3=95,=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=85=B1=E4=BA=AB=E5=BA=93=E5=AD=98=E6=95=B0=EF=BC=9B?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E7=BB=93=E6=9D=9Fservice=E6=96=B9=E6=B3=95=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=BA=93=E5=AD=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehouseInventoryReportDamageServiceImpl.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java index a032de91..30ba8efd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java @@ -244,9 +244,15 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve Integer reportDamageNum = Optional.ofNullable(inventoryInquiry.getReportDamageNum()).orElse(0); reportDamageNum = reportDamageNum + damageChild.getActualScrapQuantity(); inventoryInquiry.setReportDamageNum(reportDamageNum); + Integer availableNum = Optional.ofNullable(inventoryInquiry.getAvailableStockNum()).orElse(0); availableNum = availableNum - damageChild.getActualScrapQuantity(); inventoryInquiry.setAvailableStockNum(availableNum); + + Integer sharedAvailableNum = Optional.ofNullable(inventoryInquiry.getSharedAvailableStockNum()).orElse(0); + sharedAvailableNum = sharedAvailableNum - damageChild.getActualScrapQuantity(); + inventoryInquiry.setSharedAvailableStockNum(sharedAvailableNum); + inventoryInquiry.setUpdateBy(ShiroUtils.getLoginName()); inventoryInquiry.setUpdateTime(DateUtils.getNowDate()); return inventoryInquiryMapper.updateWarehouseInventoryInquiry(inventoryInquiry); @@ -345,6 +351,13 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve reportDamegeVo.setAuditStatus("1"); reportDamegeVo.setUseStatus("1"); + List damageChildren = reportDamegeVo.getWarehouseInventoryReportDamageChildList(); + if(StringUtils.isEmpty(damageChildren)){ + throw new BusinessException("报损物料子表为空!"); + } + for (WarehouseInventoryReportDamageChild child: damageChildren) { + updateWarehouseInventoryInquiry(child); + } } warehouseInventoryReportDamageMapper.updateWarehouseInventoryReportDamage(reportDamegeVo); return processInstance;