From b8b5785627c262546c296b8586998a5f5447e6a9 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 21 四月 2025 08:05:34 +0800
Subject: [PATCH] UI总体检查
---
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs | 2
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs | 2
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs | 17
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs | 91 +++-
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs | 2
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs | 2
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.Designer.cs | 44 +
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs | 2
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs | 2
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 4
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs | 42 +
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 2
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs | 2
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs | 2
DevApp/Gs.DevApp/UserControl/SelectHz.cs | 6
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs | 2
DevApp/Gs.DevApp/UserControl/SelectCk.cs | 2
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 38 +
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 2
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs | 2
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs | 2
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs | 2
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 2
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs | 2
DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs | 2
DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs | 2
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs | 2
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 2
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 2
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 4
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs | 101 +++--
DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.Designer.cs | 10
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs | 92 +++--
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs | 2
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs | 2
DevApp/Gs.DevApp/UserControl/SelectOrg.cs | 2
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs | 3
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs | 2
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs | 2
DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.cs | 10
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 2
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs | 2
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 2
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs | 164 +++++----
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.cs | 2
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs | 2
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs | 2
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs | 2
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs | 2
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.cs | 42 +-
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs | 2
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 2
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs | 2
DevApp/Gs.DevApp/DevFrm/User/User.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 2
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs | 5
DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.cs | 4
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs | 2
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs | 99 +++--
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs | 2
DevApp/Gs.DevApp/UserControl/ShowFilter.cs | 3
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs | 6
DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs | 91 +++-
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs | 2
94 files changed, 597 insertions(+), 423 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
index a819bbf..fcd3062 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
@@ -31,13 +31,13 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -82,6 +82,8 @@
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -162,6 +164,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -174,7 +177,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1219, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
@@ -203,7 +207,9 @@
this.gv_remark,
this.gv_fforbidstatus,
this.gv_fseller,
- this.gridColumn1});
+ this.gridColumn1,
+ this.gridColumn2,
+ this.gridColumn3});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -334,7 +340,7 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "query_a.lastupdate_date";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 9;
+ this.gridColumn1.VisibleIndex = 10;
this.gridColumn1.Width = 180;
//
// pageBar1
@@ -361,7 +367,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -371,6 +377,7 @@
// splitMx1.Panel2
//
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1219, 570);
this.splitMx1.SplitterPosition = 120;
this.splitMx1.TabIndex = 0;
@@ -527,29 +534,29 @@
this.layoutControlItem10});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3});
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
this.Root.Size = new System.Drawing.Size(1219, 120);
this.Root.TextVisible = false;
//
@@ -656,6 +663,24 @@
this.layoutControlItem10.Text = "鍚屾鏃堕棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(65, 18);
//
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "涓婚敭Guid";
+ this.gridColumn2.FieldName = "guid";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "瀹㈡埛ID";
+ this.gridColumn3.FieldName = "id";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 9;
+ this.gridColumn3.Width = 94;
+ //
// Frm_Customer
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -753,5 +778,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs
index 3d93cd6..29de301 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs
@@ -104,7 +104,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.cust_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
index 35319a7..3f72eda 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
@@ -80,6 +80,7 @@
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -203,7 +204,8 @@
this.gv_depextr4,
this.gv_remark,
this.gv_parentId,
- this.gridColumn1});
+ this.gridColumn1,
+ this.gridColumn2});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -240,6 +242,8 @@
this.gv_departmentid.OptionsColumn.AllowEdit = false;
this.gv_departmentid.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_departmentid.Tag = "query_a.departmentid";
+ this.gv_departmentid.Visible = true;
+ this.gv_departmentid.VisibleIndex = 9;
this.gv_departmentid.Width = 94;
//
// gv_departmentcode
@@ -362,7 +366,7 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "query_a.lastupdate_date";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 9;
+ this.gridColumn1.VisibleIndex = 10;
this.gridColumn1.Width = 180;
//
// pageBar1
@@ -642,6 +646,14 @@
this.layoutControlItem10.Text = "WIP浠撳簱";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "涓婚敭Guid";
+ this.gridColumn2.FieldName = "guid";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Width = 94;
+ //
// Frm_Department
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -732,5 +744,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
index ce85d58..32e3a9d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
@@ -34,10 +34,6 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
-
-
-
-
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -112,7 +108,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc,a.departmentcode",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
index 5e690c1..bc0a07b 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -52,7 +52,6 @@
this.gv_depotName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_depottype = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_isNg = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_zuid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_isFkc = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -61,13 +60,14 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_isFkc = new DevExpress.XtraEditors.TextEdit();
- this.txt_isNg = new DevExpress.XtraEditors.TextEdit();
this.txt_depotCode = new DevExpress.XtraEditors.TextEdit();
this.txt_zuid = new DevExpress.XtraEditors.TextEdit();
this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
@@ -83,7 +83,6 @@
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -97,6 +96,8 @@
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_isNg = new DevExpress.XtraEditors.TextEdit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -117,7 +118,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_isFkc.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
@@ -133,13 +133,14 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -180,6 +181,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -192,7 +194,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1264, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
@@ -220,7 +223,6 @@
this.gv_depotName,
this.gv_depottype,
this.gv_createBy,
- this.gv_isNg,
this.gv_zuid,
this.gv_isFkc,
this.gridColumn2,
@@ -228,7 +230,9 @@
this.gridColumn5,
this.gridColumn4,
this.gridColumn7,
- this.gridColumn3});
+ this.gridColumn3,
+ this.gridColumn8,
+ this.gridColumn9});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -300,20 +304,6 @@
this.gv_createBy.VisibleIndex = 4;
this.gv_createBy.Width = 71;
//
- // gv_isNg
- //
- this.gv_isNg.AppearanceCell.Options.UseFont = true;
- this.gv_isNg.Caption = "涓嶈壇鍝佷粨";
- this.gv_isNg.FieldName = "isNg";
- this.gv_isNg.MaxWidth = 50;
- this.gv_isNg.MinWidth = 50;
- this.gv_isNg.Name = "gv_isNg";
- this.gv_isNg.OptionsColumn.AllowEdit = false;
- this.gv_isNg.Tag = "query_a.is_ng";
- this.gv_isNg.Visible = true;
- this.gv_isNg.VisibleIndex = 5;
- this.gv_isNg.Width = 50;
- //
// gv_zuid
//
this.gv_zuid.AppearanceCell.Options.UseFont = true;
@@ -324,7 +314,7 @@
this.gv_zuid.OptionsColumn.AllowEdit = false;
this.gv_zuid.Tag = "query_a.zuid";
this.gv_zuid.Visible = true;
- this.gv_zuid.VisibleIndex = 6;
+ this.gv_zuid.VisibleIndex = 5;
this.gv_zuid.Width = 71;
//
// gv_isFkc
@@ -338,7 +328,7 @@
this.gv_isFkc.OptionsColumn.AllowEdit = false;
this.gv_isFkc.Tag = "query_a.is_fkc";
this.gv_isFkc.Visible = true;
- this.gv_isFkc.VisibleIndex = 7;
+ this.gv_isFkc.VisibleIndex = 6;
this.gv_isFkc.Width = 60;
//
// gridColumn2
@@ -350,7 +340,7 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Tag = "query_a.zuid";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 8;
+ this.gridColumn2.VisibleIndex = 7;
this.gridColumn2.Width = 50;
//
// gridColumn6
@@ -361,7 +351,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Tag = "query_a.SUPPLIER_ID";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 9;
+ this.gridColumn6.VisibleIndex = 8;
this.gridColumn6.Width = 70;
//
// gridColumn5
@@ -372,7 +362,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "query_a.Client_Id";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 10;
+ this.gridColumn5.VisibleIndex = 9;
this.gridColumn5.Width = 60;
//
// gridColumn4
@@ -383,7 +373,7 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Tag = "query_a.department";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 11;
+ this.gridColumn4.VisibleIndex = 10;
this.gridColumn4.Width = 60;
//
// gridColumn7
@@ -394,7 +384,7 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Tag = "query_a.Phone";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 12;
+ this.gridColumn7.VisibleIndex = 11;
this.gridColumn7.Width = 60;
//
// gridColumn3
@@ -407,6 +397,24 @@
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 13;
this.gridColumn3.Width = 180;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "涓婚敭Guid";
+ this.gridColumn8.FieldName = "guid";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Width = 94;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "浠撳簱ID";
+ this.gridColumn9.FieldName = "depotId";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 12;
+ this.gridColumn9.Width = 94;
//
// pageBar1
//
@@ -432,7 +440,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -443,6 +451,7 @@
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1264, 570);
this.splitMx1.SplitterPosition = 82;
this.splitMx1.TabIndex = 0;
@@ -480,80 +489,70 @@
//
// txt_isFkc
//
- this.txt_isFkc.Location = new System.Drawing.Point(1052, 12);
+ this.txt_isFkc.Location = new System.Drawing.Point(1032, 12);
this.txt_isFkc.Name = "txt_isFkc";
this.txt_isFkc.Properties.Appearance.Options.UseFont = true;
- this.txt_isFkc.Size = new System.Drawing.Size(200, 24);
+ this.txt_isFkc.Size = new System.Drawing.Size(220, 24);
this.txt_isFkc.StyleController = this.layoutMx1;
this.txt_isFkc.TabIndex = 291;
this.txt_isFkc.Tag = "readonly";
//
- // txt_isNg
- //
- this.txt_isNg.Location = new System.Drawing.Point(1052, 43);
- this.txt_isNg.Name = "txt_isNg";
- this.txt_isNg.Properties.Appearance.Options.UseFont = true;
- this.txt_isNg.Size = new System.Drawing.Size(200, 24);
- this.txt_isNg.StyleController = this.layoutMx1;
- this.txt_isNg.TabIndex = 267;
- this.txt_isNg.Tag = "readonly";
- //
// txt_depotCode
//
- this.txt_depotCode.Location = new System.Drawing.Point(119, 12);
+ this.txt_depotCode.Location = new System.Drawing.Point(99, 12);
this.txt_depotCode.Name = "txt_depotCode";
this.txt_depotCode.Properties.Appearance.Options.UseFont = true;
- this.txt_depotCode.Size = new System.Drawing.Size(200, 24);
+ this.txt_depotCode.Size = new System.Drawing.Size(220, 24);
this.txt_depotCode.StyleController = this.layoutMx1;
this.txt_depotCode.TabIndex = 213;
this.txt_depotCode.Tag = "readonly";
//
// txt_zuid
//
- this.txt_zuid.Location = new System.Drawing.Point(741, 43);
+ this.txt_zuid.Location = new System.Drawing.Point(721, 43);
this.txt_zuid.Name = "txt_zuid";
this.txt_zuid.Properties.Appearance.Options.UseFont = true;
- this.txt_zuid.Size = new System.Drawing.Size(200, 24);
+ this.txt_zuid.Size = new System.Drawing.Size(220, 24);
this.txt_zuid.StyleController = this.layoutMx1;
this.txt_zuid.TabIndex = 285;
this.txt_zuid.Tag = "readonly";
//
// txt_depotName
//
- this.txt_depotName.Location = new System.Drawing.Point(430, 12);
+ this.txt_depotName.Location = new System.Drawing.Point(410, 12);
this.txt_depotName.Name = "txt_depotName";
this.txt_depotName.Properties.Appearance.Options.UseFont = true;
- this.txt_depotName.Size = new System.Drawing.Size(200, 24);
+ this.txt_depotName.Size = new System.Drawing.Size(220, 24);
this.txt_depotName.StyleController = this.layoutMx1;
this.txt_depotName.TabIndex = 216;
this.txt_depotName.Tag = "readonly";
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(741, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(721, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(200, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(220, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 219;
this.txt_createBy.Tag = "readonly";
//
// txt_description
//
- this.txt_description.Location = new System.Drawing.Point(119, 43);
+ this.txt_description.Location = new System.Drawing.Point(99, 43);
this.txt_description.Name = "txt_description";
this.txt_description.Properties.Appearance.Options.UseFont = true;
- this.txt_description.Size = new System.Drawing.Size(200, 24);
+ this.txt_description.Size = new System.Drawing.Size(220, 24);
this.txt_description.StyleController = this.layoutMx1;
this.txt_description.TabIndex = 217;
this.txt_description.Tag = "readonly";
//
// txt_depottype
//
- this.txt_depottype.Location = new System.Drawing.Point(430, 43);
+ this.txt_depottype.Location = new System.Drawing.Point(410, 43);
this.txt_depottype.Name = "txt_depottype";
this.txt_depottype.Properties.Appearance.Options.UseFont = true;
- this.txt_depottype.Size = new System.Drawing.Size(200, 24);
+ this.txt_depottype.Size = new System.Drawing.Size(220, 24);
this.txt_depottype.StyleController = this.layoutMx1;
this.txt_depottype.TabIndex = 231;
this.txt_depottype.Tag = "readonly";
@@ -615,7 +614,7 @@
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(311, 31);
this.layoutControlItem1.Text = "浠撳簱缂栫爜";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(95, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem2
//
@@ -625,7 +624,7 @@
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.Size = new System.Drawing.Size(311, 31);
this.layoutControlItem2.Text = "浠撳簱鍚嶇О";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(95, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem3
//
@@ -635,7 +634,7 @@
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem3.Size = new System.Drawing.Size(311, 31);
this.layoutControlItem3.Text = "浠撳簱璐熻矗浜�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(95, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem4
//
@@ -645,7 +644,7 @@
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem4.Size = new System.Drawing.Size(311, 31);
this.layoutControlItem4.Text = "澶囨敞";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(95, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem5
//
@@ -656,7 +655,7 @@
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem5.Size = new System.Drawing.Size(311, 31);
this.layoutControlItem5.Text = "浠撳簱绫诲瀷";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(95, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem6
//
@@ -667,7 +666,7 @@
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem6.Size = new System.Drawing.Size(311, 31);
this.layoutControlItem6.Text = "鍒嗙粍";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(95, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
//
@@ -677,18 +676,7 @@
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.Size = new System.Drawing.Size(311, 31);
this.layoutControlItem7.Text = "鍏佽璐熷簱瀛�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_isNg;
- this.layoutControlItem8.Location = new System.Drawing.Point(933, 31);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(311, 31);
- this.layoutControlItem8.Text = "鏄惁涓嶈壇鍝佷粨 ";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(95, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
//
// tabMx
//
@@ -833,6 +821,27 @@
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_isNg;
+ this.layoutControlItem8.Location = new System.Drawing.Point(933, 31);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem8.Size = new System.Drawing.Size(311, 31);
+ this.layoutControlItem8.Text = "绂佺敤鐘舵��";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // txt_isNg
+ //
+ this.txt_isNg.Location = new System.Drawing.Point(1032, 43);
+ this.txt_isNg.Name = "txt_isNg";
+ this.txt_isNg.Properties.Appearance.Options.UseFont = true;
+ this.txt_isNg.Size = new System.Drawing.Size(220, 24);
+ this.txt_isNg.StyleController = this.layoutMx1;
+ this.txt_isNg.TabIndex = 267;
+ this.txt_isNg.Tag = "readonly";
+ //
// Frm_MesDepot
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -862,7 +871,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_isFkc.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
@@ -878,13 +886,14 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -900,7 +909,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_depotName;
private DevExpress.XtraGrid.Columns.GridColumn gv_depottype;
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isNg;
private DevExpress.XtraGrid.Columns.GridColumn gv_zuid;
private DevExpress.XtraGrid.Columns.GridColumn gv_isFkc;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
@@ -917,7 +925,6 @@
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_isFkc;
private DevExpress.XtraEditors.TextEdit txt_zuid;
- private DevExpress.XtraEditors.TextEdit txt_isNg;
private DevExpress.XtraEditors.TextEdit txt_depottype;
private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.TextEdit txt_description;
@@ -931,7 +938,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
@@ -945,5 +951,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraEditors.TextEdit txt_isNg;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
index 45fed5b..3667cf9 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
@@ -236,7 +236,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.depot_code", "asc",
"", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
index 4b89ab9..87f4b16 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
@@ -107,7 +107,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
index 63c7314..58b00c4 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -119,6 +119,7 @@
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -225,6 +226,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -237,7 +239,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1158, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
@@ -280,7 +283,8 @@
this.gv_produceUnitNo,
this.gv_depotNo,
this.gv_isStatus,
- this.gridColumn1});
+ this.gridColumn1,
+ this.gridColumn3});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.HorzScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always;
this.gridView1.IndicatorWidth = 50;
@@ -405,8 +409,6 @@
this.gv_bomNo.Name = "gv_bomNo";
this.gv_bomNo.OptionsColumn.AllowEdit = false;
this.gv_bomNo.Tag = "query_a.bomNo";
- this.gv_bomNo.Visible = true;
- this.gv_bomNo.VisibleIndex = 8;
this.gv_bomNo.Width = 60;
//
// gv_materialGroup
@@ -419,7 +421,7 @@
this.gv_materialGroup.OptionsColumn.AllowEdit = false;
this.gv_materialGroup.Tag = "query_a.materialGroup";
this.gv_materialGroup.Visible = true;
- this.gv_materialGroup.VisibleIndex = 9;
+ this.gv_materialGroup.VisibleIndex = 8;
this.gv_materialGroup.Width = 130;
//
// gv_itemUnitNo
@@ -433,7 +435,7 @@
this.gv_itemUnitNo.OptionsColumn.AllowEdit = false;
this.gv_itemUnitNo.Tag = "query_c.fname";
this.gv_itemUnitNo.Visible = true;
- this.gv_itemUnitNo.VisibleIndex = 10;
+ this.gv_itemUnitNo.VisibleIndex = 9;
this.gv_itemUnitNo.Width = 50;
//
// gv_purchaseUnitNo
@@ -447,7 +449,7 @@
this.gv_purchaseUnitNo.OptionsColumn.AllowEdit = false;
this.gv_purchaseUnitNo.Tag = "query_d.fname";
this.gv_purchaseUnitNo.Visible = true;
- this.gv_purchaseUnitNo.VisibleIndex = 11;
+ this.gv_purchaseUnitNo.VisibleIndex = 10;
this.gv_purchaseUnitNo.Width = 50;
//
// gv_saleUnitNo
@@ -461,7 +463,7 @@
this.gv_saleUnitNo.OptionsColumn.AllowEdit = false;
this.gv_saleUnitNo.Tag = "query_e.fname";
this.gv_saleUnitNo.Visible = true;
- this.gv_saleUnitNo.VisibleIndex = 12;
+ this.gv_saleUnitNo.VisibleIndex = 11;
this.gv_saleUnitNo.Width = 50;
//
// gv_storeUnitNo
@@ -475,7 +477,7 @@
this.gv_storeUnitNo.OptionsColumn.AllowEdit = false;
this.gv_storeUnitNo.Tag = "query_f.fname";
this.gv_storeUnitNo.Visible = true;
- this.gv_storeUnitNo.VisibleIndex = 13;
+ this.gv_storeUnitNo.VisibleIndex = 12;
this.gv_storeUnitNo.Width = 50;
//
// gv_subconUnitNo
@@ -489,7 +491,7 @@
this.gv_subconUnitNo.OptionsColumn.AllowEdit = false;
this.gv_subconUnitNo.Tag = "query_g.fname";
this.gv_subconUnitNo.Visible = true;
- this.gv_subconUnitNo.VisibleIndex = 14;
+ this.gv_subconUnitNo.VisibleIndex = 13;
this.gv_subconUnitNo.Width = 50;
//
// gv_produceUnitNo
@@ -503,7 +505,7 @@
this.gv_produceUnitNo.OptionsColumn.AllowEdit = false;
this.gv_produceUnitNo.Tag = "query_h.fname";
this.gv_produceUnitNo.Visible = true;
- this.gv_produceUnitNo.VisibleIndex = 15;
+ this.gv_produceUnitNo.VisibleIndex = 14;
this.gv_produceUnitNo.Width = 50;
//
// gv_depotNo
@@ -515,8 +517,6 @@
this.gv_depotNo.Name = "gv_depotNo";
this.gv_depotNo.OptionsColumn.AllowEdit = false;
this.gv_depotNo.Tag = "query_m.depot_name";
- this.gv_depotNo.Visible = true;
- this.gv_depotNo.VisibleIndex = 16;
this.gv_depotNo.Width = 94;
//
// gv_isStatus
@@ -530,7 +530,7 @@
this.gv_isStatus.OptionsColumn.AllowEdit = false;
this.gv_isStatus.Tag = "query_a.fforbidstatus";
this.gv_isStatus.Visible = true;
- this.gv_isStatus.VisibleIndex = 17;
+ this.gv_isStatus.VisibleIndex = 15;
this.gv_isStatus.Width = 50;
//
// gridColumn1
@@ -544,7 +544,7 @@
this.gridColumn1.OptionsFilter.FilterPopupMode = DevExpress.XtraGrid.Columns.FilterPopupMode.Date;
this.gridColumn1.Tag = "query_a.lastupdate_date";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 18;
+ this.gridColumn1.VisibleIndex = 16;
this.gridColumn1.Width = 180;
//
// pageBar1
@@ -571,7 +571,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -581,6 +581,7 @@
// splitMx1.Panel2
//
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1158, 570);
this.splitMx1.SplitterPosition = 214;
this.splitMx1.TabIndex = 0;
@@ -1181,6 +1182,14 @@
this.layoutControlItem23.Text = "绂佺敤鐘舵��";
this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
//
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "涓婚敭Guid";
+ this.gridColumn3.FieldName = "guid";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Width = 94;
+ //
// Frm_MesItems
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1339,5 +1348,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
index 804a86d..f26d3c6 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
@@ -107,7 +107,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.item_no asc", "",
"", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
index d8c7991..8a538df 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
@@ -30,14 +30,14 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -94,6 +94,8 @@
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -182,6 +184,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -194,7 +197,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(970, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
@@ -223,7 +227,9 @@
this.gv_fprecision,
this.gv_fdescription,
this.gv_fforbidstatus,
- this.gridColumn1});
+ this.gridColumn1,
+ this.gridColumn2,
+ this.gridColumn3});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -351,7 +357,7 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "query_a.lastupdate_date";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 9;
+ this.gridColumn1.VisibleIndex = 10;
this.gridColumn1.Width = 180;
//
// pageBar1
@@ -378,7 +384,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -388,6 +394,7 @@
// splitMx1.Panel2
//
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(970, 570);
this.splitMx1.SplitterPosition = 155;
this.splitMx1.TabIndex = 0;
@@ -606,32 +613,32 @@
this.layoutControlItem16});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4});
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8});
this.Root.Size = new System.Drawing.Size(970, 155);
this.Root.TextVisible = false;
//
@@ -803,6 +810,24 @@
this.layoutControlItem16.Text = "鍗曚綅鎻忚堪";
this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
//
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "涓婚敭Guid";
+ this.gridColumn2.FieldName = "guid";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鍗曚綅ID";
+ this.gridColumn3.FieldName = "id";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 9;
+ this.gridColumn3.Width = 94;
+ //
// Frm_MesUnit
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -920,5 +945,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
index 1ca4f0a..bc3de23 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
@@ -107,7 +107,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.fnumber", "asc", "",
_sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
index 7cb7493..f5fb3e4 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
@@ -30,14 +30,14 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -55,6 +55,7 @@
this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lineType = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_isZxbg = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -79,6 +80,7 @@
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -154,6 +156,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -166,7 +169,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
@@ -199,7 +203,9 @@
this.gv_lastupdateBy,
this.gv_lastupdateDate,
this.gv_lineType,
- this.gv_isZxbg});
+ this.gv_isZxbg,
+ this.gridColumn2,
+ this.gridColumn3});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -234,7 +240,7 @@
// gv_lineNo
//
this.gv_lineNo.AppearanceCell.Options.UseFont = true;
- this.gv_lineNo.Caption = "浜х嚎缂栧彿";
+ this.gv_lineNo.Caption = "绾夸綋缂栧彿";
this.gv_lineNo.FieldName = "lineNo";
this.gv_lineNo.MinWidth = 50;
this.gv_lineNo.Name = "gv_lineNo";
@@ -344,9 +350,17 @@
this.gv_isZxbg.Name = "gv_isZxbg";
this.gv_isZxbg.OptionsColumn.AllowEdit = false;
this.gv_isZxbg.Tag = "query_a.is_zxbg";
- this.gv_isZxbg.Visible = true;
- this.gv_isZxbg.VisibleIndex = 10;
this.gv_isZxbg.Width = 50;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "绾夸綋ID";
+ this.gridColumn2.FieldName = "id";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 10;
+ this.gridColumn2.Width = 94;
//
// pageBar1
//
@@ -372,7 +386,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -382,6 +396,7 @@
// splitMx1.Panel2
//
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
this.splitMx1.SplitterPosition = 147;
this.splitMx1.TabIndex = 0;
@@ -523,32 +538,32 @@
this.layoutControlItem8});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4});
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8});
this.Root.Size = new System.Drawing.Size(1126, 147);
this.Root.TextVisible = false;
//
@@ -634,6 +649,14 @@
this.layoutControlItem8.Text = "鏁寸嚎鎶ュ伐";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "涓婚敭Guid";
+ this.gridColumn3.FieldName = "guid";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Width = 94;
//
// Frm_MesWorkshopLine
//
@@ -724,5 +747,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
index 0084217..4377132 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
@@ -257,7 +257,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,c.departmentcode asc,a.line_no",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
index b7c3284..7ee83d7 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
@@ -31,13 +31,13 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -84,6 +84,8 @@
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -164,6 +166,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -176,7 +179,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1001, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 4;
@@ -210,7 +214,9 @@
this.gv_startDate,
this.gv_remark,
this.gv_fforbidStatus,
- this.gridColumn2});
+ this.gridColumn2,
+ this.gridColumn3,
+ this.gridColumn4});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -365,7 +371,7 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Tag = "query_a.lastupdate_date";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 9;
+ this.gridColumn2.VisibleIndex = 10;
this.gridColumn2.Width = 180;
//
// pageBar1
@@ -392,7 +398,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -402,6 +408,7 @@
// splitMx1.Panel2
//
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1001, 570);
this.splitMx1.SplitterPosition = 111;
this.splitMx1.TabIndex = 0;
@@ -558,29 +565,29 @@
this.layoutControlItem10});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3});
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
this.Root.Size = new System.Drawing.Size(1001, 111);
this.Root.TextVisible = false;
//
@@ -687,6 +694,24 @@
this.layoutControlItem10.Text = "澶囨敞";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "涓婚敭Guid";
+ this.gridColumn3.FieldName = "guid";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鍛樺伐ID";
+ this.gridColumn4.FieldName = "id";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 9;
+ this.gridColumn4.Width = 94;
+ //
// Frm_Staff
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -786,5 +811,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
index 81f4751..3852e31 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
@@ -109,7 +109,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.staff_no",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
index 76f0a76..59f9e4f 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -33,14 +33,14 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -89,6 +89,8 @@
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -219,7 +221,9 @@
this.gv_fstaffid,
this.gv_fforbidstatus,
this.gv_remark,
- this.gv_createDate});
+ this.gv_createDate,
+ this.gridColumn3,
+ this.gridColumn4});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -352,7 +356,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 9;
+ this.gv_createDate.VisibleIndex = 10;
this.gv_createDate.Width = 180;
//
// pageBar1
@@ -569,32 +573,32 @@
this.layoutControlItem12});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4});
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8});
this.Root.Size = new System.Drawing.Size(990, 153);
this.Root.TextVisible = false;
//
@@ -723,6 +727,24 @@
this.layoutControlItem12.Text = "澶囨敞";
this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
//
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "涓婚敭Guid";
+ this.gridColumn3.FieldName = "guid";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "渚涘簲鍟咺D";
+ this.gridColumn4.FieldName = "id";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 9;
+ this.gridColumn4.Width = 94;
+ //
// Frm_Supplier
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -828,5 +850,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
index 0a91895..1f33c65 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
@@ -107,7 +107,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.supp_no",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
index f328809..7d277a4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -401,7 +401,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "BILL_NO", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
index cf8de2c..702768c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
@@ -154,7 +154,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
index c514f3d..07791de 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
@@ -1,4 +1,3 @@
-using DevExpress.Utils.MVVM.Services;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -157,7 +156,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index c0feeff..9f19828 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -394,7 +394,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -623,7 +623,5 @@
}
}
}
-
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs
index 76b62af..1c9c173 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs
@@ -156,7 +156,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
index 330417b..ccf3f53 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
@@ -396,7 +396,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "BILL_NO", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.cs
index cb81da8..6a7c4e0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.cs
@@ -154,7 +154,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.cs b/DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.cs
index 2a46583..628e646 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.cs
@@ -1,6 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
+锘縰sing Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
index e27e65b..04912dc 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
@@ -393,7 +393,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += " and a.bl008='" + strType + "'";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
index a64faae..c55fd16 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
@@ -171,7 +171,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += " and a.out_type='" + strType + "'";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index 230fc67..e87c1ad 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -349,7 +349,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
/// <summary>
@@ -382,7 +381,6 @@
var _obj = new
{
guid = rowGuid,
- mxGuid = Guid.Empty.ToString(),
};
try
{
@@ -594,7 +592,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
// _sbSqlWhere += " and isnull(fsubmit,0)=0";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
index cd27e66..77346fb 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
@@ -346,7 +346,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += " and isnull(fsubmit,0)=1";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.cs b/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.cs
index b89fb5d..5d52267 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.cs
@@ -143,7 +143,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.Designer.cs
index 9f1d4de..2769662 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.Designer.cs
@@ -30,7 +30,7 @@
{
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -38,6 +38,7 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -64,34 +65,32 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gv_guid,
+ this.colChkInt,
this.gridColumn1,
this.gv_supplierItemCode,
this.gv_supplierItemName,
this.gridColumn5,
this.gridColumn2,
this.gridColumn4,
- this.gridColumn3});
+ this.gridColumn3,
+ this.gv_guid});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsSelection.MultiSelect = true;
- this.gridView1.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
- // gv_guid
+ // colChkInt
//
- this.gv_guid.AppearanceCell.Options.UseFont = true;
- this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
- this.gv_guid.FieldName = "dabGuid";
- this.gv_guid.MinWidth = 50;
- this.gv_guid.Name = "gv_guid";
- this.gv_guid.OptionsColumn.AllowEdit = false;
- this.gv_guid.OptionsColumn.ReadOnly = true;
- this.gv_guid.Tag = "query_a.guid";
- this.gv_guid.Width = 94;
+ this.colChkInt.Caption = ".";
+ this.colChkInt.FieldName = "chkInt";
+ this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+ this.colChkInt.MinWidth = 25;
+ this.colChkInt.Name = "colChkInt";
+ this.colChkInt.Visible = true;
+ this.colChkInt.VisibleIndex = 0;
+ this.colChkInt.Width = 94;
//
// gridColumn1
//
@@ -177,6 +176,18 @@
this.gridColumn3.VisibleIndex = 2;
this.gridColumn3.Width = 94;
//
+ // gv_guid
+ //
+ this.gv_guid.AppearanceCell.Options.UseFont = true;
+ this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
+ this.gv_guid.FieldName = "dabGuid";
+ this.gv_guid.MinWidth = 50;
+ this.gv_guid.Name = "gv_guid";
+ this.gv_guid.OptionsColumn.AllowEdit = false;
+ this.gv_guid.OptionsColumn.ReadOnly = true;
+ this.gv_guid.Tag = "query_a.guid";
+ this.gv_guid.Width = 94;
+ //
// panelControl1
//
this.panelControl1.Controls.Add(this.btnIn);
@@ -208,7 +219,7 @@
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.Name = "SelectFqcBox";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "璇烽�夋嫨椤圭爜";
+ this.Text = "璇烽�夋嫨绠辩爜";
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
@@ -230,5 +241,6 @@
private DevExpress.XtraEditors.SimpleButton btnIn;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.cs b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.cs
index 114e592..a291f04 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.cs
@@ -1,14 +1,8 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.ToolBox;
+锘縰sing Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.FQC
@@ -22,25 +16,37 @@
InitializeComponent();
this.daaNo = _daaNo;
this.Text = "璇烽�夋嫨銆�" + this.daaNo + "銆戠殑绠辩爜";
+ this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
+ this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gridView1); };
+ this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.colChkInt.OptionsFilter.AllowAutoFilter = false;
+ this.colChkInt.OptionsFilter.AllowFilter = false;
+ this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
getPageList(1);
btnIn.Click += (s, e) =>
{
+ gridView1.PostEditor();
+ gridView1.UpdateCurrentRow();
var list = new List<dynamic>();
- int[] rows = this.gridView1.GetSelectedRows();//鍏堣幏鍙栭�夋嫨琛岀殑琛屽彿
- DataTable dt = this.gcMain.DataSource as DataTable;//寰楀埌GridControl鐨勬暟鎹簮
- foreach (int idx in rows)
+ DataTable dt = this.gcMain.DataSource as DataTable;
{
- string _guid = dt.Rows[idx]["itemBarcode"].ToString();
- list.Add(new
+ foreach (DataRow dr in dt.Rows)
{
- itemBarcode = _guid,
- sl = "10",
- });
+ string checkBox = dr["chkInt"].ToString();
+ string _guid = dr["itemBarcode"].ToString();
+ if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
+ {
+ list.Add(new
+ {
+ itemBarcode = _guid,
+ sl = dr["quantity"].ToString()
+ });
+ }
+ }
}
- UpdateParent?.Invoke(this,
- new UpdateParentEventArgs { DynamicList = list });
- Close();
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list }); Close();
+
};
}
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.cs b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.cs
index 05b1ca1..c1a38f2 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.cs
@@ -6,7 +6,6 @@
using System.Data;
using System.Windows.Forms;
-
namespace Gs.DevApp.DevFrm.FQC
{
public partial class SelectFqcDaa : DevExpress.XtraEditors.XtraForm
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.cs b/DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.cs
index 55e3272..8da4cea 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.cs
@@ -1,16 +1,8 @@
-锘縰sing DevExpress.Utils.DirectXPaint;
-using DevExpress.XtraEditors;
-using Gs.DevApp.ToolBox;
+锘縰sing Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.FQC
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
index addf190..3ff5d5c 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
@@ -150,7 +150,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
// _sbSqlWhere += " and isnull(fsubmit,0)=0";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
index f47df39..1b08c74 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
@@ -107,7 +107,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.ACCOUNT asc ,a.CREATE_TIME",
"desc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs
index 7622a4a..cf127d8 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs
@@ -107,7 +107,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.fType",
"desc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
index 9696cbe..1cf550e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
@@ -395,8 +395,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 4ba7f62..58f3257 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -396,7 +396,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
// _sbSqlWhere += " and isnull(fsubmit,0)=0";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
index 97c2959..f22213e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -272,7 +272,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += " and b.guid is not null";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,b.ITEM_NO", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index 80dd640..b92dffa 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -418,7 +418,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 2d1a967..6c870b7 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -400,7 +400,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += " and b.guid is not null";
_sbSqlWhere += " and a.FTYPE='" + this.strType + "'";
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
index 79c1b25..c01eed0 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
@@ -1,5 +1,4 @@
-锘縰sing CefSharp.DevTools.CSS;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -140,7 +139,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.cs
index 53db70f..7390d0a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.cs
@@ -76,7 +76,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), _jyxm);
var json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index bd92903..d3f0353 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -410,7 +410,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
index b310f85..41affff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
@@ -144,7 +144,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index 7bbe0f6..b310195 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -434,7 +434,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "qt001", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
index ee9cc9d..11c3bc2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
@@ -143,7 +143,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index 386adf5..3e482a2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -489,7 +489,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs
index 675ed61..ca13386 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs
@@ -143,7 +143,7 @@
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
index b68e1c4..ad1a9d5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
@@ -91,7 +91,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index 963e2ef..a1f8750 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -341,7 +341,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs
index cbfa83c..8c815d4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs
@@ -156,7 +156,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
index fb2a0d4..3a5ac9c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
@@ -107,7 +107,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "order_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index e6ee984..27c029f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -412,7 +412,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs
index 36939ea..7e03cce 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs
@@ -143,7 +143,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
index 20bd4c3..2c92c67 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
@@ -257,7 +257,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.print_no",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
index 5deede7..a35334f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
@@ -245,7 +245,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += " and c.GUID is not null and b.guid is not null";
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "c.ACCOUNT",
"asc", "", _sbSqlWhere.ToString());
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
index ea423ea..ba22fb6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -47,7 +47,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, 999999, "FID", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
index 425c732..7142f08 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
@@ -106,7 +106,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "OPERATION_TIME", "desc,ABT_HNO desc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index fc073a6..0fc2ba0 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -250,7 +250,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "ROLE_NAME asc,CREATE_TIME ", "desc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.Designer.cs
index 4774a19..395568b 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.Designer.cs
@@ -64,7 +64,6 @@
//
this.trv.CheckBoxes = true;
this.trv.Dock = System.Windows.Forms.DockStyle.Fill;
-
this.trv.Location = new System.Drawing.Point(3, 22);
this.trv.Name = "trv";
this.trv.Size = new System.Drawing.Size(462, 618);
@@ -82,12 +81,11 @@
//
// btnCancel
//
-
this.btnCancel.Appearance.Options.UseFont = true;
this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image")));
- this.btnCancel.Location = new System.Drawing.Point(214, 16);
+ this.btnCancel.Location = new System.Drawing.Point(219, 16);
this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(87, 37);
@@ -97,12 +95,11 @@
//
// btnSave
//
-
this.btnSave.Appearance.Options.UseFont = true;
this.btnSave.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSave.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.ImageOptions.Image")));
- this.btnSave.Location = new System.Drawing.Point(93, 16);
+ this.btnSave.Location = new System.Drawing.Point(98, 16);
this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(87, 37);
@@ -117,11 +114,12 @@
this.ClientSize = new System.Drawing.Size(468, 643);
this.Controls.Add(this.panel2);
this.Controls.Add(this.panel1);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "RoleSelectAction";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "璁剧疆瑙掕壊鏉冮檺";
+ this.Text = "璁剧疆瑙掕壊鐨勬潈闄�";
this.TopMost = true;
this.panel1.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.cs b/DevApp/Gs.DevApp/DevFrm/User/User.cs
index ea25670..6f4a4e0 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -267,7 +267,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.ACCOUNT asc ,a.CREATE_TIME",
"desc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
index f522c27..18a3f5e 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
@@ -145,7 +145,7 @@
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs
index b6ca8ad..5dcc726 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs
@@ -122,7 +122,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
index 4ac57e8..8e183ed 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
@@ -108,7 +108,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index f5f6c7b..10835e6 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -298,7 +298,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "desc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index cd9f538..1aa967b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -412,7 +412,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
index f8cd6ee..58ba3c8 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
@@ -107,7 +107,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "order_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
index 4d921f3..a278f46 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
@@ -230,7 +230,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
index cafbc7f..3ae4671 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
@@ -158,7 +158,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
index 8f7ece1..9a46f4b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
@@ -345,7 +345,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
index 38addce..7771cf5 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
@@ -422,7 +422,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs
index 638a2b3..0e02df4 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs
@@ -156,7 +156,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
index 64b1d05..81d4769 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
@@ -377,7 +377,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += " and a.bl008='" + strType + "'";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs
index 2350fd1..79477b3 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs
@@ -172,7 +172,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += " and a.out_type='" + strType + "'";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index f90bf5f..097574c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -180,7 +180,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
index d934a03..632e717 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
@@ -149,7 +149,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, " org.FNumber asc ,a.item_no ", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index b538b57..646d817 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -409,7 +409,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs
index aba0928..d035366 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs
@@ -143,7 +143,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
index 433ab06..bca94b6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -110,7 +110,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
index 341816d..c786b01 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
@@ -420,7 +420,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "BILL_NO", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs
index 83a2bc2..22e6846 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs
@@ -158,7 +158,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
index 281da1b..123ccf1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
@@ -392,7 +392,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "billNo", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs
index f9f6650..eb06806 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs
@@ -143,7 +143,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
index 0e373f4..9b7033d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
@@ -123,7 +123,7 @@
private void getPageList(int curPage)
{
txt_barCode.Text = "";
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.createDate", "desc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs
index 7589fff..4f49471 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs
@@ -245,7 +245,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.processNo",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
index c5448bd..fe9c91c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
@@ -156,7 +156,7 @@
private void getPageList(int curPage)
{
gcMain1.DataSource = null;
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.item_no asc", "",
"", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 3967e2b..c1391b6 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1626,7 +1626,17 @@
public static FilterEntity getFilterEntityWord(string id, string idDec, string val, string type)
{
- return new FilterEntity(id, idDec + ")", " like ", "鍖呭惈)", "%" + val + "%", type);
+ switch (type)
+ {
+ case "Bit绫诲瀷":
+ string _val = (val.ToUpper()== "true".ToUpper() ? "1": "0");
+ return new FilterEntity(id, idDec + ")", "=", "绛変簬)", "" + _val + "", type);
+ break;
+ default:
+ return new FilterEntity(id, idDec + ")", "like", "鍖呭惈)", "%" + val + "%", type);
+ break;
+ }
+
}
public static List<FilterEntity> GetDilter(GridColumnCollection Columns, GridView gridView1 = null)
{
@@ -1642,10 +1652,18 @@
ColumnFilterInfo filter = col.FilterInfo;
if (string.IsNullOrEmpty(filter.FilterString))
continue;
- // fiList.Add(new FilterEntity("b.FNumber", "浣跨敤缁勭粐", " like ", "鍖呭惈", "%" + filter.Value + "%"));
- string[] ddd = filter.FilterString.Replace("Contains", "").Replace("(", "").Replace(")", "").Replace("'", "").Replace("'", "").Split(',');
- //Contains([fSubsidiary], '005')
- fiList.Add(getFilterEntityWord(col.Tag.ToString(), col.Caption.Trim(), ddd[1].Trim(), col.UnboundExpression));
+ string _filterString= filter.FilterString.Replace("Contains", "").Replace("(", "").Replace(")", "").Replace("'", "").Replace("'", "");
+ string[] ddd= _filterString.Split(',');
+ string _val = "";
+ if (ddd.Length > 1)
+ {
+ _val = ddd[1].Trim();
+ }
+ else {
+ ddd = _filterString.Split('=');
+ _val = ddd[1].Trim();
+ }
+ fiList.Add(getFilterEntityWord(col.Tag.ToString(), col.Caption.Trim(), _val, col.UnboundExpression));
}
return fiList;
}
@@ -1676,19 +1694,17 @@
case "鏃堕棿绫诲瀷":
_sbSqlWhere.Append(" and CONVERT(nvarchar(30)," + itm.fileId + ",23)" + itm.fileOper + "'" + itm.fileValue + "'");
break;
- //case "鏁板�肩被鍨�":
- // _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
- // break;
+ case "Bit绫诲瀷":
+ _sbSqlWhere.Append(" and isnull(" + itm.fileId + ",0) =" + itm.fileValue + "");
+ break;
default:
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
+ _sbSqlWhere.Append(" and " +itm.fileId + " "+itm.fileOper + " '" + itm.fileValue + "'");
break;
}
}
}
return _sbSqlWhere.ToString();
}
-
-
public delegate void DelegateGetModel(string guid);
public delegate void DelegateGetList(int currentPage);
/// <summary>
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCk.cs b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
index 5b4ebca..ca8220d 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCk.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
@@ -45,7 +45,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += (" and org.fid='" + _strGuid + "'");
var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/UserControl/SelectHz.cs b/DevApp/Gs.DevApp/UserControl/SelectHz.cs
index 366d481..4812307 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectHz.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectHz.cs
@@ -45,7 +45,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, 999999, "FID", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
@@ -131,7 +131,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageListGys(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.supp_no",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
@@ -171,7 +171,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageListCus(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.cust_no",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/UserControl/SelectOrg.cs b/DevApp/Gs.DevApp/UserControl/SelectOrg.cs
index 1af7b75..6fade85 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectOrg.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectOrg.cs
@@ -43,7 +43,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, 999999, "FID", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs b/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
index 2ab8ac7..2efe221 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
@@ -572,6 +572,7 @@
this.repositoryItemComboBox3Sql.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.repositoryItemComboBox3Sql.Items.AddRange(new object[] {
+ "-璇烽�夋嫨-",
"瀛楃涓茬被鍨�",
"鏁板�肩被鍨�",
"鏃堕棿绫诲瀷",
diff --git a/DevApp/Gs.DevApp/UserControl/ShowFilter.cs b/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
index 8295a70..8a1957c 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
@@ -104,9 +104,10 @@
.ToString();
var _fieldType = gridView1.GetRowCellValue(i, "fieldType")
.ToString();
+ //濡傛灉鏄痩ike 瑕佸姞涓婄櫨鍒嗗彿
if (_fileWhere.Contains("like"))
{
- _fileWhere = " like ";
+ _fileWhere = "like";
_fieldValue = "%" + _fieldValue + "%";
}
list.Add(new FilterEntity(_fieId, _fileIdDec, _fileWhere,
--
Gitblit v1.9.3