SVN r976
SVN-Revision: r976
This commit is contained in:
@@ -1483,6 +1483,7 @@ namespace Lskj.PubBill
|
||||
if (gridColumn.Tag != null)
|
||||
{
|
||||
gridColumnModel = (GridColumnModel)gridColumn.Tag;
|
||||
|
||||
}
|
||||
rowItem = this.gcMain.GridView.GetDataRow(this.gcMain.GridView.FocusedRowHandle);
|
||||
}
|
||||
@@ -4169,6 +4170,9 @@ namespace Lskj.PubBill
|
||||
}
|
||||
}
|
||||
this.gcMain.GridView.EndDataUpdate();
|
||||
|
||||
if (SystemInfo.Instance.BillAddAtTheEnd) isLastRow = true;
|
||||
|
||||
if (!isLastRow)
|
||||
{
|
||||
// 插入数据行
|
||||
@@ -4186,11 +4190,11 @@ namespace Lskj.PubBill
|
||||
|
||||
|
||||
// 插入数据后
|
||||
if (isLastRow)
|
||||
{
|
||||
this.gcMain.GridView.ClearSelection();
|
||||
this.gcMain.GridView.SelectRowHandler(position + 1);
|
||||
}
|
||||
//if (isLastRow)
|
||||
//{
|
||||
// this.gcMain.GridView.ClearSelection();
|
||||
// this.gcMain.GridView.SelectRowHandler(position + 1);
|
||||
//}
|
||||
if (!string.IsNullOrEmpty(NumberMc) && gridTable.Columns.Contains(mRecordPrimaryField))
|
||||
{
|
||||
DataRow[] rt = gridTable.Rows.Cast<DataRow>().Where(x => (newRow[BillModel.DetailPreFix + "ProductId"] + "").Equals(x[BillModel.DetailPreFix + "ProductId"] + "") && !string.IsNullOrEmpty(x[mRecordPrimaryField] + "")).ToArray();
|
||||
@@ -4355,6 +4359,9 @@ namespace Lskj.PubBill
|
||||
}
|
||||
}
|
||||
newRow.EndEdit();
|
||||
|
||||
if (SystemInfo.Instance.BillAddAtTheEnd) isLastRow = true;
|
||||
|
||||
if (!isLastRow)
|
||||
{
|
||||
// 插入数据行
|
||||
@@ -4769,6 +4776,7 @@ namespace Lskj.PubBill
|
||||
try
|
||||
{
|
||||
string detailCond = ReplaceHelper.ReplaceRowParam(rowItem, unionModel.ModelObj.DetailEnableCond);
|
||||
detailCond = detailCond.ToLower();//2025-09-08 赵坤表示条件全部转成小写判断。 来源明细中不能配置单元格类型(不能配置 复选框条件 {xxx}=0 ),只能写{xxx}='Ture'。这种bit类型容易忘记大小的情况
|
||||
if (detailCond.Contains("#"))
|
||||
{
|
||||
List<string> condition = ReplaceHelper.GetParamFields(detailCond);
|
||||
|
||||
Reference in New Issue
Block a user