优化供应商对账

src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java

@@ -343,10 +343,12 @@ public class DepotHeadService {
 
     public BigDecimal findAllMoney(Integer supplierId, String type, String subType, String mode, String endTime)throws Exception {
         String modeName = "";
+        BigDecimal allOtherMoney = BigDecimal.ZERO;
         if (mode.equals("实际")) {
             modeName = "ChangeAmount";
         } else if (mode.equals("合计")) {
             modeName = "DiscountLastMoney";
+            allOtherMoney = depotHeadMapperEx.findAllOtherMoney(supplierId, type, subType, endTime);
         }
         BigDecimal result = null;
         try{
@@ -354,6 +356,9 @@ public class DepotHeadService {
         }catch(Exception e){
             JshException.readFail(logger, e);
         }
+        if(allOtherMoney!=null) {
+            result = result.add(allOtherMoney);
+        }
         return result;
     }