diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index fda59f58..7f89af86 100644 --- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -350,7 +350,7 @@ public class DepotHeadService { modeName = "DiscountLastMoney"; allOtherMoney = depotHeadMapperEx.findAllOtherMoney(supplierId, type, subType, endTime); } - BigDecimal result = null; + BigDecimal result = BigDecimal.ZERO; try{ result =depotHeadMapperEx.findAllMoney(supplierId, type, subType, modeName, endTime); }catch(Exception e){ diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 6121f421..c03ff273 100644 --- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -301,13 +301,13 @@