修改财务管理部分财务明细未做操作时也可以保存

erp_web/js/pages/financial/advance_in.js

@@ -896,7 +896,6 @@ function CheckData() {
 function saveAccountHeadAndDetail(listType,ChangeAmount,TotalPrice,OrganId) {
     append();
     removeit();
-    if ($("#accountData").datagrid('getChanges').length) {
     if (!CheckData())
         return false;
     var inserted = $("#accountData").datagrid('getChanges', "inserted");
@@ -948,7 +947,6 @@ function saveAccountHeadAndDetail(listType,ChangeAmount,TotalPrice,OrganId) {
             $.messager.alert('提示',XmlHttpRequest.responseText,'error');
         }
     });
-    }
 
 }
 

erp_web/js/pages/financial/giro.js

@@ -803,7 +803,6 @@ function CheckData() {
 function saveAccountHeadAndDetail(listType,ChangeAmount,TotalPrice,OrganId) {
     append();
     removeit();
-    if ($("#accountData").datagrid('getChanges').length) {
     if (!CheckData())
         return false;
     var inserted = $("#accountData").datagrid('getChanges', "inserted");
@@ -855,6 +854,5 @@ function saveAccountHeadAndDetail(listType,ChangeAmount,TotalPrice,OrganId) {
             $.messager.alert('提示',XmlHttpRequest.responseText,'error');
         }
     });
-    }
 
 }
\ No newline at end of file

erp_web/js/pages/financial/item_in.js

@@ -819,7 +819,6 @@ function CheckData() {
 function saveAccountHeadAndDetail(listType,ChangeAmount,TotalPrice,OrganId) {
     append();
     removeit();
-    if ($("#accountData").datagrid('getChanges').length) {
     if (!CheckData())
         return false;
     var inserted = $("#accountData").datagrid('getChanges', "inserted");
@@ -871,6 +870,5 @@ function saveAccountHeadAndDetail(listType,ChangeAmount,TotalPrice,OrganId) {
             $.messager.alert('提示',XmlHttpRequest.responseText,'error');
         }
     });
-    }
 
 }
\ No newline at end of file

erp_web/js/pages/financial/item_out.js

@@ -825,7 +825,6 @@ function CheckData() {
 function saveAccountHeadAndDetail(listType,ChangeAmount,TotalPrice,OrganId) {
     append();
     removeit();
-    if ($("#accountData").datagrid('getChanges').length) {
     if (!CheckData())
         return false;
     var inserted = $("#accountData").datagrid('getChanges', "inserted");
@@ -877,6 +876,5 @@ function saveAccountHeadAndDetail(listType,ChangeAmount,TotalPrice,OrganId) {
             $.messager.alert('提示',XmlHttpRequest.responseText,'error');
         }
     });
-    }
 
 }
\ No newline at end of file

erp_web/js/pages/financial/money_in.js

@@ -815,7 +815,6 @@ function CheckData() {
 function saveAccountHeadAndDetail(listType,ChangeAmount,TotalPrice,OrganId) {
     append();
     removeit();
-    if ($("#accountData").datagrid('getChanges').length) {
     if (!CheckData())
         return false;
     var inserted = $("#accountData").datagrid('getChanges', "inserted");
@@ -867,6 +866,5 @@ function saveAccountHeadAndDetail(listType,ChangeAmount,TotalPrice,OrganId) {
             $.messager.alert('提示',XmlHttpRequest.responseText,'error');
         }
     });
-    }
 
 }
\ No newline at end of file

erp_web/js/pages/financial/money_out.js

@@ -837,7 +837,6 @@ function CheckData() {
 function saveAccountHeadAndDetail(listType,ChangeAmount,TotalPrice,OrganId) {
     append();
     removeit();
-    if ($("#accountData").datagrid('getChanges').length) {
     if (!CheckData())
         return false;
     var inserted = $("#accountData").datagrid('getChanges', "inserted");
@@ -889,6 +888,5 @@ function saveAccountHeadAndDetail(listType,ChangeAmount,TotalPrice,OrganId) {
             $.messager.alert('提示',XmlHttpRequest.responseText,'error');
         }
     });
-    }
 
 }
\ No newline at end of file

src/main/java/com/jsh/erp/service/supplier/SupplierService.java

@@ -202,7 +202,7 @@ public class SupplierService {
         int result=0;
         try{
             if(supplier!=null){
-                supplier.setAdvancein(supplier.getAdvancein().add(advanceIn));  //增加预收款的金额，可能增加的是负值
+                supplier.setAdvancein((supplier.getAdvancein()==null?BigDecimal.ZERO:supplier.getAdvancein()).add(advanceIn));  //增加预收款的金额，可能增加的是负值
                  result=supplierMapper.updateByPrimaryKeySelective(supplier);
             }
         }catch(Exception e){