cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r1240

Browse Source 
SVN-Revision: r1240
This commit is contained in:
cyf
2026-06-26 09:37:02 +00:00
parent 155d88f3ce
commit 68cc9cc7b1
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBill/BillModule.cs
+21 -7
View File
@@ -1828,6 +1828,7 @@ namespace Lskj.PubBill
{ {
this.tb_buttom.OnDetailSaveGridCallBack += Tab_OnDetailSaveGridCallBack; this.tb_buttom.OnDetailSaveGridCallBack += Tab_OnDetailSaveGridCallBack;
} }
this.tb_buttom.BillDetailRightGridCallBack += Tab_OnDetailSaveGridCallBack;//OnMrpBtnClickCallback
if (this.BillModel.RefreshSelectedDetail) if (this.BillModel.RefreshSelectedDetail)
{ {
//配置了只刷新当前页签后，切换页签时刷新 //配置了只刷新当前页签后，切换页签时刷新
@@ -4448,6 +4449,7 @@ namespace Lskj.PubBill
} }
else if (!string.IsNullOrEmpty(model.DefaultValue)) else if (!string.IsNullOrEmpty(model.DefaultValue))
{ {
if (string.IsNullOrEmpty(newRow[col.FieldName] + "") || this.BillModel.DragFixedDefault) if (string.IsNullOrEmpty(newRow[col.FieldName] + "") || this.BillModel.DragFixedDefault)
{ {
newRow[col.FieldName] = fieldValue; newRow[col.FieldName] = fieldValue;
@@ -5543,8 +5545,7 @@ namespace Lskj.PubBill
// 继续执行保存 // 继续执行保存
if (string.IsNullOrWhiteSpace(tipMsg)) tipMsg = "保存单据临时表失败"; if (string.IsNullOrWhiteSpace(tipMsg)) tipMsg = "保存单据临时表失败";
if (MessageUtil.Show(tipMsg, MessageBoxButtons.YesNo) == DialogResult.Yes) if (MessageUtil.Show(tipMsg, MessageBoxButtons.YesNo) == DialogResult.Yes)
this.BillSave(1, canTipMsg); saveResult = this.BillSave(1, canTipMsg);
saveResult = true;
break; break;
default: default:
// 保存失败 // 保存失败
@@ -7145,8 +7146,14 @@ namespace Lskj.PubBill
DataTable details = BillImpl.GetDataTableResult(ReplaceHelper.ReplaceRowParam(rowItem, unionModel.ModelObj.DetailSql)); DataTable details = BillImpl.GetDataTableResult(ReplaceHelper.ReplaceRowParam(rowItem, unionModel.ModelObj.DetailSql));
if (unionModel.ModelObj.sourceDetailType != "1" && unionModel.GridDetailControlObj.GridView != null && rowIndex == FocuseIndex) if (unionModel.ModelObj.sourceDetailType != "1" && unionModel.GridDetailControlObj.GridView != null && rowIndex == FocuseIndex)
{ {
//details = unionModel.GridDetailControlObj.GridView.GetGridViewFilteredAndSortedDataToDataTable(); if (SystemInfo.Instance.SourceFilteringMobile)
details = unionModel.GridDetailControlObj.GridControl.DataSource as DataTable; {
details = unionModel.GridDetailControlObj.GridView.GetGridViewFilteredAndSortedDataToDataTable();
}
else
{
details = unionModel.GridDetailControlObj.GridControl.DataSource as DataTable;
}
} }
else if (unionModel.ModelObj.sourceDetailType == "1" && unionModel.TreeGridDetailControlObj.TreeListObj != null && rowIndex == FocuseIndex) else if (unionModel.ModelObj.sourceDetailType == "1" && unionModel.TreeGridDetailControlObj.TreeListObj != null && rowIndex == FocuseIndex)
{ {
@@ -9199,7 +9206,14 @@ namespace Lskj.PubBill
DataTable details = BillImpl.GetDataTableResult(ReplaceHelper.ReplaceRowParam(rowItem, unionModel.ModelObj.DetailSql)); DataTable details = BillImpl.GetDataTableResult(ReplaceHelper.ReplaceRowParam(rowItem, unionModel.ModelObj.DetailSql));
if (unionModel.ModelObj.sourceDetailType != "1" && unionModel.GridDetailControlObj.GridView != null && rowIndex == FocuseIndex) if (unionModel.ModelObj.sourceDetailType != "1" && unionModel.GridDetailControlObj.GridView != null && rowIndex == FocuseIndex)
{ {
details = unionModel.GridDetailControlObj.GridView.GetGridViewFilteredAndSortedDataToDataTable(); if (SystemInfo.Instance.SourceFilteringMobile)
{
details = unionModel.GridDetailControlObj.GridView.GetGridViewFilteredAndSortedDataToDataTable();
}
else
{
details = unionModel.GridDetailControlObj.GridControl.DataSource as DataTable;
}
} }
else if (unionModel.ModelObj.sourceDetailType == "1" && unionModel.TreeGridDetailControlObj.TreeListObj != null && rowIndex == FocuseIndex) else if (unionModel.ModelObj.sourceDetailType == "1" && unionModel.TreeGridDetailControlObj.TreeListObj != null && rowIndex == FocuseIndex)
{ {
@@ -9996,7 +10010,7 @@ namespace Lskj.PubBill
string condition = CondItem["condition"] + ""; string condition = CondItem["condition"] + "";
if (!string.IsNullOrWhiteSpace(condition)) if (!string.IsNullOrWhiteSpace(condition))
{ {
if (detailTable != null && detailTable.Rows.Count > 0) if (detailTable != null && detailTable.Rows.Count > 0)
{ {
condition = this.ControlObj.ReplaceParentControlValue(condition); condition = this.ControlObj.ReplaceParentControlValue(condition);
@@ -10005,4 +10019,4 @@ namespace Lskj.PubBill
if (!ValidateCond(condition, item)) if (!ValidateCond(condition, item))
{ {
MessageUtil.Show(string.IsNullOrWhiteSpace(CondItem["hintmsg"] + "") ? "条件验证失败" : CondItem["hintmsg"] + ""); MessageUtil.Show(string.IsNullOrWhiteSpace(CondItem["hintmsg"] + "") ? "条件验证失败" : CondItem["hintmsg"] + "");
r