From b9282435cb9cb9f5bc9b26cbc117930c1c18b5b3 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Thu, 5 Jan 2023 16:31:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=87=BA=E5=BA=93=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E5=8D=95=E4=BB=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DepositoryRecordServiceImpl.java | 35 ++----------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index e7fda9e4..cde739af 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -1014,13 +1014,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 重新计算总额 inventory.setAmounts(inventory.getQuantity() * inventory.getPrice()); - if (Integer.compare(inventory.getQuantity(), 0) != 0) { - // 重新计算单价 - BigDecimal decimal = BigDecimal.valueOf(inventory.getAmounts() / inventory.getQuantity()); - Double price = decimal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - inventory.setPrice(price); - } - // 修改库存记录 materialMapper.updateInventory(inventory); @@ -1118,12 +1111,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 重新计算总额 inventory.setAmounts(inventory.getQuantity() * inventory.getPrice()); - if (Integer.compare(inventory.getQuantity(), 0) != 0) { - // 重新计算单价 - BigDecimal decimal = BigDecimal.valueOf(inventory.getAmounts() / inventory.getQuantity()); - Double price = decimal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - inventory.setPrice(price); - } // 修改库存记录 materialMapper.updateInventory(inventory); @@ -1178,12 +1165,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 设置新库存 inventory.setQuantity(inventory.getQuantity() - residue - 1); - if (Integer.compare(inventory.getQuantity(), 0) != 0) { - // 重新计算单价 - BigDecimal decimal = BigDecimal.valueOf(inventory.getAmounts() / inventory.getQuantity()); - Double price = decimal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - inventory.setPrice(price); - } //更新库存 materialMapper.updateInventory(inventory); @@ -1427,12 +1408,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 重新设置总额 inventory.setAmounts(inventory.getAmounts() - inventory_quantity * inventory.getPrice()); - if (Integer.compare(materialAndPlace.getQuantity(), 0) != 0) { - // 重新计算单价 - BigDecimal decimal = BigDecimal.valueOf(inventory.getAmounts() / inventory.getQuantity()); - Double price = decimal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - inventory.setPrice(price); - } // 修改库存数量 materialMapper.updateInventory(inventory); placeMapper.updateMaterialAndPlace(materialAndPlace); @@ -1463,12 +1438,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { inventory.setQuantity(inventory.getQuantity() - surplus_redundant); // 设置当前总额 inventory.setAmounts(inventory.getPrice() * inventory.getQuantity()); - if (Integer.compare(inventory.getQuantity(), 0) != 0) { - // 设置当前单价 - BigDecimal decimal = BigDecimal.valueOf(inventory.getAmounts() / inventory.getQuantity()); - Double price = decimal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - inventory.setPrice(price); - } + // 修改库存数量 materialMapper.updateInventory(inventory); placeMapper.updateMaterialAndPlace(materialAndPlace); @@ -3561,8 +3531,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Double price = 0.0; // 数量 Integer count = 0; - for (int i = 0; i < minList.size(); i++) { - ApplicationOutRecordMin recordMin = minList.get(i); + for (ApplicationOutRecordMin recordMin : minList) { count += recordMin.getQuantity(); // 获取当前出库物料 Inventory materialById = materialMapper.findInventoryById(recordMin.getMid());