From 450985af371a1df9213aab55f458876d4597b90a Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Fri, 24 May 2024 23:55:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BF=AE=E6=AD=A3=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC=E7=9A=84=E6=8E=A5=E5=8F=A3=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/service/depotItem/DepotItemService.java   | 8 ++++++--
 .../src/main/resources/mapper_xml/DepotItemMapperEx.xml   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
index 198a6466..480505b8 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
@@ -1075,7 +1075,9 @@ public class DepotItemService {
                     //数量*单价  另外计算新的成本价
                     currentAllPrice = currentAllPrice.add(item.getAllPrice());
                     currentNumber = currentNumber.add(item.getBnum());
-                    currentUnitPrice = currentAllPrice.divide(currentNumber, 2, BigDecimal.ROUND_HALF_UP);
+                    if(currentNumber.compareTo(BigDecimal.ZERO)!=0) {
+                        currentUnitPrice = currentAllPrice.divide(currentNumber, 2, BigDecimal.ROUND_HALF_UP);
+                    }
                 }
             }
             //出库
@@ -1085,7 +1087,9 @@ public class DepotItemService {
                     //数量*单价  另外计算新的成本价
                     currentAllPrice = currentAllPrice.add(item.getAllPrice());
                     currentNumber = currentNumber.add(item.getBnum());
-                    currentUnitPrice = currentAllPrice.divide(currentNumber, 2, BigDecimal.ROUND_HALF_UP);
+                    if(currentNumber.compareTo(BigDecimal.ZERO)!=0) {
+                        currentUnitPrice = currentAllPrice.divide(currentNumber, 2, BigDecimal.ROUND_HALF_UP);
+                    }
                 } else {
                     currentNumber = currentNumber.add(item.getBnum());
                     BigDecimal outNum = item.getBnum()!=null?item.getBnum():BigDecimal.ZERO;
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index a5caf880..96fec126 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -147,7 +147,7 @@
 
     <select id="findDetailByDepotIdsAndMaterialIdList" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="DetailByTypeAndMIdResultMap">
         select tb.number, tb.bar_code, tb.material_name, tb.type, tb.sub_type, tb.b_num, tb.unit_price,
-               tb.b_num*tb.unit_price as all_price, tb.depotName, tb.oTime from
+        ifnull(tb.b_num*tb.unit_price,0) as all_price, tb.depotName, tb.oTime from
         (select dh.number,me.bar_code,m.name material_name,dh.type,dh.sub_type,
         case
             when type='入库' then ifnull(di.basic_number,0)