From 27ca6c0f6552a9041ea38f102c44ec4a01ee3ed4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Sat, 11 Jan 2025 11:36:36 +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=EF=BC=9B?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=A0=B9=E6=8D=AE=E6=8A=A5=E6=8D=9F?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E7=94=9F=E6=88=90=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95service=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...houseInventoryReportDamageServiceImpl.java | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

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 6e8966d1..a032de91 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
@@ -237,17 +237,16 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve
             throw new BusinessException("新增库存报损失败，该物料无库存数据");
         }
         WarehouseInventoryInquiryDetail inquiryDetail = createWarehouseInventoryInquiryDetail(damageChild);
-//        inquiryDetail.setInventoryHistoricalType("9");
         int detailInsertResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail);
         if(detailInsertResult<=0){
             throw new BusinessException("新增库存历史失败！");
         }
-//        BigDecimal reportDamageNum = inventoryInquiry.getReportDamageNum();
-//        reportDamageNum = reportDamageNum.add(damageChild.getActualScrapQuantity());
-//        inventoryInquiry.setReportDamageNum(reportDamageNum);
-//        BigDecimal availableNum = inventoryInquiry.getAvailableStockNum();
-//        availableNum = availableNum.subtract(damageChild.getActualScrapQuantity());
-//        inventoryInquiry.setAvailableStockNum(availableNum);
+        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);
         inventoryInquiry.setUpdateBy(ShiroUtils.getLoginName());
         inventoryInquiry.setUpdateTime(DateUtils.getNowDate());
         return inventoryInquiryMapper.updateWarehouseInventoryInquiry(inventoryInquiry);
@@ -257,15 +256,13 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve
     public WarehouseInventoryInquiryDetail createWarehouseInventoryInquiryDetail(WarehouseInventoryReportDamageChild damageChild){
         WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail();
         inquiryDetail.setMaterialNo(damageChild.getMaterialNo());
-//        inquiryDetail.setMaterialName(damageChild.getMaterialName());
-//        inquiryDetail.setMaterialBrand(damageChild.getMaterialBrand());
-//        inquiryDetail.setMaterialPhotourl(damageChild.getMaterialPhotourl());
-//        inquiryDetail.setMaterialDescribe(damageChild.getMaterialDescribe());
-//        inquiryDetail.setMaterialUnit(damageChild.getMaterialUnit());
-//        inquiryDetail.setMaterialType(damageChild.getMaterialType());
         inquiryDetail.setInventoryIncreaseDecrease("0");
         Integer decreaseNum = damageChild.getActualScrapQuantity();
-//        inquiryDetail.setAvailableStockNum(decreaseNum);
+        inquiryDetail.setIncreaseDecreaseNum(decreaseNum);
+        inquiryDetail.setInquiryBusinessType("8");
+        inquiryDetail.setInquiryOrderType("16");
+        inquiryDetail.setInquiryWarehouseType("17");
+        inquiryDetail.setCorrelationCode(damageChild.getReportDamageCode());
         inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate());
         inquiryDetail.setCreateBy(ShiroUtils.getLoginName());
         inquiryDetail.setCreateTime(DateUtils.getNowDate());