purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
qiankunpingtai
2019-05-22 16:40:05 +08:00
parent 79d4c7d24c
commit 3a78eb511a
7 changed files with 295 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erp_web/js/pages/financial/advance_in.js
View File

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

2
erp_web/js/pages/financial/giro.js
View File

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

2
erp_web/js/pages/financial/item_in.js
View File

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

2
erp_web/js/pages/financial/item_out.js
View File

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

2
erp_web/js/pages/financial/money_in.js
View File

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

2
erp_web/js/pages/financial/money_out.js
View File

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

2
src/main/java/com/jsh/erp/service/supplier/SupplierService.java
View File

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