diff --git a/插件库/Lskj.PubBillSpecial/BillModule.cs b/插件库/Lskj.PubBillSpecial/BillModule.cs index c48ae5c..4649077 100644 --- a/插件库/Lskj.PubBillSpecial/BillModule.cs +++ b/插件库/Lskj.PubBillSpecial/BillModule.cs @@ -867,7 +867,7 @@ namespace Lskj.PubBillSpecial if ((rowItem["orderid"] + "").Equals("999")) { string ModuleCode = model.DllParam2; - FrmSource frmSource = new FrmSource(ModuleCode, SysModel, model.MaxWindow,false); + FrmSource frmSource = new FrmSource(ModuleCode, SysModel, model.MaxWindow, false); frmSource.PrimaryKey = this.BillModel.PrimaryKey; frmSource.PrimaryValue = this.lblOrderNo.Text; frmSource.DocumentColor = DocumentColor; @@ -881,7 +881,7 @@ namespace Lskj.PubBillSpecial else if ((rowItem["orderid"] + "").Equals("888")) { string ModuleCode = model.DllParam2; - FrmSource frmSource = new FrmSource(ModuleCode, SysModel, model.MaxWindow,true); + FrmSource frmSource = new FrmSource(ModuleCode, SysModel, model.MaxWindow, true); frmSource.PrimaryKey = this.BillModel.PrimaryKey; frmSource.PrimaryValue = this.lblOrderNo.Text; frmSource.DocumentColor = DocumentColor; @@ -1627,6 +1627,7 @@ namespace Lskj.PubBillSpecial } string gridExSql = this.gridEx.SysModel.MenuSql; gridExSql = ReplaceHelper.ReplaceRowParam(rowItem, gridExSql); + this.gridEx.GridControlObj.LastSearchSql = gridExSql; this.gridEx.GridControlObj.SetGridViewDataSource(BaseImpl.GetDataTableResult(gridExSql)); } else @@ -1669,6 +1670,7 @@ namespace Lskj.PubBillSpecial { userControl.EditText = this.rdRed.Checked ? "1" : "0"; } + this.gridEx.GridControlObj.LastSearchSql = this.gridEx.SysModel.MenuSql; this.gridEx.GridControlObj.SetGridViewDataSource(new DataTable()); } @@ -6794,43 +6796,4 @@ namespace Lskj.PubBillSpecial if (rightEdge > maxRightEdge) { maxRightEdge = rightEdge; - } - } - } - } - if (minLeft == int.MaxValue) minLeft = 0; - - - int MovingDistance = (Screen.PrimaryScreen.WorkingArea.Width - maxRightEdge) / 2; - - if (dataTable.Columns.Contains("controlLeft") && MovingDistance > 0) - { - foreach (DataRow item in dataTable.Rows) - { - item["controlLeft"] = int.Parse(item["controlLeft"] + "") + MovingDistance - minLeft; - - } - } - return dataTable; - } - - - /// - /// 判断是不是数值 - /// - /// - /// - private bool IsNumberic(string oText) - { - try - { - int var1 = Convert.ToInt32(oText); - return true; - } - catch - { - return false; - } - } - } -} \ No newline at end of file + \ No newline at end of file