From 10f23933269a814a6a934bd87b21a4573a7a5de6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 01 四月 2025 08:11:40 +0800
Subject: [PATCH] iqc
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs | 579 +++++-----
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.resx | 3
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs | 57
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs | 764 +++++++-----
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs | 5
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 97 +
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs | 145 -
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 14
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.Designer.cs | 535 +++++---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs | 22
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs | 54
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs | 1044 ++++++++++--------
13 files changed, 1,824 insertions(+), 1,499 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 729ea9d..673f1fc 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs
index 3f6f8f9..c4c1724 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs
@@ -29,226 +29,80 @@
/// </summary>
private void InitializeComponent()
{
- this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_defectRate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_defectSort = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_memo = new DevExpress.XtraEditors.LabelControl();
- this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_defectName = new DevExpress.XtraEditors.LabelControl();
- this.txt_defectName = new DevExpress.XtraEditors.TextEdit();
- this.gv_defectName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_defectCode = new DevExpress.XtraEditors.LabelControl();
- this.txt_defectCode = new DevExpress.XtraEditors.TextEdit();
- this.gv_defectCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ 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.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
- this.gcMain = new DevExpress.XtraGrid.GridControl();
- this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_defectCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_defectName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_defectSort = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_defectRate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.panel1 = new System.Windows.Forms.Panel();
+ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.txt_pid = new Gs.DevApp.UserControl.UcLookDefectType();
this.txt_memo = new DevExpress.XtraEditors.MemoEdit();
this.txt_typeMemo = new DevExpress.XtraEditors.MemoEdit();
- this.lb_typeMemo = new DevExpress.XtraEditors.LabelControl();
- this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.lb_pid = new DevExpress.XtraEditors.LabelControl();
- ((System.ComponentModel.ISupportInitialize)(this.txt_defectName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_defectCode.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ this.txt_defectName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_defectCode = new DevExpress.XtraEditors.TextEdit();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+ this.split1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
this.xtraTabPage2.SuspendLayout();
- this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+ this.splitMx1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+ this.splitMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_typeMemo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_defectName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_defectCode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+ this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
this.SuspendLayout();
- //
- // gv_lastupdateDate
- //
-
- this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateDate.Caption = "鏇存柊鏃堕棿 ";
- this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 25;
- this.gv_lastupdateDate.Name = "gv_lastupdateDate";
- this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
- this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 8;
- this.gv_lastupdateDate.Width = 180;
- //
- // gv_lastupdateBy
- //
-
- this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateBy.Caption = "鏇存柊浜� ";
- this.gv_lastupdateBy.FieldName = "lastupdateBy";
- this.gv_lastupdateBy.MinWidth = 25;
- this.gv_lastupdateBy.Name = "gv_lastupdateBy";
- this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
- this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 7;
- this.gv_lastupdateBy.Width = 94;
- //
- // gv_createDate
- //
-
- this.gv_createDate.AppearanceCell.Options.UseFont = true;
- this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
- this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 25;
- this.gv_createDate.Name = "gv_createDate";
- this.gv_createDate.OptionsColumn.AllowEdit = false;
- this.gv_createDate.Tag = "query_a.create_date";
- this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 6;
- this.gv_createDate.Width = 180;
- //
- // gv_createBy
- //
-
- this.gv_createBy.AppearanceCell.Options.UseFont = true;
- this.gv_createBy.Caption = "鍒涘缓浜� ";
- this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 25;
- this.gv_createBy.Name = "gv_createBy";
- this.gv_createBy.OptionsColumn.AllowEdit = false;
- this.gv_createBy.Tag = "query_a.create_by";
- this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 5;
- this.gv_createBy.Width = 94;
- //
- // gv_defectRate
- //
-
- this.gv_defectRate.AppearanceCell.Options.UseFont = true;
- this.gv_defectRate.Caption = "缂洪櫡绫诲埆鎻忚堪";
- this.gv_defectRate.FieldName = "typeMemo";
- this.gv_defectRate.MinWidth = 25;
- this.gv_defectRate.Name = "gv_defectRate";
- this.gv_defectRate.OptionsColumn.AllowEdit = false;
- this.gv_defectRate.Tag = "query_a.defect_rate";
- this.gv_defectRate.Visible = true;
- this.gv_defectRate.VisibleIndex = 4;
- this.gv_defectRate.Width = 150;
- //
- // gv_defectSort
- //
-
- this.gv_defectSort.AppearanceCell.Options.UseFont = true;
- this.gv_defectSort.Caption = "缂洪櫡绫诲埆";
- this.gv_defectSort.FieldName = "typeNo";
- this.gv_defectSort.MinWidth = 25;
- this.gv_defectSort.Name = "gv_defectSort";
- this.gv_defectSort.OptionsColumn.AllowEdit = false;
- this.gv_defectSort.Tag = "query_a.defect_sort";
- this.gv_defectSort.Visible = true;
- this.gv_defectSort.VisibleIndex = 3;
- this.gv_defectSort.Width = 94;
- //
- // lb_memo
- //
-
- this.lb_memo.Appearance.Options.UseFont = true;
- this.lb_memo.Location = new System.Drawing.Point(41, 108);
- this.lb_memo.Name = "lb_memo";
- this.lb_memo.Size = new System.Drawing.Size(40, 21);
- this.lb_memo.TabIndex = 216;
- this.lb_memo.Text = "澶囨敞:";
- //
- // gv_memo
- //
-
- this.gv_memo.AppearanceCell.Options.UseFont = true;
- this.gv_memo.Caption = "缂洪櫡澶囨敞";
- this.gv_memo.FieldName = "memo";
- this.gv_memo.MinWidth = 25;
- this.gv_memo.Name = "gv_memo";
- this.gv_memo.OptionsColumn.AllowEdit = false;
- this.gv_memo.Tag = "query_a.memo";
- this.gv_memo.Visible = true;
- this.gv_memo.VisibleIndex = 2;
- this.gv_memo.Width = 94;
- //
- // lb_defectName
- //
-
- this.lb_defectName.Appearance.Options.UseFont = true;
- this.lb_defectName.Location = new System.Drawing.Point(7, 68);
- this.lb_defectName.Name = "lb_defectName";
- this.lb_defectName.Size = new System.Drawing.Size(74, 21);
- this.lb_defectName.TabIndex = 213;
- this.lb_defectName.Text = "缂洪櫡鍚嶇О:";
- //
- // txt_defectName
- //
- this.txt_defectName.Location = new System.Drawing.Point(87, 64);
- this.txt_defectName.Name = "txt_defectName";
-
- this.txt_defectName.Properties.Appearance.Options.UseFont = true;
- this.txt_defectName.Size = new System.Drawing.Size(210, 28);
- this.txt_defectName.TabIndex = 213;
- //
- // gv_defectName
- //
-
- this.gv_defectName.AppearanceCell.Options.UseFont = true;
- this.gv_defectName.Caption = "缂洪櫡鍚嶇О";
- this.gv_defectName.FieldName = "defectName";
- this.gv_defectName.MinWidth = 25;
- this.gv_defectName.Name = "gv_defectName";
- this.gv_defectName.OptionsColumn.AllowEdit = false;
- this.gv_defectName.Tag = "query_a.defect_name";
- this.gv_defectName.Visible = true;
- this.gv_defectName.VisibleIndex = 1;
- this.gv_defectName.Width = 94;
- //
- // lb_defectCode
- //
-
- this.lb_defectCode.Appearance.Options.UseFont = true;
- this.lb_defectCode.Location = new System.Drawing.Point(7, 27);
- this.lb_defectCode.Name = "lb_defectCode";
- this.lb_defectCode.Size = new System.Drawing.Size(74, 21);
- this.lb_defectCode.TabIndex = 211;
- this.lb_defectCode.Text = "缂洪櫡浠ｇ爜:";
- //
- // txt_defectCode
- //
- this.txt_defectCode.Location = new System.Drawing.Point(87, 27);
- this.txt_defectCode.Name = "txt_defectCode";
-
- this.txt_defectCode.Properties.Appearance.Options.UseFont = true;
- this.txt_defectCode.Size = new System.Drawing.Size(210, 28);
- this.txt_defectCode.TabIndex = 211;
- //
- // gv_defectCode
- //
-
- this.gv_defectCode.AppearanceCell.Options.UseFont = true;
- this.gv_defectCode.Caption = "缂洪櫡浠ｇ爜";
- this.gv_defectCode.FieldName = "defectCode";
- this.gv_defectCode.MinWidth = 50;
- this.gv_defectCode.Name = "gv_defectCode";
- this.gv_defectCode.OptionsColumn.AllowEdit = false;
- this.gv_defectCode.Tag = "query_a.defect_code";
- this.gv_defectCode.Visible = true;
- this.gv_defectCode.VisibleIndex = 0;
- this.gv_defectCode.Width = 94;
//
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -259,39 +113,6 @@
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
- //
- // gcMain
- //
- this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-
- this.gcMain.Location = new System.Drawing.Point(0, 0);
- this.gcMain.MainView = this.gridView1;
- this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1126, 531);
- this.gcMain.TabIndex = 1;
- this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gridView1});
- //
- // gridView1
- //
-
- this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gv_defectCode,
- this.gv_defectName,
- this.gv_memo,
- this.gv_defectSort,
- this.gv_defectRate,
- this.gv_createBy,
- this.gv_createDate,
- this.gv_lastupdateBy,
- this.gv_lastupdateDate});
- this.gridView1.GridControl = this.gcMain;
- this.gridView1.IndicatorWidth = 50;
- this.gridView1.Name = "gridView1";
- this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowGroupPanel = false;
//
// xtraTabControl1
//
@@ -307,113 +128,383 @@
//
// xtraTabPage1
//
- this.xtraTabPage1.Controls.Add(this.gcMain);
- this.xtraTabPage1.Controls.Add(this.pageBar1);
+ this.xtraTabPage1.Controls.Add(this.split1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ //
+ // split1
+ //
+ this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.Horizontal = false;
+ this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Name = "split1";
+ //
+ // split1.split1_Panel1
+ //
+ this.split1.Panel1.Controls.Add(this.gcMain1);
+ this.split1.Panel1.Controls.Add(this.pageBar1);
+ this.split1.Panel1.Text = "Panel1";
+ //
+ // split1.split1_Panel2
+ //
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.SplitterPosition = 558;
+ this.split1.TabIndex = 0;
+ //
+ // gcMain1
+ //
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Name = "gcMain1";
+ this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+ this.gcMain1.TabIndex = 2;
+ this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_defectCode,
+ this.gv_defectName,
+ this.gv_memo,
+ this.gv_defectSort,
+ this.gv_defectRate,
+ this.gv_createBy,
+ this.gv_createDate,
+ this.gv_lastupdateBy,
+ this.gv_lastupdateDate});
+ this.gridView1.GridControl = this.gcMain1;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_defectCode
+ //
+ this.gv_defectCode.AppearanceCell.Options.UseFont = true;
+ this.gv_defectCode.Caption = "缂洪櫡浠ｇ爜";
+ this.gv_defectCode.FieldName = "defectCode";
+ this.gv_defectCode.MinWidth = 50;
+ this.gv_defectCode.Name = "gv_defectCode";
+ this.gv_defectCode.OptionsColumn.AllowEdit = false;
+ this.gv_defectCode.Tag = "query_a.defect_code";
+ this.gv_defectCode.Visible = true;
+ this.gv_defectCode.VisibleIndex = 0;
+ this.gv_defectCode.Width = 94;
+ //
+ // gv_defectName
+ //
+ this.gv_defectName.AppearanceCell.Options.UseFont = true;
+ this.gv_defectName.Caption = "缂洪櫡鍚嶇О";
+ this.gv_defectName.FieldName = "defectName";
+ this.gv_defectName.MinWidth = 25;
+ this.gv_defectName.Name = "gv_defectName";
+ this.gv_defectName.OptionsColumn.AllowEdit = false;
+ this.gv_defectName.Tag = "query_a.defect_name";
+ this.gv_defectName.Visible = true;
+ this.gv_defectName.VisibleIndex = 1;
+ this.gv_defectName.Width = 94;
+ //
+ // gv_memo
+ //
+ this.gv_memo.AppearanceCell.Options.UseFont = true;
+ this.gv_memo.Caption = "缂洪櫡澶囨敞";
+ this.gv_memo.FieldName = "memo";
+ this.gv_memo.MinWidth = 25;
+ this.gv_memo.Name = "gv_memo";
+ this.gv_memo.OptionsColumn.AllowEdit = false;
+ this.gv_memo.Tag = "query_a.memo";
+ this.gv_memo.Visible = true;
+ this.gv_memo.VisibleIndex = 2;
+ this.gv_memo.Width = 94;
+ //
+ // gv_defectSort
+ //
+ this.gv_defectSort.AppearanceCell.Options.UseFont = true;
+ this.gv_defectSort.Caption = "缂洪櫡绫诲埆";
+ this.gv_defectSort.FieldName = "typeNo";
+ this.gv_defectSort.MinWidth = 25;
+ this.gv_defectSort.Name = "gv_defectSort";
+ this.gv_defectSort.OptionsColumn.AllowEdit = false;
+ this.gv_defectSort.Tag = "query_a.defect_sort";
+ this.gv_defectSort.Visible = true;
+ this.gv_defectSort.VisibleIndex = 3;
+ this.gv_defectSort.Width = 94;
+ //
+ // gv_defectRate
+ //
+ this.gv_defectRate.AppearanceCell.Options.UseFont = true;
+ this.gv_defectRate.Caption = "缂洪櫡绫诲埆鎻忚堪";
+ this.gv_defectRate.FieldName = "typeMemo";
+ this.gv_defectRate.MinWidth = 25;
+ this.gv_defectRate.Name = "gv_defectRate";
+ this.gv_defectRate.OptionsColumn.AllowEdit = false;
+ this.gv_defectRate.Tag = "query_a.defect_rate";
+ this.gv_defectRate.Visible = true;
+ this.gv_defectRate.VisibleIndex = 4;
+ this.gv_defectRate.Width = 150;
+ //
+ // gv_createBy
+ //
+ this.gv_createBy.AppearanceCell.Options.UseFont = true;
+ this.gv_createBy.Caption = "鍒涘缓浜� ";
+ this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.MinWidth = 25;
+ this.gv_createBy.Name = "gv_createBy";
+ this.gv_createBy.OptionsColumn.AllowEdit = false;
+ this.gv_createBy.Tag = "query_a.create_by";
+ this.gv_createBy.Visible = true;
+ this.gv_createBy.VisibleIndex = 5;
+ this.gv_createBy.Width = 94;
+ //
+ // gv_createDate
+ //
+ this.gv_createDate.AppearanceCell.Options.UseFont = true;
+ this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
+ this.gv_createDate.FieldName = "createDate";
+ this.gv_createDate.MinWidth = 25;
+ this.gv_createDate.Name = "gv_createDate";
+ this.gv_createDate.OptionsColumn.AllowEdit = false;
+ this.gv_createDate.Tag = "query_a.create_date";
+ this.gv_createDate.Visible = true;
+ this.gv_createDate.VisibleIndex = 6;
+ this.gv_createDate.Width = 180;
+ //
+ // gv_lastupdateBy
+ //
+ this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
+ this.gv_lastupdateBy.Caption = "鏇存柊浜� ";
+ this.gv_lastupdateBy.FieldName = "lastupdateBy";
+ this.gv_lastupdateBy.MinWidth = 25;
+ this.gv_lastupdateBy.Name = "gv_lastupdateBy";
+ this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
+ this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
+ this.gv_lastupdateBy.Visible = true;
+ this.gv_lastupdateBy.VisibleIndex = 7;
+ this.gv_lastupdateBy.Width = 94;
+ //
+ // gv_lastupdateDate
+ //
+ this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
+ this.gv_lastupdateDate.Caption = "鏇存柊鏃堕棿 ";
+ this.gv_lastupdateDate.FieldName = "lastupdateDate";
+ this.gv_lastupdateDate.MinWidth = 25;
+ this.gv_lastupdateDate.Name = "gv_lastupdateDate";
+ this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
+ this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
+ this.gv_lastupdateDate.Visible = true;
+ this.gv_lastupdateDate.VisibleIndex = 8;
+ this.gv_lastupdateDate.Width = 180;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 531);
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
- this.pageBar1.TabIndex = 3;
+ this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
- this.xtraTabPage2.Controls.Add(this.panel1);
+ this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
- // panel1
+ // splitMx1
//
- this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.txt_pid);
- this.panel1.Controls.Add(this.txt_memo);
- this.panel1.Controls.Add(this.txt_typeMemo);
- this.panel1.Controls.Add(this.lb_typeMemo);
- this.panel1.Controls.Add(this.labelControl11);
- this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_pid);
- this.panel1.Controls.Add(this.lb_memo);
- this.panel1.Controls.Add(this.lb_defectName);
- this.panel1.Controls.Add(this.txt_defectName);
- this.panel1.Controls.Add(this.lb_defectCode);
- this.panel1.Controls.Add(this.txt_defectCode);
-
- this.panel1.Location = new System.Drawing.Point(76, 20);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(726, 300);
- this.panel1.TabIndex = 1;
+ 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";
+ //
+ // splitMx1.splitMx1_Panel1
+ //
+ this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+ this.splitMx1.Panel1.Text = "Panel1";
+ //
+ // splitMx1.splitMx1_Panel2
+ //
+ this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.Size = new System.Drawing.Size(1126, 570);
+ this.splitMx1.TabIndex = 0;
//
// txt_pid
//
this.txt_pid.IsReadly = false;
- this.txt_pid.Location = new System.Drawing.Point(424, 67);
+ this.txt_pid.Location = new System.Drawing.Point(480, 12);
this.txt_pid.Name = "txt_pid";
- this.txt_pid.Size = new System.Drawing.Size(209, 28);
+ this.txt_pid.Size = new System.Drawing.Size(251, 24);
this.txt_pid.TabIndex = 310;
//
// txt_memo
//
- this.txt_memo.Location = new System.Drawing.Point(87, 99);
+ this.txt_memo.Location = new System.Drawing.Point(119, 68);
this.txt_memo.Name = "txt_memo";
- this.txt_memo.Size = new System.Drawing.Size(210, 38);
+ this.txt_memo.Size = new System.Drawing.Size(250, 24);
+ this.txt_memo.StyleController = this.layoutMx1;
this.txt_memo.TabIndex = 309;
//
// txt_typeMemo
//
- this.txt_typeMemo.Location = new System.Drawing.Point(423, 99);
+ this.txt_typeMemo.Location = new System.Drawing.Point(480, 40);
this.txt_typeMemo.Name = "txt_typeMemo";
- this.txt_typeMemo.Size = new System.Drawing.Size(210, 38);
+ this.txt_typeMemo.Size = new System.Drawing.Size(613, 24);
+ this.txt_typeMemo.StyleController = this.layoutMx1;
this.txt_typeMemo.TabIndex = 308;
this.txt_typeMemo.Tag = "readOnly";
//
- // lb_typeMemo
- //
-
- this.lb_typeMemo.Appearance.Options.UseFont = true;
- this.lb_typeMemo.Location = new System.Drawing.Point(309, 108);
- this.lb_typeMemo.Name = "lb_typeMemo";
- this.lb_typeMemo.Size = new System.Drawing.Size(108, 21);
- this.lb_typeMemo.TabIndex = 307;
- this.lb_typeMemo.Text = "缂洪櫡绫诲埆鎻忚堪:";
- //
- // labelControl11
- //
- this.labelControl11.Location = new System.Drawing.Point(403, 164);
- this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl11.Name = "labelControl11";
- this.labelControl11.Size = new System.Drawing.Size(45, 18);
- this.labelControl11.TabIndex = 130;
- this.labelControl11.Text = "涓婚敭锛�";
- this.labelControl11.Visible = false;
- //
// lbGuid
//
- this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(454, 164);
+ this.lbGuid.Location = new System.Drawing.Point(735, 12);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 21);
+ this.lbGuid.Size = new System.Drawing.Size(358, 25);
this.lbGuid.TabIndex = 1;
+ this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
- // lb_pid
+ // txt_defectName
//
-
- this.lb_pid.Appearance.Options.UseFont = true;
- this.lb_pid.Location = new System.Drawing.Point(343, 68);
- this.lb_pid.Name = "lb_pid";
- this.lb_pid.Size = new System.Drawing.Size(74, 21);
- this.lb_pid.TabIndex = 306;
- this.lb_pid.Text = "缂洪櫡绫诲埆:";
+ this.txt_defectName.Location = new System.Drawing.Point(119, 40);
+ this.txt_defectName.Name = "txt_defectName";
+ this.txt_defectName.Properties.Appearance.Options.UseFont = true;
+ this.txt_defectName.Size = new System.Drawing.Size(250, 24);
+ this.txt_defectName.StyleController = this.layoutMx1;
+ this.txt_defectName.TabIndex = 213;
+ //
+ // txt_defectCode
+ //
+ this.txt_defectCode.Location = new System.Drawing.Point(119, 12);
+ this.txt_defectCode.Name = "txt_defectCode";
+ this.txt_defectCode.Properties.Appearance.Options.UseFont = true;
+ this.txt_defectCode.Size = new System.Drawing.Size(250, 24);
+ this.txt_defectCode.StyleController = this.layoutMx1;
+ this.txt_defectCode.TabIndex = 211;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_typeMemo);
+ this.layoutMx1.Controls.Add(this.txt_pid);
+ this.layoutMx1.Controls.Add(this.txt_memo);
+ this.layoutMx1.Controls.Add(this.txt_defectCode);
+ this.layoutMx1.Controls.Add(this.txt_defectName);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem6});
+ this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 100);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "layoutControl1";
+ //
+ // Root
+ //
+ this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.Root.GroupBordersVisible = false;
+ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem1,
+ this.layoutControlItem2,
+ this.layoutControlItem3,
+ this.layoutControlItem4,
+ this.layoutControlItem5});
+ 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;
+ this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3});
+ 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;
+ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3});
+ this.Root.Size = new System.Drawing.Size(1105, 104);
+ this.Root.TextVisible = false;
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_defectCode;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem1.Text = "缂洪櫡浠ｇ爜:";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_defectName;
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem2.Text = "缂洪櫡鍚嶇О:";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_memo;
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem3.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem3.Text = "澶囨敞:";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_pid;
+ this.layoutControlItem4.Location = new System.Drawing.Point(361, 0);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(362, 28);
+ this.layoutControlItem4.Text = "缂洪櫡绫诲埆:";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_typeMemo;
+ this.layoutControlItem5.Location = new System.Drawing.Point(361, 28);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem5.Size = new System.Drawing.Size(724, 28);
+ this.layoutControlItem5.Text = "缂洪櫡绫诲埆鎻忚堪:";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.lbGuid;
+ this.layoutControlItem6.Location = new System.Drawing.Point(723, 0);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem6.Size = new System.Drawing.Size(362, 29);
+ this.layoutControlItem6.Text = "lbGuid";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem6.TextVisible = false;
//
// Frm_MesDefectCode
//
@@ -424,53 +515,70 @@
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesDefectCode";
this.Text = "缂洪櫡浠ｇ爜";
- ((System.ComponentModel.ISupportInitialize)(this.txt_defectName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_defectCode.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+ this.split1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+ this.split1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+ this.splitMx1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+ this.splitMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_typeMemo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_defectName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_defectCode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+ this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
this.ResumeLayout(false);
}
#endregion
private UserControl.UcToolBarMenu toolBarMenu1;
- private DevExpress.XtraGrid.GridControl gcMain;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraEditors.SplitContainerControl split1;
+ private DevExpress.XtraGrid.GridControl gcMain1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_defectCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_defectName;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_memo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_defectSort;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_defectRate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
private UserControls.Data.UcPageBar pageBar1;
- private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.LabelControl labelControl11;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_defectRate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_defectSort;
-
-private DevExpress.XtraEditors.LabelControl lb_memo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_memo;
-
-private DevExpress.XtraEditors.LabelControl lb_defectName;
-private DevExpress.XtraEditors.TextEdit txt_defectName;
- private DevExpress.XtraGrid.Columns.GridColumn gv_defectName;
-
-private DevExpress.XtraEditors.LabelControl lb_defectCode;
-private DevExpress.XtraEditors.TextEdit txt_defectCode;
- private DevExpress.XtraGrid.Columns.GridColumn gv_defectCode;
- private DevExpress.XtraEditors.LabelControl lb_pid;
- private DevExpress.XtraEditors.MemoEdit txt_typeMemo;
- private DevExpress.XtraEditors.LabelControl lb_typeMemo;
- private DevExpress.XtraEditors.MemoEdit txt_memo;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private UserControl.UcLookDefectType txt_pid;
+ private DevExpress.XtraEditors.MemoEdit txt_memo;
+ private DevExpress.XtraEditors.MemoEdit txt_typeMemo;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.TextEdit txt_defectName;
+ private DevExpress.XtraEditors.TextEdit txt_defectCode;
+ private DevExpress.XtraLayout.LayoutControl layoutMx1;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
index 741f3fc..472fb62 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
@@ -24,10 +24,7 @@
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
- this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gridView1);
- Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
+ this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, null, null, "", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -46,13 +43,6 @@
txt_typeMemo.Text = this.txt_pid.GetMemo();
};
}
-
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
- {
- _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
- await Task.Delay(100);
- getPageList(1);
- }
/// <summary>
/// 鍒嗛〉浜嬩欢
@@ -62,30 +52,6 @@
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
getPageList(curPage);
- }
- /// <summary>
- /// 鏌ヨ浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
- }
- /// <summary>
- /// 鏌ヨ鍥炶皟
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
- {
- _filterList = e.FilterList;
- getPageList(1);
}
/// <summary>
@@ -179,7 +145,7 @@
}
else
{
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true);
}
}
/// <summary>
@@ -191,7 +157,7 @@
{
lbGuid.Text = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
- UtilityHelper.CleanValueByControl(panel1.Controls, true);
+ UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
}
/// <summary>
@@ -238,7 +204,7 @@
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
toolBarMenu1.currentAction = "";
}
}
@@ -268,17 +234,15 @@
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gcMain1.BindingContext = new BindingContext();
if (dt.Rows.Count > 0)
{
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
@@ -322,7 +286,7 @@
{
dynamic dy = _rtn.rtnData;
lbGuid.Text = strGuid;
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.Designer.cs
index 96ed6f7..d19a65b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.Designer.cs
@@ -29,154 +29,65 @@
/// </summary>
private void InitializeComponent()
{
- this.lb_typeMemo = new DevExpress.XtraEditors.LabelControl();
- this.gv_typeMemo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_typeNo = new DevExpress.XtraEditors.LabelControl();
- this.txt_typeNo = new DevExpress.XtraEditors.TextEdit();
- this.gv_typeNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ 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.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
- this.gcMain = new DevExpress.XtraGrid.GridControl();
- this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_typeNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_typeMemo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.panel1 = new System.Windows.Forms.Panel();
+ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.txt_typeMemo = new DevExpress.XtraEditors.MemoEdit();
- this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
- ((System.ComponentModel.ISupportInitialize)(this.txt_typeNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ this.txt_typeNo = new DevExpress.XtraEditors.TextEdit();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+ this.split1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
this.xtraTabPage2.SuspendLayout();
- this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+ this.splitMx1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+ this.splitMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_typeMemo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_typeNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+ this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
this.SuspendLayout();
- //
- // lb_typeMemo
- //
-
- this.lb_typeMemo.Appearance.Options.UseFont = true;
- this.lb_typeMemo.Location = new System.Drawing.Point(40, 95);
- this.lb_typeMemo.Name = "lb_typeMemo";
- this.lb_typeMemo.Size = new System.Drawing.Size(107, 21);
- this.lb_typeMemo.TabIndex = 222;
- this.lb_typeMemo.Text = "缂洪櫡绫诲埆鎻忚堪 ";
- //
- // gv_typeMemo
- //
-
- this.gv_typeMemo.AppearanceCell.Options.UseFont = true;
- this.gv_typeMemo.Caption = "缂洪櫡绫诲埆鎻忚堪";
- this.gv_typeMemo.FieldName = "typeMemo";
- this.gv_typeMemo.MinWidth = 25;
- this.gv_typeMemo.Name = "gv_typeMemo";
- this.gv_typeMemo.OptionsColumn.AllowEdit = false;
- this.gv_typeMemo.Tag = "query_a.type_memo";
- this.gv_typeMemo.Visible = true;
- this.gv_typeMemo.VisibleIndex = 1;
- this.gv_typeMemo.Width = 200;
- //
- // lb_typeNo
- //
-
- this.lb_typeNo.Appearance.Options.UseFont = true;
- this.lb_typeNo.Location = new System.Drawing.Point(40, 48);
- this.lb_typeNo.Name = "lb_typeNo";
- this.lb_typeNo.Size = new System.Drawing.Size(107, 21);
- this.lb_typeNo.TabIndex = 219;
- this.lb_typeNo.Text = "缂洪櫡绫诲埆缂栧彿 ";
- //
- // txt_typeNo
- //
- this.txt_typeNo.Location = new System.Drawing.Point(160, 44);
- this.txt_typeNo.Name = "txt_typeNo";
-
- this.txt_typeNo.Properties.Appearance.Options.UseFont = true;
- this.txt_typeNo.Size = new System.Drawing.Size(210, 28);
- this.txt_typeNo.TabIndex = 219;
- //
- // gv_typeNo
- //
-
- this.gv_typeNo.AppearanceCell.Options.UseFont = true;
- this.gv_typeNo.Caption = "缂洪櫡绫诲埆缂栧彿";
- this.gv_typeNo.FieldName = "typeNo";
- this.gv_typeNo.MinWidth = 50;
- this.gv_typeNo.Name = "gv_typeNo";
- this.gv_typeNo.OptionsColumn.AllowEdit = false;
- this.gv_typeNo.Tag = "query_a.type_no";
- this.gv_typeNo.Visible = true;
- this.gv_typeNo.VisibleIndex = 0;
- this.gv_typeNo.Width = 100;
- //
- // gv_lastupdateDate
- //
-
- this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateDate.Caption = "鏇存柊鏃堕棿";
- this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 25;
- this.gv_lastupdateDate.Name = "gv_lastupdateDate";
- this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
- this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 5;
- this.gv_lastupdateDate.Width = 198;
- //
- // gv_lastupdateBy
- //
-
- this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateBy.Caption = "鏇存柊浜�";
- this.gv_lastupdateBy.FieldName = "lastupdateBy";
- this.gv_lastupdateBy.MinWidth = 25;
- this.gv_lastupdateBy.Name = "gv_lastupdateBy";
- this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
- this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 4;
- this.gv_lastupdateBy.Width = 94;
- //
- // gv_createDate
- //
-
- this.gv_createDate.AppearanceCell.Options.UseFont = true;
- this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
- this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 25;
- this.gv_createDate.Name = "gv_createDate";
- this.gv_createDate.OptionsColumn.AllowEdit = false;
- this.gv_createDate.Tag = "query_a.create_date";
- this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 3;
- this.gv_createDate.Width = 192;
- //
- // gv_createBy
- //
-
- this.gv_createBy.AppearanceCell.Options.UseFont = true;
- this.gv_createBy.Caption = "鍒涘缓浜�";
- this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 25;
- this.gv_createBy.Name = "gv_createBy";
- this.gv_createBy.OptionsColumn.AllowEdit = false;
- this.gv_createBy.Tag = "query_a.create_by";
- this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 2;
- this.gv_createBy.Width = 94;
//
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -187,36 +98,6 @@
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
- //
- // gcMain
- //
- this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-
- this.gcMain.Location = new System.Drawing.Point(0, 0);
- this.gcMain.MainView = this.gridView1;
- this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1126, 531);
- this.gcMain.TabIndex = 1;
- this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gridView1});
- //
- // gridView1
- //
-
- this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gv_typeNo,
- this.gv_typeMemo,
- this.gv_createBy,
- this.gv_createDate,
- this.gv_lastupdateBy,
- this.gv_lastupdateDate});
- this.gridView1.GridControl = this.gcMain;
- this.gridView1.IndicatorWidth = 50;
- this.gridView1.Name = "gridView1";
- this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowGroupPanel = false;
//
// xtraTabControl1
//
@@ -232,71 +113,276 @@
//
// xtraTabPage1
//
- this.xtraTabPage1.Controls.Add(this.gcMain);
- this.xtraTabPage1.Controls.Add(this.pageBar1);
+ this.xtraTabPage1.Controls.Add(this.split1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ //
+ // split1
+ //
+ this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.Horizontal = false;
+ this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Name = "split1";
+ //
+ // split1.split1_Panel1
+ //
+ this.split1.Panel1.Controls.Add(this.gcMain1);
+ this.split1.Panel1.Controls.Add(this.pageBar1);
+ this.split1.Panel1.Text = "Panel1";
+ //
+ // split1.split1_Panel2
+ //
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.SplitterPosition = 558;
+ this.split1.TabIndex = 0;
+ //
+ // gcMain1
+ //
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Name = "gcMain1";
+ this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+ this.gcMain1.TabIndex = 2;
+ this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_typeNo,
+ this.gv_typeMemo,
+ this.gv_createBy,
+ this.gv_createDate,
+ this.gv_lastupdateBy,
+ this.gv_lastupdateDate});
+ this.gridView1.GridControl = this.gcMain1;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_typeNo
+ //
+ this.gv_typeNo.AppearanceCell.Options.UseFont = true;
+ this.gv_typeNo.Caption = "缂洪櫡绫诲埆缂栧彿";
+ this.gv_typeNo.FieldName = "typeNo";
+ this.gv_typeNo.MinWidth = 50;
+ this.gv_typeNo.Name = "gv_typeNo";
+ this.gv_typeNo.OptionsColumn.AllowEdit = false;
+ this.gv_typeNo.Tag = "query_a.type_no";
+ this.gv_typeNo.Visible = true;
+ this.gv_typeNo.VisibleIndex = 0;
+ this.gv_typeNo.Width = 100;
+ //
+ // gv_typeMemo
+ //
+ this.gv_typeMemo.AppearanceCell.Options.UseFont = true;
+ this.gv_typeMemo.Caption = "缂洪櫡绫诲埆鎻忚堪";
+ this.gv_typeMemo.FieldName = "typeMemo";
+ this.gv_typeMemo.MinWidth = 25;
+ this.gv_typeMemo.Name = "gv_typeMemo";
+ this.gv_typeMemo.OptionsColumn.AllowEdit = false;
+ this.gv_typeMemo.Tag = "query_a.type_memo";
+ this.gv_typeMemo.Visible = true;
+ this.gv_typeMemo.VisibleIndex = 1;
+ this.gv_typeMemo.Width = 200;
+ //
+ // gv_createBy
+ //
+ this.gv_createBy.AppearanceCell.Options.UseFont = true;
+ this.gv_createBy.Caption = "鍒涘缓浜�";
+ this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.MinWidth = 25;
+ this.gv_createBy.Name = "gv_createBy";
+ this.gv_createBy.OptionsColumn.AllowEdit = false;
+ this.gv_createBy.Tag = "query_a.create_by";
+ this.gv_createBy.Visible = true;
+ this.gv_createBy.VisibleIndex = 2;
+ this.gv_createBy.Width = 94;
+ //
+ // gv_createDate
+ //
+ this.gv_createDate.AppearanceCell.Options.UseFont = true;
+ this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
+ this.gv_createDate.FieldName = "createDate";
+ this.gv_createDate.MinWidth = 25;
+ this.gv_createDate.Name = "gv_createDate";
+ this.gv_createDate.OptionsColumn.AllowEdit = false;
+ this.gv_createDate.Tag = "query_a.create_date";
+ this.gv_createDate.Visible = true;
+ this.gv_createDate.VisibleIndex = 3;
+ this.gv_createDate.Width = 192;
+ //
+ // gv_lastupdateBy
+ //
+ this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
+ this.gv_lastupdateBy.Caption = "鏇存柊浜�";
+ this.gv_lastupdateBy.FieldName = "lastupdateBy";
+ this.gv_lastupdateBy.MinWidth = 25;
+ this.gv_lastupdateBy.Name = "gv_lastupdateBy";
+ this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
+ this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
+ this.gv_lastupdateBy.Visible = true;
+ this.gv_lastupdateBy.VisibleIndex = 4;
+ this.gv_lastupdateBy.Width = 94;
+ //
+ // gv_lastupdateDate
+ //
+ this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
+ this.gv_lastupdateDate.Caption = "鏇存柊鏃堕棿";
+ this.gv_lastupdateDate.FieldName = "lastupdateDate";
+ this.gv_lastupdateDate.MinWidth = 25;
+ this.gv_lastupdateDate.Name = "gv_lastupdateDate";
+ this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
+ this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
+ this.gv_lastupdateDate.Visible = true;
+ this.gv_lastupdateDate.VisibleIndex = 5;
+ this.gv_lastupdateDate.Width = 198;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 531);
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
- this.pageBar1.TabIndex = 3;
+ this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
- this.xtraTabPage2.Controls.Add(this.panel1);
+ this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
- // panel1
+ // splitMx1
//
- this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.txt_typeMemo);
- this.panel1.Controls.Add(this.labelControl11);
- this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_typeMemo);
- this.panel1.Controls.Add(this.lb_typeNo);
- this.panel1.Controls.Add(this.txt_typeNo);
-
- this.panel1.Location = new System.Drawing.Point(76, 20);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(571, 278);
- this.panel1.TabIndex = 1;
+ 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";
+ //
+ // splitMx1.splitMx1_Panel1
+ //
+ this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+ this.splitMx1.Panel1.Text = "Panel1";
+ //
+ // splitMx1.splitMx1_Panel2
+ //
+ this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.Size = new System.Drawing.Size(1126, 570);
+ this.splitMx1.SplitterPosition = 71;
+ this.splitMx1.TabIndex = 0;
//
// txt_typeMemo
//
- this.txt_typeMemo.Location = new System.Drawing.Point(160, 95);
+ this.txt_typeMemo.Location = new System.Drawing.Point(114, 40);
this.txt_typeMemo.Name = "txt_typeMemo";
- this.txt_typeMemo.Size = new System.Drawing.Size(210, 96);
+ this.txt_typeMemo.Size = new System.Drawing.Size(617, 24);
+ this.txt_typeMemo.StyleController = this.layoutMx1;
this.txt_typeMemo.TabIndex = 223;
- //
- // labelControl11
- //
- this.labelControl11.Location = new System.Drawing.Point(465, 49);
- this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl11.Name = "labelControl11";
- this.labelControl11.Size = new System.Drawing.Size(45, 18);
- this.labelControl11.TabIndex = 130;
- this.labelControl11.Text = "涓婚敭锛�";
- this.labelControl11.Visible = false;
//
// lbGuid
//
- this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(516, 49);
+ this.lbGuid.Location = new System.Drawing.Point(380, 12);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 21);
+ this.lbGuid.Size = new System.Drawing.Size(365, 83);
this.lbGuid.TabIndex = 1;
+ this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
+ //
+ // txt_typeNo
+ //
+ this.txt_typeNo.Location = new System.Drawing.Point(114, 12);
+ this.txt_typeNo.Name = "txt_typeNo";
+ this.txt_typeNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_typeNo.Size = new System.Drawing.Size(255, 24);
+ this.txt_typeNo.StyleController = this.layoutMx1;
+ this.txt_typeNo.TabIndex = 219;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_typeMemo);
+ this.layoutMx1.Controls.Add(this.txt_typeNo);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem3});
+ this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 71);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "layoutControl1";
+ //
+ // Root
+ //
+ this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.Root.GroupBordersVisible = false;
+ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem1,
+ this.layoutControlItem2});
+ 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;
+ this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition1,
+ rowDefinition2});
+ this.Root.Size = new System.Drawing.Size(1105, 76);
+ this.Root.TextVisible = false;
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_typeNo;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem1.Text = "缂洪櫡绫诲埆缂栧彿";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_typeMemo;
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(723, 28);
+ this.layoutControlItem2.Text = "缂洪櫡绫诲埆鎻忚堪";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.lbGuid;
+ this.layoutControlItem3.Location = new System.Drawing.Point(368, 0);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem3.Size = new System.Drawing.Size(369, 87);
+ this.layoutControlItem3.Text = "lbGuid";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem3.TextVisible = false;
//
// Frm_MesDefectType
//
@@ -307,41 +393,56 @@
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesDefectType";
this.Text = "缂洪櫡绫诲埆";
- ((System.ComponentModel.ISupportInitialize)(this.txt_typeNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+ this.split1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+ this.split1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+ this.splitMx1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+ this.splitMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_typeMemo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_typeNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+ this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
this.ResumeLayout(false);
}
#endregion
private UserControl.UcToolBarMenu toolBarMenu1;
- private DevExpress.XtraGrid.GridControl gcMain;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraEditors.SplitContainerControl split1;
+ private DevExpress.XtraGrid.GridControl gcMain1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_typeNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_typeMemo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
private UserControls.Data.UcPageBar pageBar1;
- private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.LabelControl labelControl11;
- //BQCreateConrolObejct
-private DevExpress.XtraEditors.LabelControl lb_typeMemo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_typeMemo;
-
-private DevExpress.XtraEditors.LabelControl lb_typeNo;
-private DevExpress.XtraEditors.TextEdit txt_typeNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_typeNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraEditors.MemoEdit txt_typeMemo;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.TextEdit txt_typeNo;
+ private DevExpress.XtraLayout.LayoutControl layoutMx1;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs
index 55b05b2..1f39d22 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs
@@ -24,10 +24,7 @@
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
- this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gridView1);
- Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
+ this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1,null, null, "", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -42,13 +39,6 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
- {
- _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
- await Task.Delay(100);
- getPageList(1);
- }
-
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -58,31 +48,7 @@
{
getPageList(curPage);
}
- /// <summary>
- /// 鏌ヨ浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
- }
- /// <summary>
- /// 鏌ヨ鍥炶皟
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
- {
- _filterList = e.FilterList;
- getPageList(1);
- }
-
+
/// <summary>
/// 鍙栨秷浜嬩欢
/// </summary>
@@ -175,7 +141,7 @@
}
else
{
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true);
}
}
/// <summary>
@@ -187,7 +153,7 @@
{
lbGuid.Text = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
- UtilityHelper.CleanValueByControl(panel1.Controls, true);
+ UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -218,7 +184,7 @@
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
toolBarMenu1.currentAction = "";
}
}
@@ -247,18 +213,15 @@
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gcMain1.BindingContext = new BindingContext();
if (dt.Rows.Count > 0)
{
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
@@ -302,7 +265,7 @@
{
dynamic dy = _rtn.rtnData;
lbGuid.Text = strGuid;
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
index e5f5354..e2e7447 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
@@ -29,325 +29,179 @@
/// </summary>
private void InitializeComponent()
{
- this.lb_suppNo = new DevExpress.XtraEditors.LabelControl();
- this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_itemId = new DevExpress.XtraEditors.LabelControl();
- this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_status = new DevExpress.XtraEditors.LabelControl();
- this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_checkDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
- this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_checkUser = new DevExpress.XtraEditors.LabelControl();
- this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
- this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_itemNo = new DevExpress.XtraEditors.LabelControl();
- this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
- this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
- this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.panel1 = new System.Windows.Forms.Panel();
+ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.txt_fSubsidiary = new Gs.DevApp.UserControl.UcLookOrg();
- this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.txt_suppNo = new DevExpress.XtraEditors.TextEdit();
this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier();
this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
- this.txt_status = new DevExpress.XtraEditors.CheckEdit();
- this.lbGuid = new System.Windows.Forms.Label();
- this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
+ this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
- this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl();
this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ 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.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_status = new DevExpress.XtraEditors.CheckEdit();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.lbGuid = new System.Windows.Forms.Label();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+ this.split1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
this.xtraTabPage2.SuspendLayout();
- this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+ this.splitMx1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+ this.splitMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+ this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((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.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
this.SuspendLayout();
- //
- // lb_suppNo
- //
-
- this.lb_suppNo.Appearance.Options.UseFont = true;
- this.lb_suppNo.Location = new System.Drawing.Point(27, 112);
- this.lb_suppNo.Name = "lb_suppNo";
- this.lb_suppNo.Size = new System.Drawing.Size(68, 21);
- this.lb_suppNo.TabIndex = 235;
- this.lb_suppNo.Text = "閫変緵搴斿晢";
- //
- // gv_suppNo
- //
-
- this.gv_suppNo.AppearanceCell.Options.UseFont = true;
- this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�";
- this.gv_suppNo.FieldName = "suppNo";
- this.gv_suppNo.MinWidth = 50;
- this.gv_suppNo.Name = "gv_suppNo";
- this.gv_suppNo.OptionsColumn.AllowEdit = false;
- this.gv_suppNo.Tag = "query_a.SUPP_NO";
- this.gv_suppNo.Visible = true;
- this.gv_suppNo.VisibleIndex = 4;
- this.gv_suppNo.Width = 94;
- //
- // lb_itemId
- //
-
- this.lb_itemId.Appearance.Options.UseFont = true;
- this.lb_itemId.Location = new System.Drawing.Point(27, 48);
- this.lb_itemId.Name = "lb_itemId";
- this.lb_itemId.Size = new System.Drawing.Size(68, 21);
- this.lb_itemId.TabIndex = 231;
- this.lb_itemId.Text = "閫夋嫨鐗╂枡";
- //
- // gv_itemId
- //
-
- this.gv_itemId.AppearanceCell.Options.UseFont = true;
- this.gv_itemId.Caption = "鐗╂枡ID";
- this.gv_itemId.FieldName = "itemId";
- this.gv_itemId.MinWidth = 50;
- this.gv_itemId.Name = "gv_itemId";
- this.gv_itemId.OptionsColumn.AllowEdit = false;
- this.gv_itemId.Tag = "query_a.ITEM_ID";
- this.gv_itemId.Width = 94;
- //
- // lb_status
- //
-
- this.lb_status.Appearance.Options.UseFont = true;
- this.lb_status.Location = new System.Drawing.Point(390, 144);
- this.lb_status.Name = "lb_status";
- this.lb_status.Size = new System.Drawing.Size(68, 21);
- this.lb_status.TabIndex = 228;
- this.lb_status.Text = "瀹℃牳鏍囪瘑";
- //
- // gv_status
- //
-
- this.gv_status.AppearanceCell.Options.UseFont = true;
- this.gv_status.Caption = "瀹℃牳鏍囪瘑";
- this.gv_status.FieldName = "status";
- this.gv_status.MinWidth = 50;
- this.gv_status.Name = "gv_status";
- this.gv_status.OptionsColumn.AllowEdit = false;
- this.gv_status.Tag = "query_a.STATUS";
- this.gv_status.UnboundDataType = typeof(bool);
- this.gv_status.Visible = true;
- this.gv_status.VisibleIndex = 1;
- this.gv_status.Width = 94;
- //
- // lb_checkDate
- //
-
- this.lb_checkDate.Appearance.Options.UseFont = true;
- this.lb_checkDate.Location = new System.Drawing.Point(390, 112);
- this.lb_checkDate.Name = "lb_checkDate";
- this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
- this.lb_checkDate.TabIndex = 226;
- this.lb_checkDate.Text = "瀹℃牳鏃堕棿";
- //
- // txt_checkDate
- //
- this.txt_checkDate.Location = new System.Drawing.Point(462, 108);
- this.txt_checkDate.Name = "txt_checkDate";
-
- this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(165, 28);
- this.txt_checkDate.TabIndex = 226;
- this.txt_checkDate.Tag = "readOnly";
- //
- // gv_checkDate
- //
-
- this.gv_checkDate.AppearanceCell.Options.UseFont = true;
- this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
- this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 120;
- this.gv_checkDate.Name = "gv_checkDate";
- this.gv_checkDate.OptionsColumn.AllowEdit = false;
- this.gv_checkDate.Tag = "query_a.CHECK_DATE";
- this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 11;
- this.gv_checkDate.Width = 120;
- //
- // lb_checkUser
- //
-
- this.lb_checkUser.Appearance.Options.UseFont = true;
- this.lb_checkUser.Location = new System.Drawing.Point(407, 79);
- this.lb_checkUser.Name = "lb_checkUser";
- this.lb_checkUser.Size = new System.Drawing.Size(51, 21);
- this.lb_checkUser.TabIndex = 222;
- this.lb_checkUser.Text = "瀹℃牳浜�";
- //
- // txt_checkUser
- //
- this.txt_checkUser.Location = new System.Drawing.Point(462, 75);
- this.txt_checkUser.Name = "txt_checkUser";
-
- this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(165, 28);
- this.txt_checkUser.TabIndex = 222;
- this.txt_checkUser.Tag = "readOnly";
- //
- // gv_checkUser
- //
-
- this.gv_checkUser.AppearanceCell.Options.UseFont = true;
- this.gv_checkUser.Caption = "瀹℃牳浜�";
- this.gv_checkUser.FieldName = "checkUser";
- this.gv_checkUser.MinWidth = 50;
- this.gv_checkUser.Name = "gv_checkUser";
- this.gv_checkUser.OptionsColumn.AllowEdit = false;
- this.gv_checkUser.Tag = "query_a.CHECK_USER";
- this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 10;
- this.gv_checkUser.Width = 94;
- //
- // gv_lastupdateDate
- //
-
- this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂�";
- this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 180;
- this.gv_lastupdateDate.Name = "gv_lastupdateDate";
- this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
- this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 9;
- this.gv_lastupdateDate.Width = 180;
- //
- // gv_lastupdateBy
- //
-
- this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉";
- this.gv_lastupdateBy.FieldName = "lastupdateBy";
- this.gv_lastupdateBy.MinWidth = 50;
- this.gv_lastupdateBy.Name = "gv_lastupdateBy";
- this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
- this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 8;
- this.gv_lastupdateBy.Width = 94;
- //
- // gv_createDate
- //
-
- this.gv_createDate.AppearanceCell.Options.UseFont = true;
- this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
- this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 180;
- this.gv_createDate.Name = "gv_createDate";
- this.gv_createDate.OptionsColumn.AllowEdit = false;
- this.gv_createDate.Tag = "query_a.CREATE_DATE";
- this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 7;
- this.gv_createDate.Width = 180;
- //
- // gv_createBy
- //
-
- this.gv_createBy.AppearanceCell.Options.UseFont = true;
- this.gv_createBy.Caption = "鍒涘缓浜�";
- this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 50;
- this.gv_createBy.Name = "gv_createBy";
- this.gv_createBy.OptionsColumn.AllowEdit = false;
- this.gv_createBy.Tag = "query_a.CREATE_BY";
- this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 6;
- this.gv_createBy.Width = 94;
- //
- // lb_itemNo
- //
-
- this.lb_itemNo.Appearance.Options.UseFont = true;
- this.lb_itemNo.Location = new System.Drawing.Point(27, 79);
- this.lb_itemNo.Name = "lb_itemNo";
- this.lb_itemNo.Size = new System.Drawing.Size(68, 21);
- this.lb_itemNo.TabIndex = 211;
- this.lb_itemNo.Text = "鐗╂枡缂栫爜";
- //
- // txt_itemNo
- //
- this.txt_itemNo.Location = new System.Drawing.Point(100, 75);
- this.txt_itemNo.Name = "txt_itemNo";
-
- this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(281, 28);
- this.txt_itemNo.TabIndex = 211;
- this.txt_itemNo.Tag = "readOnly";
- //
- // gv_itemNo
- //
-
- this.gv_itemNo.AppearanceCell.Options.UseFont = true;
- this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
- this.gv_itemNo.FieldName = "itemNo";
- this.gv_itemNo.MinWidth = 50;
- this.gv_itemNo.Name = "gv_itemNo";
- this.gv_itemNo.OptionsColumn.AllowEdit = false;
- this.gv_itemNo.Tag = "query_a.ITEM_NO";
- this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 3;
- this.gv_itemNo.Width = 94;
//
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = "MES_QA_MJ,CHECK_DATE,STATUS,CHECK_USER";
this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1215, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1169, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
//
- // gcMain
+ // xtraTabControl1
//
- this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-
- this.gcMain.Location = new System.Drawing.Point(0, 0);
- this.gcMain.MainView = this.gridView1;
- this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1213, 531);
- this.gcMain.TabIndex = 1;
- this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(1169, 602);
+ this.xtraTabControl1.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1,
+ this.xtraTabPage2});
+ //
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(957, 65);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 7;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1167, 570);
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ //
+ // split1
+ //
+ this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.Horizontal = false;
+ this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Name = "split1";
+ //
+ // split1.split1_Panel1
+ //
+ this.split1.Panel1.Controls.Add(this.gcMain1);
+ this.split1.Panel1.Controls.Add(this.pageBar1);
+ this.split1.Panel1.Text = "Panel1";
+ //
+ // split1.split1_Panel2
+ //
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.Size = new System.Drawing.Size(1167, 570);
+ this.split1.SplitterPosition = 558;
+ this.split1.TabIndex = 0;
+ //
+ // gcMain1
+ //
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Name = "gcMain1";
+ this.gcMain1.Size = new System.Drawing.Size(1167, 519);
+ this.gcMain1.TabIndex = 2;
+ this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
//
// gridView1
//
-
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn1,
@@ -363,7 +217,7 @@
this.gv_lastupdateDate,
this.gv_checkUser,
this.gv_checkDate});
- this.gridView1.GridControl = this.gcMain;
+ this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -382,6 +236,44 @@
this.gridColumn1.VisibleIndex = 0;
this.gridColumn1.Width = 250;
//
+ // gv_status
+ //
+ this.gv_status.AppearanceCell.Options.UseFont = true;
+ this.gv_status.Caption = "瀹℃牳鏍囪瘑";
+ this.gv_status.FieldName = "status";
+ this.gv_status.MinWidth = 50;
+ this.gv_status.Name = "gv_status";
+ this.gv_status.OptionsColumn.AllowEdit = false;
+ this.gv_status.Tag = "query_a.STATUS";
+ this.gv_status.UnboundDataType = typeof(bool);
+ this.gv_status.Visible = true;
+ this.gv_status.VisibleIndex = 1;
+ this.gv_status.Width = 94;
+ //
+ // gv_itemId
+ //
+ this.gv_itemId.AppearanceCell.Options.UseFont = true;
+ this.gv_itemId.Caption = "鐗╂枡ID";
+ this.gv_itemId.FieldName = "itemId";
+ this.gv_itemId.MinWidth = 50;
+ this.gv_itemId.Name = "gv_itemId";
+ this.gv_itemId.OptionsColumn.AllowEdit = false;
+ this.gv_itemId.Tag = "query_a.ITEM_ID";
+ this.gv_itemId.Width = 94;
+ //
+ // gv_itemNo
+ //
+ this.gv_itemNo.AppearanceCell.Options.UseFont = true;
+ this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
+ this.gv_itemNo.FieldName = "itemNo";
+ this.gv_itemNo.MinWidth = 50;
+ this.gv_itemNo.Name = "gv_itemNo";
+ this.gv_itemNo.OptionsColumn.AllowEdit = false;
+ this.gv_itemNo.Tag = "query_a.ITEM_NO";
+ this.gv_itemNo.Visible = true;
+ this.gv_itemNo.VisibleIndex = 3;
+ this.gv_itemNo.Width = 94;
+ //
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
@@ -393,6 +285,19 @@
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 2;
this.gridColumn2.Width = 125;
+ //
+ // gv_suppNo
+ //
+ this.gv_suppNo.AppearanceCell.Options.UseFont = true;
+ this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�";
+ this.gv_suppNo.FieldName = "suppNo";
+ this.gv_suppNo.MinWidth = 50;
+ this.gv_suppNo.Name = "gv_suppNo";
+ this.gv_suppNo.OptionsColumn.AllowEdit = false;
+ this.gv_suppNo.Tag = "query_a.SUPP_NO";
+ this.gv_suppNo.Visible = true;
+ this.gv_suppNo.VisibleIndex = 4;
+ this.gv_suppNo.Width = 94;
//
// gridColumn3
//
@@ -406,277 +311,506 @@
this.gridColumn3.VisibleIndex = 5;
this.gridColumn3.Width = 125;
//
- // xtraTabControl1
+ // gv_createBy
//
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
- this.xtraTabControl1.Name = "xtraTabControl1";
- this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1215, 602);
- this.xtraTabControl1.TabIndex = 3;
- this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1,
- this.xtraTabPage2});
+ this.gv_createBy.AppearanceCell.Options.UseFont = true;
+ this.gv_createBy.Caption = "鍒涘缓浜�";
+ this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.MinWidth = 50;
+ this.gv_createBy.Name = "gv_createBy";
+ this.gv_createBy.OptionsColumn.AllowEdit = false;
+ this.gv_createBy.Tag = "query_a.CREATE_BY";
+ this.gv_createBy.Visible = true;
+ this.gv_createBy.VisibleIndex = 6;
+ this.gv_createBy.Width = 94;
//
- // xtraTabPage1
+ // gv_createDate
//
- this.xtraTabPage1.Controls.Add(this.gcMain);
- this.xtraTabPage1.Controls.Add(this.pageBar1);
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1213, 570);
- this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ this.gv_createDate.AppearanceCell.Options.UseFont = true;
+ this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
+ this.gv_createDate.FieldName = "createDate";
+ this.gv_createDate.MinWidth = 180;
+ this.gv_createDate.Name = "gv_createDate";
+ this.gv_createDate.OptionsColumn.AllowEdit = false;
+ this.gv_createDate.Tag = "query_a.CREATE_DATE";
+ this.gv_createDate.Visible = true;
+ this.gv_createDate.VisibleIndex = 7;
+ this.gv_createDate.Width = 180;
+ //
+ // gv_lastupdateBy
+ //
+ this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
+ this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉";
+ this.gv_lastupdateBy.FieldName = "lastupdateBy";
+ this.gv_lastupdateBy.MinWidth = 50;
+ this.gv_lastupdateBy.Name = "gv_lastupdateBy";
+ this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
+ this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
+ this.gv_lastupdateBy.Visible = true;
+ this.gv_lastupdateBy.VisibleIndex = 8;
+ this.gv_lastupdateBy.Width = 94;
+ //
+ // gv_lastupdateDate
+ //
+ this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
+ this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂�";
+ this.gv_lastupdateDate.FieldName = "lastupdateDate";
+ this.gv_lastupdateDate.MinWidth = 180;
+ this.gv_lastupdateDate.Name = "gv_lastupdateDate";
+ this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
+ this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
+ this.gv_lastupdateDate.Visible = true;
+ this.gv_lastupdateDate.VisibleIndex = 9;
+ this.gv_lastupdateDate.Width = 180;
+ //
+ // gv_checkUser
+ //
+ this.gv_checkUser.AppearanceCell.Options.UseFont = true;
+ this.gv_checkUser.Caption = "瀹℃牳浜�";
+ this.gv_checkUser.FieldName = "checkUser";
+ this.gv_checkUser.MinWidth = 50;
+ this.gv_checkUser.Name = "gv_checkUser";
+ this.gv_checkUser.OptionsColumn.AllowEdit = false;
+ this.gv_checkUser.Tag = "query_a.CHECK_USER";
+ this.gv_checkUser.Visible = true;
+ this.gv_checkUser.VisibleIndex = 10;
+ this.gv_checkUser.Width = 94;
+ //
+ // gv_checkDate
+ //
+ this.gv_checkDate.AppearanceCell.Options.UseFont = true;
+ this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
+ this.gv_checkDate.FieldName = "checkDate";
+ this.gv_checkDate.MinWidth = 120;
+ this.gv_checkDate.Name = "gv_checkDate";
+ this.gv_checkDate.OptionsColumn.AllowEdit = false;
+ this.gv_checkDate.Tag = "query_a.CHECK_DATE";
+ this.gv_checkDate.Visible = true;
+ this.gv_checkDate.VisibleIndex = 11;
+ this.gv_checkDate.Width = 120;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 531);
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1213, 39);
- this.pageBar1.TabIndex = 3;
+ this.pageBar1.Size = new System.Drawing.Size(1167, 39);
+ this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
- this.xtraTabPage2.Controls.Add(this.panel1);
+ this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1213, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1167, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
- // panel1
+ // splitMx1
//
- this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.txt_fSubsidiary);
- this.panel1.Controls.Add(this.labelControl2);
- this.panel1.Controls.Add(this.labelControl1);
- this.panel1.Controls.Add(this.txt_suppNo);
- this.panel1.Controls.Add(this.txt_suppId);
- this.panel1.Controls.Add(this.txt_itemId);
- this.panel1.Controls.Add(this.txt_status);
- this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_suppNo);
- this.panel1.Controls.Add(this.lb_itemId);
- this.panel1.Controls.Add(this.lb_status);
- this.panel1.Controls.Add(this.lb_checkDate);
- this.panel1.Controls.Add(this.txt_checkDate);
- this.panel1.Controls.Add(this.lb_checkUser);
- this.panel1.Controls.Add(this.txt_checkUser);
- this.panel1.Controls.Add(this.lb_lastupdateDate);
- this.panel1.Controls.Add(this.txt_lastupdateDate);
- this.panel1.Controls.Add(this.lb_lastupdateBy);
- this.panel1.Controls.Add(this.txt_lastupdateBy);
- this.panel1.Controls.Add(this.lb_itemNo);
- this.panel1.Controls.Add(this.txt_itemNo);
-
- this.panel1.Location = new System.Drawing.Point(23, 20);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(668, 213);
- this.panel1.TabIndex = 1;
+ 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";
+ //
+ // splitMx1.splitMx1_Panel1
+ //
+ this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+ this.splitMx1.Panel1.Text = "Panel1";
+ //
+ // splitMx1.splitMx1_Panel2
+ //
+ this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.Size = new System.Drawing.Size(1167, 570);
+ this.splitMx1.SplitterPosition = 112;
+ this.splitMx1.TabIndex = 0;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_fSubsidiary);
+ this.layoutMx1.Controls.Add(this.txt_suppNo);
+ this.layoutMx1.Controls.Add(this.txt_suppId);
+ this.layoutMx1.Controls.Add(this.txt_checkDate);
+ this.layoutMx1.Controls.Add(this.txt_itemId);
+ this.layoutMx1.Controls.Add(this.txt_checkUser);
+ this.layoutMx1.Controls.Add(this.txt_itemNo);
+ this.layoutMx1.Controls.Add(this.txt_lastupdateDate);
+ this.layoutMx1.Controls.Add(this.txt_lastupdateBy);
+ this.layoutMx1.Controls.Add(this.txt_status);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem11,
+ this.layoutControlItem5});
+ this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(1167, 112);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "layoutControl1";
+ //
+ // Root
+ //
+ this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.Root.GroupBordersVisible = false;
+ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem1,
+ this.layoutControlItem2,
+ this.layoutControlItem3,
+ this.layoutControlItem4,
+ this.layoutControlItem6,
+ this.layoutControlItem7,
+ this.layoutControlItem8,
+ this.layoutControlItem9,
+ 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;
+ 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;
+ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3});
+ this.Root.Size = new System.Drawing.Size(1167, 112);
+ this.Root.TextVisible = false;
//
// txt_fSubsidiary
//
this.txt_fSubsidiary.IsReadly = false;
- this.txt_fSubsidiary.Location = new System.Drawing.Point(100, 11);
+ this.txt_fSubsidiary.Location = new System.Drawing.Point(84, 12);
this.txt_fSubsidiary.Name = "txt_fSubsidiary";
- this.txt_fSubsidiary.Size = new System.Drawing.Size(281, 30);
+ this.txt_fSubsidiary.Size = new System.Drawing.Size(210, 24);
this.txt_fSubsidiary.TabIndex = 242;
- //
- // labelControl2
- //
-
- this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(27, 16);
- this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(68, 21);
- this.labelControl2.TabIndex = 241;
- this.labelControl2.Text = "閫夋嫨缁勭粐";
- //
- // labelControl1
- //
-
- this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(10, 144);
- this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(85, 21);
- this.labelControl1.TabIndex = 239;
- this.labelControl1.Text = "渚涘簲鍟嗙紪鐮�";
//
// txt_suppNo
//
- this.txt_suppNo.Location = new System.Drawing.Point(100, 140);
+ this.txt_suppNo.Location = new System.Drawing.Point(99, 73);
this.txt_suppNo.Name = "txt_suppNo";
-
this.txt_suppNo.Properties.Appearance.Options.UseFont = true;
- this.txt_suppNo.Size = new System.Drawing.Size(281, 28);
+ this.txt_suppNo.Size = new System.Drawing.Size(207, 24);
+ this.txt_suppNo.StyleController = this.layoutMx1;
this.txt_suppNo.TabIndex = 240;
this.txt_suppNo.Tag = "readOnly";
//
// txt_suppId
//
this.txt_suppId.IsReadly = false;
- this.txt_suppId.Location = new System.Drawing.Point(100, 107);
+ this.txt_suppId.Location = new System.Drawing.Point(370, 12);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(281, 30);
+ this.txt_suppId.Size = new System.Drawing.Size(211, 24);
this.txt_suppId.TabIndex = 238;
//
// txt_itemId
//
this.txt_itemId.IsReadly = false;
- this.txt_itemId.Location = new System.Drawing.Point(100, 43);
+ this.txt_itemId.Location = new System.Drawing.Point(84, 42);
this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Size = new System.Drawing.Size(281, 30);
+ this.txt_itemId.Size = new System.Drawing.Size(210, 24);
this.txt_itemId.TabIndex = 237;
this.txt_itemId.Tag = "no";
//
- // txt_status
+ // txt_checkDate
//
- this.txt_status.Enabled = false;
- this.txt_status.Location = new System.Drawing.Point(461, 142);
- this.txt_status.Name = "txt_status";
- this.txt_status.Properties.Caption = "";
- this.txt_status.Size = new System.Drawing.Size(94, 24);
- this.txt_status.TabIndex = 236;
+ this.txt_checkDate.Location = new System.Drawing.Point(944, 42);
+ this.txt_checkDate.Name = "txt_checkDate";
+ this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkDate.Size = new System.Drawing.Size(211, 24);
+ this.txt_checkDate.StyleController = this.layoutMx1;
+ this.txt_checkDate.TabIndex = 226;
+ this.txt_checkDate.Tag = "readOnly";
//
- // lbGuid
+ // txt_checkUser
//
- this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(29, 128);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 21);
- this.lbGuid.TabIndex = 1;
- this.lbGuid.Visible = false;
- //
- // lb_lastupdateDate
- //
-
- this.lb_lastupdateDate.Appearance.Options.UseFont = true;
- this.lb_lastupdateDate.Location = new System.Drawing.Point(390, 48);
- this.lb_lastupdateDate.Name = "lb_lastupdateDate";
- this.lb_lastupdateDate.Size = new System.Drawing.Size(68, 21);
- this.lb_lastupdateDate.TabIndex = 219;
- this.lb_lastupdateDate.Text = "鏇存柊鏃堕棿";
+ this.txt_checkUser.Location = new System.Drawing.Point(944, 12);
+ this.txt_checkUser.Name = "txt_checkUser";
+ this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkUser.Size = new System.Drawing.Size(211, 24);
+ this.txt_checkUser.StyleController = this.layoutMx1;
+ this.txt_checkUser.TabIndex = 222;
+ this.txt_checkUser.Tag = "readOnly";
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(462, 44);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(657, 42);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
-
this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateDate.Size = new System.Drawing.Size(165, 28);
+ this.txt_lastupdateDate.Size = new System.Drawing.Size(211, 24);
+ this.txt_lastupdateDate.StyleController = this.layoutMx1;
this.txt_lastupdateDate.TabIndex = 219;
this.txt_lastupdateDate.Tag = "readOnly";
//
- // lb_lastupdateBy
- //
-
- this.lb_lastupdateBy.Appearance.Options.UseFont = true;
- this.lb_lastupdateBy.Location = new System.Drawing.Point(407, 16);
- this.lb_lastupdateBy.Name = "lb_lastupdateBy";
- this.lb_lastupdateBy.Size = new System.Drawing.Size(51, 21);
- this.lb_lastupdateBy.TabIndex = 217;
- this.lb_lastupdateBy.Text = "鏇存柊浜�";
- //
// txt_lastupdateBy
//
- this.txt_lastupdateBy.Location = new System.Drawing.Point(462, 12);
+ this.txt_lastupdateBy.Location = new System.Drawing.Point(657, 12);
this.txt_lastupdateBy.Name = "txt_lastupdateBy";
this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateBy.Size = new System.Drawing.Size(165, 28);
+ this.txt_lastupdateBy.Size = new System.Drawing.Size(211, 24);
+ this.txt_lastupdateBy.StyleController = this.layoutMx1;
this.txt_lastupdateBy.TabIndex = 217;
this.txt_lastupdateBy.Tag = "readOnly";
//
- // picCheckBox
+ // txt_itemNo
//
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(957, 65);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 7;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
+ this.txt_itemNo.Location = new System.Drawing.Point(370, 42);
+ this.txt_itemNo.Name = "txt_itemNo";
+ this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemNo.Size = new System.Drawing.Size(211, 24);
+ this.txt_itemNo.StyleController = this.layoutMx1;
+ this.txt_itemNo.TabIndex = 211;
+ this.txt_itemNo.Tag = "readOnly";
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_fSubsidiary;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(286, 30);
+ this.layoutControlItem1.Text = "閫夋嫨缁勭粐";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_itemId;
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 30);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(286, 31);
+ this.layoutControlItem2.Text = "閫夋嫨鐗╂枡";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_itemNo;
+ this.layoutControlItem3.Location = new System.Drawing.Point(286, 30);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem3.Size = new System.Drawing.Size(287, 31);
+ this.layoutControlItem3.Text = "鐗╂枡缂栫爜";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_suppId;
+ this.layoutControlItem4.Location = new System.Drawing.Point(286, 0);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(287, 30);
+ this.layoutControlItem4.Text = "閫変緵搴斿晢";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_suppNo;
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 61);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem5.Size = new System.Drawing.Size(298, 31);
+ this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鐮�";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(50, 20);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_lastupdateBy;
+ this.layoutControlItem6.Location = new System.Drawing.Point(573, 0);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem6.Size = new System.Drawing.Size(287, 30);
+ this.layoutControlItem6.Text = "鏇存柊浜�";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_lastupdateDate;
+ this.layoutControlItem7.Location = new System.Drawing.Point(573, 30);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem7.Size = new System.Drawing.Size(287, 31);
+ this.layoutControlItem7.Text = "鏇存柊鏃堕棿";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_checkUser;
+ this.layoutControlItem8.Location = new System.Drawing.Point(860, 0);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem8.Size = new System.Drawing.Size(287, 30);
+ this.layoutControlItem8.Text = "瀹℃牳浜�";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_checkDate;
+ this.layoutControlItem9.Location = new System.Drawing.Point(860, 30);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem9.Size = new System.Drawing.Size(287, 31);
+ this.layoutControlItem9.Text = "瀹℃牳鏃堕棿";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // txt_status
+ //
+ this.txt_status.Location = new System.Drawing.Point(872, 73);
+ this.txt_status.Name = "txt_status";
+ this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
+ this.txt_status.Size = new System.Drawing.Size(283, 24);
+ this.txt_status.StyleController = this.layoutMx1;
+ this.txt_status.TabIndex = 243;
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_status;
+ this.layoutControlItem10.Location = new System.Drawing.Point(860, 61);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem10.Size = new System.Drawing.Size(287, 31);
+ this.layoutControlItem10.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem10.TextVisible = false;
+ //
+ // lbGuid
+ //
+ this.lbGuid.Location = new System.Drawing.Point(608, 73);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(294, 27);
+ this.lbGuid.TabIndex = 244;
+ this.lbGuid.Text = "lbGuid";
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.lbGuid;
+ this.layoutControlItem11.Location = new System.Drawing.Point(596, 61);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(298, 31);
+ this.layoutControlItem11.Text = "lbGuid";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem11.TextVisible = false;
//
// Frm_MesQaMj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1215, 682);
+ this.ClientSize = new System.Drawing.Size(1169, 682);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesQaMj";
this.Text = "鍏嶆缁存姢";
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+ this.split1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+ this.split1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+ this.splitMx1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+ this.splitMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+ this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((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.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
this.ResumeLayout(false);
}
#endregion
private UserControl.UcToolBarMenu toolBarMenu1;
- private DevExpress.XtraGrid.GridControl gcMain;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
- private UserControls.Data.UcPageBar pageBar1;
- private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Label lbGuid;
- //BQCreateConrolObejct
- private DevExpress.XtraEditors.LabelControl lb_suppNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
-
- private DevExpress.XtraEditors.LabelControl lb_itemId;
- private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
-
- private DevExpress.XtraEditors.LabelControl lb_status;
+ private DevExpress.XtraEditors.SplitContainerControl split1;
+ private DevExpress.XtraGrid.GridControl gcMain1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gv_status;
-
- private DevExpress.XtraEditors.LabelControl lb_checkDate;
- private DevExpress.XtraEditors.TextEdit txt_checkDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
-
- private DevExpress.XtraEditors.LabelControl lb_checkUser;
- private DevExpress.XtraEditors.TextEdit txt_checkUser;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
-
- private DevExpress.XtraEditors.LabelControl lb_itemNo;
- private DevExpress.XtraEditors.TextEdit txt_itemNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
- private DevExpress.XtraEditors.CheckEdit txt_status;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
+ private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraLayout.LayoutControl layoutMx1;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private UserControl.UcLookOrg txt_fSubsidiary;
+ private DevExpress.XtraEditors.TextEdit txt_suppNo;
private UserControl.UcLookSupplier txt_suppId;
private UserControl.UcLookItems txt_itemId;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private System.Windows.Forms.PictureBox picCheckBox;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraEditors.LabelControl labelControl1;
- private DevExpress.XtraEditors.TextEdit txt_suppNo;
- private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
+ private DevExpress.XtraEditors.TextEdit txt_checkDate;
+ private DevExpress.XtraEditors.TextEdit txt_checkUser;
private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
- private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
- private UserControl.UcLookOrg txt_fSubsidiary;
- private DevExpress.XtraEditors.LabelControl labelControl2;
+ private DevExpress.XtraEditors.TextEdit txt_itemNo;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.CheckEdit txt_status;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
index 9762696..4929ec8 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -27,9 +27,7 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gridView1);
- Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
+ this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "status", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -190,7 +188,7 @@
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true);
}
/// <summary>
/// 鏂板浜嬩欢
@@ -201,7 +199,7 @@
{
lbGuid.Text = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
- UtilityHelper.CleanValueByControl(panel1.Controls, true);
+ UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -248,7 +246,7 @@
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
}
}
catch (Exception ex)
@@ -275,16 +273,16 @@
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
+ gcMain1.BindingContext = new BindingContext();
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
if (dt.Rows.Count > 0)
{
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
@@ -329,7 +327,7 @@
{
dynamic dy = _rtn.rtnData;
lbGuid.Text = strGuid;
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -415,7 +413,5 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
index 007b66e..2390627 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -30,9 +30,12 @@
/// </summary>
private void InitializeComponent()
{
+
this.SuspendLayout();
+
// this.jyxm1 = new QC.Jyxm("iqc");
this.jyxm1 = new QC.Jyxm("iqc");
+
//
// jyxm1
//
@@ -50,7 +53,7 @@
this.ClientSize = new System.Drawing.Size(1044, 711);
this.Controls.Add(this.jyxm1);
this.Name = "Frm_MesQmCheckitemDt";
- this.Text = "iqc";
+ this.Text = "iqc物料检验项目";
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
index f8b7679..88be0ad 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -67,7 +67,6 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -265,7 +264,6 @@
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
@@ -278,7 +276,6 @@
//
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -298,7 +295,6 @@
this.gridColumn4,
this.gv_memo,
this.gridColumn16,
- this.gridColumn17,
this.gridColumn8,
this.gridColumn18});
this.gridView1.GridControl = this.gcMain1;
@@ -310,7 +306,6 @@
//
// gv_isenabled
//
-
this.gv_isenabled.AppearanceCell.Options.UseFont = true;
this.gv_isenabled.Caption = "鏄惁鍙敤";
this.gv_isenabled.FieldName = "isenabled";
@@ -326,7 +321,6 @@
//
// gv_foneChecked
//
-
this.gv_foneChecked.AppearanceCell.Options.UseFont = true;
this.gv_foneChecked.Caption = "瀹℃牳鏍囪";
this.gv_foneChecked.FieldName = "foneChecked";
@@ -342,7 +336,6 @@
//
// gv_ftwoChecked
//
-
this.gv_ftwoChecked.AppearanceCell.Options.UseFont = true;
this.gv_ftwoChecked.Caption = "鎵瑰噯鏍囪";
this.gv_ftwoChecked.FieldName = "ftwoChecked";
@@ -358,7 +351,6 @@
//
// gv_fversion
//
-
this.gv_fversion.AppearanceCell.Options.UseFont = true;
this.gv_fversion.Caption = "鐗堟湰";
this.gv_fversion.FieldName = "fversion";
@@ -384,7 +376,6 @@
//
// gv_itemNo
//
-
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
this.gv_itemNo.Caption = "鐗╂枡浜у搧缂栫爜";
this.gv_itemNo.FieldName = "itemNo";
@@ -423,7 +414,6 @@
//
// gv_foneCheckor
//
-
this.gv_foneCheckor.AppearanceCell.Options.UseFont = true;
this.gv_foneCheckor.Caption = "瀹℃牳浜�";
this.gv_foneCheckor.FieldName = "foneCheckor";
@@ -437,7 +427,6 @@
//
// gv_foneCheckdate
//
-
this.gv_foneCheckdate.AppearanceCell.Options.UseFont = true;
this.gv_foneCheckdate.Caption = "瀹℃牳鏃堕棿";
this.gv_foneCheckdate.FieldName = "foneCheckdate";
@@ -451,7 +440,6 @@
//
// gv_ftwoCheckor
//
-
this.gv_ftwoCheckor.AppearanceCell.Options.UseFont = true;
this.gv_ftwoCheckor.Caption = "鎵瑰噯浜�";
this.gv_ftwoCheckor.FieldName = "ftwoCheckor";
@@ -499,7 +487,6 @@
//
// gv_memo
//
-
this.gv_memo.AppearanceCell.Options.UseFont = true;
this.gv_memo.Caption = "澶囨敞";
this.gv_memo.FieldName = "memo";
@@ -519,16 +506,6 @@
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Width = 94;
//
- // gridColumn17
- //
- this.gridColumn17.Caption = "绫诲瀷";
- this.gridColumn17.FieldName = "fType";
- this.gridColumn17.MinWidth = 25;
- this.gridColumn17.Name = "gridColumn17";
- this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 15;
- this.gridColumn17.Width = 94;
- //
// gridColumn8
//
this.gridColumn8.Caption = "浣跨敤缁勭粐";
@@ -538,7 +515,7 @@
this.gridColumn8.OptionsColumn.AllowEdit = false;
this.gridColumn8.Tag = "org.fnumber";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 16;
+ this.gridColumn8.VisibleIndex = 15;
this.gridColumn8.Width = 250;
//
// gridColumn18
@@ -548,7 +525,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 17;
+ this.gridColumn18.VisibleIndex = 16;
this.gridColumn18.Width = 94;
//
// pageBar1
@@ -629,119 +606,112 @@
this.txt_fSubsidiary.IsReadly = false;
this.txt_fSubsidiary.Location = new System.Drawing.Point(96, 12);
this.txt_fSubsidiary.Name = "txt_fSubsidiary";
- this.txt_fSubsidiary.Size = new System.Drawing.Size(183, 28);
+ this.txt_fSubsidiary.Size = new System.Drawing.Size(188, 24);
this.txt_fSubsidiary.TabIndex = 383;
//
// txt_itemId
//
this.txt_itemId.IsReadly = false;
- this.txt_itemId.Location = new System.Drawing.Point(96, 44);
+ this.txt_itemId.Location = new System.Drawing.Point(96, 43);
this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Size = new System.Drawing.Size(183, 28);
+ this.txt_itemId.Size = new System.Drawing.Size(188, 24);
this.txt_itemId.TabIndex = 380;
this.txt_itemId.Tag = "no";
//
// txt_foneCheckdate
//
- this.txt_foneCheckdate.Location = new System.Drawing.Point(909, 44);
+ this.txt_foneCheckdate.Location = new System.Drawing.Point(926, 43);
this.txt_foneCheckdate.Name = "txt_foneCheckdate";
-
this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
- this.txt_foneCheckdate.Size = new System.Drawing.Size(185, 28);
+ this.txt_foneCheckdate.Size = new System.Drawing.Size(189, 24);
this.txt_foneCheckdate.StyleController = this.layoutMx1;
this.txt_foneCheckdate.TabIndex = 267;
this.txt_foneCheckdate.Tag = "readOnly";
//
// txt_foneCheckor
//
- this.txt_foneCheckor.Location = new System.Drawing.Point(909, 12);
+ this.txt_foneCheckor.Location = new System.Drawing.Point(926, 12);
this.txt_foneCheckor.Name = "txt_foneCheckor";
-
this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
- this.txt_foneCheckor.Size = new System.Drawing.Size(185, 28);
+ this.txt_foneCheckor.Size = new System.Drawing.Size(189, 24);
this.txt_foneCheckor.StyleController = this.layoutMx1;
this.txt_foneCheckor.TabIndex = 262;
this.txt_foneCheckor.Tag = "readOnly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(367, 44);
+ this.txt_itemNo.Location = new System.Drawing.Point(372, 43);
this.txt_itemNo.Name = "txt_itemNo";
-
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(183, 28);
+ this.txt_itemNo.Size = new System.Drawing.Size(189, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 370;
this.txt_itemNo.Tag = "readOnly";
//
// txt_memo
//
- this.txt_memo.Location = new System.Drawing.Point(96, 76);
+ this.txt_memo.Location = new System.Drawing.Point(96, 74);
this.txt_memo.Name = "txt_memo";
-
this.txt_memo.Properties.Appearance.Options.UseFont = true;
- this.txt_memo.Size = new System.Drawing.Size(183, 28);
+ this.txt_memo.Size = new System.Drawing.Size(188, 24);
this.txt_memo.StyleController = this.layoutMx1;
this.txt_memo.TabIndex = 219;
//
// txt_ftwoCheckor
//
- this.txt_ftwoCheckor.Location = new System.Drawing.Point(638, 12);
+ this.txt_ftwoCheckor.Location = new System.Drawing.Point(649, 12);
this.txt_ftwoCheckor.Name = "txt_ftwoCheckor";
-
this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true;
- this.txt_ftwoCheckor.Size = new System.Drawing.Size(183, 28);
+ this.txt_ftwoCheckor.Size = new System.Drawing.Size(189, 24);
this.txt_ftwoCheckor.StyleController = this.layoutMx1;
this.txt_ftwoCheckor.TabIndex = 280;
this.txt_ftwoCheckor.Tag = "readOnly";
//
// txt_fversion
//
- this.txt_fversion.Location = new System.Drawing.Point(367, 12);
+ this.txt_fversion.Location = new System.Drawing.Point(372, 12);
this.txt_fversion.Name = "txt_fversion";
-
this.txt_fversion.Properties.Appearance.Options.UseFont = true;
- this.txt_fversion.Size = new System.Drawing.Size(183, 28);
+ this.txt_fversion.Size = new System.Drawing.Size(189, 24);
this.txt_fversion.StyleController = this.layoutMx1;
this.txt_fversion.TabIndex = 298;
this.txt_fversion.Tag = "readOnly";
//
// txt_ftwoCheckdate
//
- this.txt_ftwoCheckdate.Location = new System.Drawing.Point(638, 44);
+ this.txt_ftwoCheckdate.Location = new System.Drawing.Point(649, 43);
this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate";
-
this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true;
- this.txt_ftwoCheckdate.Size = new System.Drawing.Size(183, 28);
+ this.txt_ftwoCheckdate.Size = new System.Drawing.Size(189, 24);
this.txt_ftwoCheckdate.StyleController = this.layoutMx1;
this.txt_ftwoCheckdate.TabIndex = 285;
this.txt_ftwoCheckdate.Tag = "readOnly";
//
// txt_gg
//
- this.txt_gg.Location = new System.Drawing.Point(367, 76);
+ this.txt_gg.Location = new System.Drawing.Point(372, 74);
this.txt_gg.Name = "txt_gg";
- this.txt_gg.Size = new System.Drawing.Size(183, 24);
+ this.txt_gg.Size = new System.Drawing.Size(189, 24);
this.txt_gg.StyleController = this.layoutMx1;
this.txt_gg.TabIndex = 384;
this.txt_gg.Tag = "readOnly";
//
// txt_ftwoChecked
//
- this.txt_ftwoChecked.Location = new System.Drawing.Point(554, 76);
+ this.txt_ftwoChecked.Location = new System.Drawing.Point(565, 74);
this.txt_ftwoChecked.Name = "txt_ftwoChecked";
this.txt_ftwoChecked.Properties.Caption = "鎵瑰噯鏍囪瘑";
- this.txt_ftwoChecked.Size = new System.Drawing.Size(267, 24);
+ this.txt_ftwoChecked.Size = new System.Drawing.Size(273, 24);
this.txt_ftwoChecked.StyleController = this.layoutMx1;
this.txt_ftwoChecked.TabIndex = 385;
this.txt_ftwoChecked.Tag = "readOnly";
//
// txt_foneChecked
//
- this.txt_foneChecked.Location = new System.Drawing.Point(825, 76);
+ this.txt_foneChecked.Location = new System.Drawing.Point(842, 74);
this.txt_foneChecked.Name = "txt_foneChecked";
this.txt_foneChecked.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_foneChecked.Size = new System.Drawing.Size(269, 24);
+ this.txt_foneChecked.Size = new System.Drawing.Size(273, 24);
this.txt_foneChecked.StyleController = this.layoutMx1;
this.txt_foneChecked.TabIndex = 386;
this.txt_foneChecked.Tag = "readOnly";
@@ -800,7 +770,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1106, 116);
+ this.Root.Size = new System.Drawing.Size(1127, 114);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -808,49 +778,49 @@
this.layoutControlItem1.Control = this.txt_fSubsidiary;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem1.Text = "閫夋嫨缁勭粐";
this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_ftwoCheckor;
- this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(553, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem3.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem3.Text = "鎵瑰噯浜�";
this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_itemId;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem4.Text = "閫夋嫨鐗╂枡";
this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_ftwoCheckdate;
- this.layoutControlItem6.Location = new System.Drawing.Point(542, 32);
+ this.layoutControlItem6.Location = new System.Drawing.Point(553, 31);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem6.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem6.Text = "鎵瑰噯鏃ユ湡";
this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_ftwoChecked;
- this.layoutControlItem9.Location = new System.Drawing.Point(542, 64);
+ this.layoutControlItem9.Location = new System.Drawing.Point(553, 62);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem9.Size = new System.Drawing.Size(277, 32);
this.layoutControlItem9.Text = "鎵瑰噯鏍囪瘑";
this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem9.TextVisible = false;
@@ -858,32 +828,32 @@
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_foneCheckor;
- this.layoutControlItem10.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(830, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(273, 32);
+ this.layoutControlItem10.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem10.Text = "瀹℃牳浜�";
this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_foneCheckdate;
- this.layoutControlItem11.Location = new System.Drawing.Point(813, 32);
+ this.layoutControlItem11.Location = new System.Drawing.Point(830, 31);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(273, 32);
+ this.layoutControlItem11.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem11.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_foneChecked;
- this.layoutControlItem12.Location = new System.Drawing.Point(813, 64);
+ this.layoutControlItem12.Location = new System.Drawing.Point(830, 62);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(273, 32);
+ this.layoutControlItem12.Size = new System.Drawing.Size(277, 32);
this.layoutControlItem12.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
@@ -891,42 +861,42 @@
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_memo;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem2.Text = "澶囨敞";
this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_fversion;
- this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem5.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem5.Text = "鐗堟湰(鑷姩)";
this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_gg;
- this.layoutControlItem8.Location = new System.Drawing.Point(271, 64);
+ this.layoutControlItem8.Location = new System.Drawing.Point(276, 62);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem8.Size = new System.Drawing.Size(277, 32);
this.layoutControlItem8.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_itemNo;
- this.layoutControlItem7.Location = new System.Drawing.Point(271, 32);
+ this.layoutControlItem7.Location = new System.Drawing.Point(276, 31);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem7.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem7.Text = "鐗╂枡缂栫爜";
this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 18);
//
@@ -996,7 +966,6 @@
//
// gvMx1guid
//
-
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid";
this.gvMx1guid.FieldName = "guid";
@@ -1007,7 +976,6 @@
//
// gvMx1pid
//
-
this.gvMx1pid.AppearanceCell.Options.UseFont = true;
this.gvMx1pid.Caption = "pid";
this.gvMx1pid.FieldName = "pid";
@@ -1018,7 +986,6 @@
//
// gvMx1forder
//
-
this.gvMx1forder.AppearanceCell.Options.UseFont = true;
this.gvMx1forder.Caption = "椤哄簭";
this.gvMx1forder.ColumnEdit = this.repositoryItemComboBox1;
@@ -1055,7 +1022,6 @@
//
// gvMx1fcheckItem
//
-
this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
this.gvMx1fcheckItem.ColumnEdit = this.rptJYXM;
@@ -1087,7 +1053,6 @@
//
// gvMx1memo
//
-
this.gvMx1memo.AppearanceCell.Options.UseFont = true;
this.gvMx1memo.Caption = "妫�楠岄」鐩弿杩�";
this.gvMx1memo.FieldName = "memo";
@@ -1100,7 +1065,6 @@
//
// gvMx1fcheckTool
//
-
this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
this.gvMx1fcheckTool.ColumnEdit = this.rptJYGJ;
@@ -1122,7 +1086,6 @@
//
// gvMx1sampleSizeNo
//
-
this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣鍑嗗悕绉�";
this.gvMx1sampleSizeNo.ColumnEdit = this.rptJYBZ;
@@ -1157,7 +1120,6 @@
//
// gvMx1fcheckLevel
//
-
this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
this.gvMx1fcheckLevel.ColumnEdit = this.rptJYSP;
@@ -1179,7 +1141,6 @@
//
// gvMx1facLevel
//
-
this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1facLevel.Caption = "鎺ユ敹姘村钩";
this.gvMx1facLevel.ColumnEdit = this.rptJSSP;
@@ -1201,7 +1162,6 @@
//
// gvMx1fupAllow
//
-
this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fupAllow.Caption = "涓婇檺";
this.gvMx1fupAllow.FieldName = "fupAllow";
@@ -1214,7 +1174,6 @@
//
// gvMx1fstand
//
-
this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
this.gvMx1fstand.Caption = "鏍囧噯鍊�";
this.gvMx1fstand.FieldName = "fstand";
@@ -1227,7 +1186,6 @@
//
// gvMx1fdownAllow
//
-
this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fdownAllow.Caption = "涓嬮檺";
this.gvMx1fdownAllow.FieldName = "fdownAllow";
@@ -1309,7 +1267,6 @@
//
// gridColumn11
//
-
this.gridColumn11.AppearanceCell.Options.UseFont = true;
this.gridColumn11.Caption = "浣跨敤缁勭粐";
this.gridColumn11.FieldName = "fSubsidiary";
@@ -1334,7 +1291,6 @@
//
// gridColumn13
//
-
this.gridColumn13.AppearanceCell.Options.UseFont = true;
this.gridColumn13.Caption = "鐗╂枡缂栧彿";
this.gridColumn13.FieldName = "itemNo";
@@ -1348,7 +1304,6 @@
//
// gridColumn14
//
-
this.gridColumn14.AppearanceCell.Options.UseFont = true;
this.gridColumn14.Caption = "鐗╂枡鍚嶇О";
this.gridColumn14.FieldName = "itemName";
@@ -1362,7 +1317,6 @@
//
// gridColumn15
//
-
this.gridColumn15.AppearanceCell.Options.UseFont = true;
this.gridColumn15.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn15.FieldName = "itemModel";
@@ -1612,7 +1566,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index cec6dff..f88c295 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -24,8 +24,6 @@
{
InitializeComponent();
strType = _strType;
-
-
}
protected override void OnCreateControl()
{
@@ -40,6 +38,7 @@
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
+ //iqc鐨勬牱鍝佹暟閲忛粯璁�5锛屽惁鍒�1
decimal _dfValue = 1;
if (strType == "iqc")
_dfValue = 5;
@@ -82,13 +81,12 @@
frm.ShowDialog();
};
btnSave.Click += BtnSave_Click;
-
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -110,10 +108,16 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
+ Form parentForm;
+ if (this.Parent is Form)
+ parentForm = this.Parent as Form;
+ else
+ parentForm = this.Parent.Parent as Form;
+
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
index e64be54..71f3813 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -28,36 +28,37 @@
/// </summary>
private void InitializeComponent()
{
- 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.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ this.components = new System.ComponentModel.Container();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layTop1 = new DevExpress.XtraLayout.LayoutControl();
- this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
- this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
- this.textEdit3 = new DevExpress.XtraEditors.TextEdit();
- this.textEdit4 = new DevExpress.XtraEditors.TextEdit();
- this.textEdit5 = new DevExpress.XtraEditors.TextEdit();
- this.textEdit6 = new DevExpress.XtraEditors.TextEdit();
- this.textEdit7 = new DevExpress.XtraEditors.TextEdit();
- this.textEdit8 = new DevExpress.XtraEditors.TextEdit();
- this.textEdit9 = new DevExpress.XtraEditors.TextEdit();
- this.textEdit10 = new DevExpress.XtraEditors.TextEdit();
- this.textEdit11 = new DevExpress.XtraEditors.TextEdit();
- this.textEdit12 = new DevExpress.XtraEditors.TextEdit();
- this.textEdit13 = new DevExpress.XtraEditors.TextEdit();
- this.textEdit14 = new DevExpress.XtraEditors.TextEdit();
- this.textEdit15 = new DevExpress.XtraEditors.TextEdit();
- this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
- this.simpleButton2 = new DevExpress.XtraEditors.SimpleButton();
+ this.txt_gdbh = new DevExpress.XtraEditors.TextEdit();
+ this.txt_gx = new DevExpress.XtraEditors.TextEdit();
+ this.txt_czz = new DevExpress.XtraEditors.TextEdit();
+ this.txt_barCode = new DevExpress.XtraEditors.TextEdit();
+ this.txt_currentBarCode = new DevExpress.XtraEditors.TextEdit();
+ this.txt_gwm = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_bc = new DevExpress.XtraEditors.TextEdit();
+ this.txt_gw = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
+ this.txt_sbNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_sjXt = new DevExpress.XtraEditors.TextEdit();
+ this.txt_yjDate = new DevExpress.XtraEditors.TextEdit();
+ this.txt_sjDate = new DevExpress.XtraEditors.TextEdit();
+ this.btnGood = new DevExpress.XtraEditors.SimpleButton();
+ this.btnBad = new DevExpress.XtraEditors.SimpleButton();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -83,16 +84,16 @@
this.simpleButton3 = new DevExpress.XtraEditors.SimpleButton();
this.progressBarControl1 = new DevExpress.XtraEditors.ProgressBarControl();
this.panel3 = new System.Windows.Forms.Panel();
- this.label5 = new System.Windows.Forms.Label();
+ this.lbSum4 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.panel2 = new System.Windows.Forms.Panel();
- this.label3 = new System.Windows.Forms.Label();
+ this.lbSum3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.panel4 = new System.Windows.Forms.Panel();
- this.label7 = new System.Windows.Forms.Label();
+ this.lbSum2 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
- this.label2 = new System.Windows.Forms.Label();
+ this.lbSum1 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -128,6 +129,7 @@
this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
this.splitMx1.Panel1.SuspendLayout();
@@ -142,21 +144,21 @@
this.splitTop1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layTop1)).BeginInit();
this.layTop1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit3.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit6.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit7.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit8.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit9.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit10.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit11.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit12.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit13.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit14.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit15.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_gdbh.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_gx.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_czz.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_currentBarCode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_gwm.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_bc.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_gw.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sbNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sjXt.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yjDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sjDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -242,23 +244,23 @@
//
// layTop1
//
- this.layTop1.Controls.Add(this.textEdit1);
- this.layTop1.Controls.Add(this.textEdit2);
- this.layTop1.Controls.Add(this.textEdit3);
- this.layTop1.Controls.Add(this.textEdit4);
- this.layTop1.Controls.Add(this.textEdit5);
- this.layTop1.Controls.Add(this.textEdit6);
- this.layTop1.Controls.Add(this.textEdit7);
- this.layTop1.Controls.Add(this.textEdit8);
- this.layTop1.Controls.Add(this.textEdit9);
- this.layTop1.Controls.Add(this.textEdit10);
- this.layTop1.Controls.Add(this.textEdit11);
- this.layTop1.Controls.Add(this.textEdit12);
- this.layTop1.Controls.Add(this.textEdit13);
- this.layTop1.Controls.Add(this.textEdit14);
- this.layTop1.Controls.Add(this.textEdit15);
- this.layTop1.Controls.Add(this.simpleButton1);
- this.layTop1.Controls.Add(this.simpleButton2);
+ this.layTop1.Controls.Add(this.txt_gdbh);
+ this.layTop1.Controls.Add(this.txt_gx);
+ this.layTop1.Controls.Add(this.txt_czz);
+ this.layTop1.Controls.Add(this.txt_barCode);
+ this.layTop1.Controls.Add(this.txt_currentBarCode);
+ this.layTop1.Controls.Add(this.txt_gwm);
+ this.layTop1.Controls.Add(this.txt_itemNo);
+ this.layTop1.Controls.Add(this.txt_bc);
+ this.layTop1.Controls.Add(this.txt_gw);
+ this.layTop1.Controls.Add(this.txt_itemName);
+ this.layTop1.Controls.Add(this.txt_itemModel);
+ this.layTop1.Controls.Add(this.txt_sbNo);
+ this.layTop1.Controls.Add(this.txt_sjXt);
+ this.layTop1.Controls.Add(this.txt_yjDate);
+ this.layTop1.Controls.Add(this.txt_sjDate);
+ this.layTop1.Controls.Add(this.btnGood);
+ this.layTop1.Controls.Add(this.btnBad);
this.layTop1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layTop1.Location = new System.Drawing.Point(0, 0);
this.layTop1.Name = "layTop1";
@@ -268,147 +270,147 @@
this.layTop1.TabIndex = 0;
this.layTop1.Text = "layoutControl1";
//
- // textEdit1
+ // txt_gdbh
//
- this.textEdit1.Location = new System.Drawing.Point(84, 12);
- this.textEdit1.Name = "textEdit1";
- this.textEdit1.Size = new System.Drawing.Size(126, 24);
- this.textEdit1.StyleController = this.layTop1;
- this.textEdit1.TabIndex = 4;
+ this.txt_gdbh.Location = new System.Drawing.Point(84, 12);
+ this.txt_gdbh.Name = "txt_gdbh";
+ this.txt_gdbh.Size = new System.Drawing.Size(126, 24);
+ this.txt_gdbh.StyleController = this.layTop1;
+ this.txt_gdbh.TabIndex = 4;
//
- // textEdit2
+ // txt_gx
//
- this.textEdit2.Location = new System.Drawing.Point(84, 40);
- this.textEdit2.Name = "textEdit2";
- this.textEdit2.Size = new System.Drawing.Size(126, 24);
- this.textEdit2.StyleController = this.layTop1;
- this.textEdit2.TabIndex = 5;
+ this.txt_gx.Location = new System.Drawing.Point(84, 40);
+ this.txt_gx.Name = "txt_gx";
+ this.txt_gx.Size = new System.Drawing.Size(126, 24);
+ this.txt_gx.StyleController = this.layTop1;
+ this.txt_gx.TabIndex = 5;
//
- // textEdit3
+ // txt_czz
//
- this.textEdit3.Location = new System.Drawing.Point(84, 68);
- this.textEdit3.Name = "textEdit3";
- this.textEdit3.Size = new System.Drawing.Size(126, 24);
- this.textEdit3.StyleController = this.layTop1;
- this.textEdit3.TabIndex = 6;
+ this.txt_czz.Location = new System.Drawing.Point(84, 68);
+ this.txt_czz.Name = "txt_czz";
+ this.txt_czz.Size = new System.Drawing.Size(126, 24);
+ this.txt_czz.StyleController = this.layTop1;
+ this.txt_czz.TabIndex = 6;
//
- // textEdit4
+ // txt_barCode
//
- this.textEdit4.Location = new System.Drawing.Point(84, 96);
- this.textEdit4.Name = "textEdit4";
- this.textEdit4.Size = new System.Drawing.Size(328, 24);
- this.textEdit4.StyleController = this.layTop1;
- this.textEdit4.TabIndex = 7;
+ this.txt_barCode.Location = new System.Drawing.Point(84, 96);
+ this.txt_barCode.Name = "txt_barCode";
+ this.txt_barCode.Size = new System.Drawing.Size(328, 24);
+ this.txt_barCode.StyleController = this.layTop1;
+ this.txt_barCode.TabIndex = 7;
//
- // textEdit5
+ // txt_currentBarCode
//
- this.textEdit5.Location = new System.Drawing.Point(84, 124);
- this.textEdit5.Name = "textEdit5";
- this.textEdit5.Size = new System.Drawing.Size(328, 24);
- this.textEdit5.StyleController = this.layTop1;
- this.textEdit5.TabIndex = 8;
+ this.txt_currentBarCode.Location = new System.Drawing.Point(84, 124);
+ this.txt_currentBarCode.Name = "txt_currentBarCode";
+ this.txt_currentBarCode.Size = new System.Drawing.Size(328, 24);
+ this.txt_currentBarCode.StyleController = this.layTop1;
+ this.txt_currentBarCode.TabIndex = 8;
//
- // textEdit6
+ // txt_gwm
//
- this.textEdit6.Location = new System.Drawing.Point(84, 152);
- this.textEdit6.Name = "textEdit6";
- this.textEdit6.Size = new System.Drawing.Size(126, 24);
- this.textEdit6.StyleController = this.layTop1;
- this.textEdit6.TabIndex = 9;
+ this.txt_gwm.Location = new System.Drawing.Point(84, 152);
+ this.txt_gwm.Name = "txt_gwm";
+ this.txt_gwm.Size = new System.Drawing.Size(126, 24);
+ this.txt_gwm.StyleController = this.layTop1;
+ this.txt_gwm.TabIndex = 9;
//
- // textEdit7
+ // txt_itemNo
//
- this.textEdit7.Location = new System.Drawing.Point(286, 12);
- this.textEdit7.Name = "textEdit7";
- this.textEdit7.Size = new System.Drawing.Size(126, 24);
- this.textEdit7.StyleController = this.layTop1;
- this.textEdit7.TabIndex = 10;
+ this.txt_itemNo.Location = new System.Drawing.Point(286, 12);
+ this.txt_itemNo.Name = "txt_itemNo";
+ this.txt_itemNo.Size = new System.Drawing.Size(126, 24);
+ this.txt_itemNo.StyleController = this.layTop1;
+ this.txt_itemNo.TabIndex = 10;
//
- // textEdit8
+ // txt_bc
//
- this.textEdit8.Location = new System.Drawing.Point(286, 40);
- this.textEdit8.Name = "textEdit8";
- this.textEdit8.Size = new System.Drawing.Size(126, 24);
- this.textEdit8.StyleController = this.layTop1;
- this.textEdit8.TabIndex = 11;
+ this.txt_bc.Location = new System.Drawing.Point(286, 40);
+ this.txt_bc.Name = "txt_bc";
+ this.txt_bc.Size = new System.Drawing.Size(126, 24);
+ this.txt_bc.StyleController = this.layTop1;
+ this.txt_bc.TabIndex = 11;
//
- // textEdit9
+ // txt_gw
//
- this.textEdit9.Location = new System.Drawing.Point(286, 68);
- this.textEdit9.Name = "textEdit9";
- this.textEdit9.Size = new System.Drawing.Size(126, 24);
- this.textEdit9.StyleController = this.layTop1;
- this.textEdit9.TabIndex = 12;
+ this.txt_gw.Location = new System.Drawing.Point(286, 68);
+ this.txt_gw.Name = "txt_gw";
+ this.txt_gw.Size = new System.Drawing.Size(126, 24);
+ this.txt_gw.StyleController = this.layTop1;
+ this.txt_gw.TabIndex = 12;
//
- // textEdit10
+ // txt_itemName
//
- this.textEdit10.Location = new System.Drawing.Point(488, 12);
- this.textEdit10.Name = "textEdit10";
- this.textEdit10.Size = new System.Drawing.Size(126, 24);
- this.textEdit10.StyleController = this.layTop1;
- this.textEdit10.TabIndex = 13;
+ this.txt_itemName.Location = new System.Drawing.Point(488, 12);
+ this.txt_itemName.Name = "txt_itemName";
+ this.txt_itemName.Size = new System.Drawing.Size(126, 24);
+ this.txt_itemName.StyleController = this.layTop1;
+ this.txt_itemName.TabIndex = 13;
//
- // textEdit11
+ // txt_itemModel
//
- this.textEdit11.Location = new System.Drawing.Point(690, 12);
- this.textEdit11.Name = "textEdit11";
- this.textEdit11.Size = new System.Drawing.Size(126, 24);
- this.textEdit11.StyleController = this.layTop1;
- this.textEdit11.TabIndex = 14;
+ this.txt_itemModel.Location = new System.Drawing.Point(690, 12);
+ this.txt_itemModel.Name = "txt_itemModel";
+ this.txt_itemModel.Size = new System.Drawing.Size(126, 24);
+ this.txt_itemModel.StyleController = this.layTop1;
+ this.txt_itemModel.TabIndex = 14;
//
- // textEdit12
+ // txt_sbNo
//
- this.textEdit12.Location = new System.Drawing.Point(488, 68);
- this.textEdit12.Name = "textEdit12";
- this.textEdit12.Size = new System.Drawing.Size(126, 24);
- this.textEdit12.StyleController = this.layTop1;
- this.textEdit12.TabIndex = 15;
+ this.txt_sbNo.Location = new System.Drawing.Point(488, 68);
+ this.txt_sbNo.Name = "txt_sbNo";
+ this.txt_sbNo.Size = new System.Drawing.Size(126, 24);
+ this.txt_sbNo.StyleController = this.layTop1;
+ this.txt_sbNo.TabIndex = 15;
//
- // textEdit13
+ // txt_sjXt
//
- this.textEdit13.Location = new System.Drawing.Point(488, 40);
- this.textEdit13.Name = "textEdit13";
- this.textEdit13.Size = new System.Drawing.Size(126, 24);
- this.textEdit13.StyleController = this.layTop1;
- this.textEdit13.TabIndex = 16;
+ this.txt_sjXt.Location = new System.Drawing.Point(488, 40);
+ this.txt_sjXt.Name = "txt_sjXt";
+ this.txt_sjXt.Size = new System.Drawing.Size(126, 24);
+ this.txt_sjXt.StyleController = this.layTop1;
+ this.txt_sjXt.TabIndex = 16;
//
- // textEdit14
+ // txt_yjDate
//
- this.textEdit14.Location = new System.Drawing.Point(690, 40);
- this.textEdit14.Name = "textEdit14";
- this.textEdit14.Size = new System.Drawing.Size(126, 24);
- this.textEdit14.StyleController = this.layTop1;
- this.textEdit14.TabIndex = 17;
+ this.txt_yjDate.Location = new System.Drawing.Point(690, 40);
+ this.txt_yjDate.Name = "txt_yjDate";
+ this.txt_yjDate.Size = new System.Drawing.Size(126, 24);
+ this.txt_yjDate.StyleController = this.layTop1;
+ this.txt_yjDate.TabIndex = 17;
//
- // textEdit15
+ // txt_sjDate
//
- this.textEdit15.Location = new System.Drawing.Point(690, 68);
- this.textEdit15.Name = "textEdit15";
- this.textEdit15.Size = new System.Drawing.Size(126, 24);
- this.textEdit15.StyleController = this.layTop1;
- this.textEdit15.TabIndex = 18;
+ this.txt_sjDate.Location = new System.Drawing.Point(690, 68);
+ this.txt_sjDate.Name = "txt_sjDate";
+ this.txt_sjDate.Size = new System.Drawing.Size(126, 24);
+ this.txt_sjDate.StyleController = this.layTop1;
+ this.txt_sjDate.TabIndex = 18;
//
- // simpleButton1
+ // btnGood
//
- this.simpleButton1.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
- this.simpleButton1.Appearance.Options.UseBackColor = true;
- this.simpleButton1.Location = new System.Drawing.Point(416, 96);
- this.simpleButton1.Name = "simpleButton1";
- this.simpleButton1.Size = new System.Drawing.Size(198, 83);
- this.simpleButton1.StyleController = this.layTop1;
- this.simpleButton1.TabIndex = 19;
- this.simpleButton1.Text = "鑹搧";
+ this.btnGood.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
+ this.btnGood.Appearance.Options.UseBackColor = true;
+ this.btnGood.Location = new System.Drawing.Point(416, 96);
+ this.btnGood.Name = "btnGood";
+ this.btnGood.Size = new System.Drawing.Size(198, 83);
+ this.btnGood.StyleController = this.layTop1;
+ this.btnGood.TabIndex = 19;
+ this.btnGood.Text = "鑹搧";
//
- // simpleButton2
+ // btnBad
//
- this.simpleButton2.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
- this.simpleButton2.Appearance.Options.UseBackColor = true;
- this.simpleButton2.Location = new System.Drawing.Point(618, 96);
- this.simpleButton2.Name = "simpleButton2";
- this.simpleButton2.Size = new System.Drawing.Size(198, 83);
- this.simpleButton2.StyleController = this.layTop1;
- this.simpleButton2.TabIndex = 20;
- this.simpleButton2.Text = "涓嶈壇鍝�";
+ this.btnBad.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
+ this.btnBad.Appearance.Options.UseBackColor = true;
+ this.btnBad.Location = new System.Drawing.Point(618, 96);
+ this.btnBad.Name = "btnBad";
+ this.btnBad.Size = new System.Drawing.Size(198, 83);
+ this.btnBad.StyleController = this.layTop1;
+ this.btnBad.TabIndex = 20;
+ this.btnBad.Text = "涓嶈壇鍝�";
//
// Root
//
@@ -434,44 +436,44 @@
this.layoutControlItem11});
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;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.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;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9,
+ columnDefinition10,
+ columnDefinition11,
+ columnDefinition12});
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition14.Height = 100D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition15.Height = 100D;
+ rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition16.Height = 100D;
+ rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition17.Height = 100D;
+ rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition18.Height = 100D;
+ rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
+ rowDefinition13,
+ rowDefinition14,
+ rowDefinition15,
+ rowDefinition16,
+ rowDefinition17,
+ rowDefinition18});
this.Root.Size = new System.Drawing.Size(828, 191);
this.Root.TextVisible = false;
//
// layoutControlItem1
//
- this.layoutControlItem1.Control = this.textEdit1;
+ this.layoutControlItem1.Control = this.txt_gdbh;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(202, 28);
@@ -480,7 +482,7 @@
//
// layoutControlItem2
//
- this.layoutControlItem2.Control = this.textEdit2;
+ this.layoutControlItem2.Control = this.txt_gx;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
@@ -490,7 +492,7 @@
//
// layoutControlItem3
//
- this.layoutControlItem3.Control = this.textEdit3;
+ this.layoutControlItem3.Control = this.txt_czz;
this.layoutControlItem3.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
@@ -500,7 +502,7 @@
//
// layoutControlItem4
//
- this.layoutControlItem4.Control = this.textEdit4;
+ this.layoutControlItem4.Control = this.txt_barCode;
this.layoutControlItem4.Location = new System.Drawing.Point(0, 84);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
@@ -511,7 +513,7 @@
//
// layoutControlItem7
//
- this.layoutControlItem7.Control = this.textEdit7;
+ this.layoutControlItem7.Control = this.txt_itemNo;
this.layoutControlItem7.Location = new System.Drawing.Point(202, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -521,7 +523,7 @@
//
// layoutControlItem8
//
- this.layoutControlItem8.Control = this.textEdit8;
+ this.layoutControlItem8.Control = this.txt_bc;
this.layoutControlItem8.Location = new System.Drawing.Point(202, 28);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -532,7 +534,7 @@
//
// layoutControlItem9
//
- this.layoutControlItem9.Control = this.textEdit9;
+ this.layoutControlItem9.Control = this.txt_gw;
this.layoutControlItem9.Location = new System.Drawing.Point(202, 56);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -543,7 +545,7 @@
//
// layoutControlItem10
//
- this.layoutControlItem10.Control = this.textEdit10;
+ this.layoutControlItem10.Control = this.txt_itemName;
this.layoutControlItem10.Location = new System.Drawing.Point(404, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -553,7 +555,7 @@
//
// layoutControlItem12
//
- this.layoutControlItem12.Control = this.textEdit12;
+ this.layoutControlItem12.Control = this.txt_sbNo;
this.layoutControlItem12.Location = new System.Drawing.Point(404, 56);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -564,7 +566,7 @@
//
// layoutControlItem14
//
- this.layoutControlItem14.Control = this.textEdit14;
+ this.layoutControlItem14.Control = this.txt_yjDate;
this.layoutControlItem14.Location = new System.Drawing.Point(606, 28);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -575,7 +577,7 @@
//
// layoutControlItem15
//
- this.layoutControlItem15.Control = this.textEdit15;
+ this.layoutControlItem15.Control = this.txt_sjDate;
this.layoutControlItem15.Location = new System.Drawing.Point(606, 56);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -586,7 +588,7 @@
//
// layoutControlItem5
//
- this.layoutControlItem5.Control = this.textEdit5;
+ this.layoutControlItem5.Control = this.txt_currentBarCode;
this.layoutControlItem5.Location = new System.Drawing.Point(0, 112);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
@@ -597,7 +599,7 @@
//
// layoutControlItem6
//
- this.layoutControlItem6.Control = this.textEdit6;
+ this.layoutControlItem6.Control = this.txt_gwm;
this.layoutControlItem6.Location = new System.Drawing.Point(0, 140);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 5;
@@ -607,7 +609,7 @@
//
// layoutControlItem16
//
- this.layoutControlItem16.Control = this.simpleButton1;
+ this.layoutControlItem16.Control = this.btnGood;
this.layoutControlItem16.Location = new System.Drawing.Point(404, 84);
this.layoutControlItem16.MaxSize = new System.Drawing.Size(0, 100);
this.layoutControlItem16.MinSize = new System.Drawing.Size(41, 100);
@@ -623,7 +625,7 @@
//
// layoutControlItem17
//
- this.layoutControlItem17.Control = this.simpleButton2;
+ this.layoutControlItem17.Control = this.btnBad;
this.layoutControlItem17.Location = new System.Drawing.Point(606, 84);
this.layoutControlItem17.MaxSize = new System.Drawing.Size(0, 100);
this.layoutControlItem17.MinSize = new System.Drawing.Size(56, 100);
@@ -639,7 +641,7 @@
//
// layoutControlItem13
//
- this.layoutControlItem13.Control = this.textEdit13;
+ this.layoutControlItem13.Control = this.txt_sjXt;
this.layoutControlItem13.Location = new System.Drawing.Point(404, 28);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -650,7 +652,7 @@
//
// layoutControlItem11
//
- this.layoutControlItem11.Control = this.textEdit11;
+ this.layoutControlItem11.Control = this.txt_itemModel;
this.layoutControlItem11.Location = new System.Drawing.Point(606, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -718,21 +720,21 @@
// panel3
//
this.panel3.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
- this.panel3.Controls.Add(this.label5);
+ this.panel3.Controls.Add(this.lbSum4);
this.panel3.Controls.Add(this.label6);
this.panel3.Location = new System.Drawing.Point(411, 7);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(99, 71);
this.panel3.TabIndex = 4;
//
- // label5
+ // lbSum4
//
- this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(45, 46);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(16, 18);
- this.label5.TabIndex = 1;
- this.label5.Text = "0";
+ this.lbSum4.AutoSize = true;
+ this.lbSum4.Location = new System.Drawing.Point(45, 46);
+ this.lbSum4.Name = "lbSum4";
+ this.lbSum4.Size = new System.Drawing.Size(16, 18);
+ this.lbSum4.TabIndex = 1;
+ this.lbSum4.Text = "0";
//
// label6
//
@@ -746,21 +748,21 @@
// panel2
//
this.panel2.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
- this.panel2.Controls.Add(this.label3);
+ this.panel2.Controls.Add(this.lbSum3);
this.panel2.Controls.Add(this.label4);
this.panel2.Location = new System.Drawing.Point(281, 7);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(99, 71);
this.panel2.TabIndex = 3;
//
- // label3
+ // lbSum3
//
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(45, 46);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(16, 18);
- this.label3.TabIndex = 1;
- this.label3.Text = "0";
+ this.lbSum3.AutoSize = true;
+ this.lbSum3.Location = new System.Drawing.Point(45, 46);
+ this.lbSum3.Name = "lbSum3";
+ this.lbSum3.Size = new System.Drawing.Size(16, 18);
+ this.lbSum3.TabIndex = 1;
+ this.lbSum3.Text = "0";
//
// label4
//
@@ -774,21 +776,21 @@
// panel4
//
this.panel4.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
- this.panel4.Controls.Add(this.label7);
+ this.panel4.Controls.Add(this.lbSum2);
this.panel4.Controls.Add(this.label8);
this.panel4.Location = new System.Drawing.Point(151, 7);
this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(99, 71);
this.panel4.TabIndex = 2;
//
- // label7
+ // lbSum2
//
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(45, 46);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(16, 18);
- this.label7.TabIndex = 1;
- this.label7.Text = "0";
+ this.lbSum2.AutoSize = true;
+ this.lbSum2.Location = new System.Drawing.Point(45, 46);
+ this.lbSum2.Name = "lbSum2";
+ this.lbSum2.Size = new System.Drawing.Size(16, 18);
+ this.lbSum2.TabIndex = 1;
+ this.lbSum2.Text = "0";
//
// label8
//
@@ -802,21 +804,21 @@
// panel1
//
this.panel1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
- this.panel1.Controls.Add(this.label2);
+ this.panel1.Controls.Add(this.lbSum1);
this.panel1.Controls.Add(this.label1);
this.panel1.Location = new System.Drawing.Point(21, 7);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(99, 71);
this.panel1.TabIndex = 0;
//
- // label2
+ // lbSum1
//
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(45, 46);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(16, 18);
- this.label2.TabIndex = 1;
- this.label2.Text = "0";
+ this.lbSum1.AutoSize = true;
+ this.lbSum1.Location = new System.Drawing.Point(45, 46);
+ this.lbSum1.Name = "lbSum1";
+ this.lbSum1.Size = new System.Drawing.Size(16, 18);
+ this.lbSum1.TabIndex = 1;
+ this.lbSum1.Text = "0";
//
// label1
//
@@ -1032,7 +1034,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1365, 391);
+ this.tabMxPage2.Size = new System.Drawing.Size(1365, 384);
this.tabMxPage2.Text = "涓嶈壇鍝佹槑缁�";
//
// gcMx2
@@ -1041,7 +1043,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1365, 391);
+ this.gcMx2.Size = new System.Drawing.Size(1365, 384);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1231,21 +1233,21 @@
this.splitTop1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layTop1)).EndInit();
this.layTop1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit3.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit6.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit7.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit8.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit9.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit10.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit11.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit12.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit13.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit14.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit15.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_gdbh.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_gx.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_czz.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_currentBarCode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_gwm.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_bc.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_gw.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sbNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sjXt.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yjDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sjDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1322,25 +1324,25 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
private DevExpress.XtraLayout.LayoutControl layTop1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraEditors.TextEdit textEdit1;
- private DevExpress.XtraEditors.TextEdit textEdit2;
- private DevExpress.XtraEditors.TextEdit textEdit3;
- private DevExpress.XtraEditors.TextEdit textEdit4;
- private DevExpress.XtraEditors.TextEdit textEdit5;
- private DevExpress.XtraEditors.TextEdit textEdit6;
+ private DevExpress.XtraEditors.TextEdit txt_gdbh;
+ private DevExpress.XtraEditors.TextEdit txt_gx;
+ private DevExpress.XtraEditors.TextEdit txt_czz;
+ private DevExpress.XtraEditors.TextEdit txt_barCode;
+ private DevExpress.XtraEditors.TextEdit txt_currentBarCode;
+ private DevExpress.XtraEditors.TextEdit txt_gwm;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraEditors.TextEdit textEdit7;
- private DevExpress.XtraEditors.TextEdit textEdit8;
- private DevExpress.XtraEditors.TextEdit textEdit9;
- private DevExpress.XtraEditors.TextEdit textEdit10;
- private DevExpress.XtraEditors.TextEdit textEdit11;
- private DevExpress.XtraEditors.TextEdit textEdit12;
- private DevExpress.XtraEditors.TextEdit textEdit13;
- private DevExpress.XtraEditors.TextEdit textEdit14;
- private DevExpress.XtraEditors.TextEdit textEdit15;
+ private DevExpress.XtraEditors.TextEdit txt_itemNo;
+ private DevExpress.XtraEditors.TextEdit txt_bc;
+ private DevExpress.XtraEditors.TextEdit txt_gw;
+ private DevExpress.XtraEditors.TextEdit txt_itemName;
+ private DevExpress.XtraEditors.TextEdit txt_itemModel;
+ private DevExpress.XtraEditors.TextEdit txt_sbNo;
+ private DevExpress.XtraEditors.TextEdit txt_sjXt;
+ private DevExpress.XtraEditors.TextEdit txt_yjDate;
+ private DevExpress.XtraEditors.TextEdit txt_sjDate;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
@@ -1348,19 +1350,19 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraEditors.SimpleButton simpleButton1;
- private DevExpress.XtraEditors.SimpleButton simpleButton2;
+ private DevExpress.XtraEditors.SimpleButton btnGood;
+ private DevExpress.XtraEditors.SimpleButton btnBad;
private System.Windows.Forms.Panel panel3;
- private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.Label lbSum4;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Panel panel2;
- private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label lbSum3;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Panel panel4;
- private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.Label lbSum2;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label lbSum1;
private System.Windows.Forms.Label label1;
private DevExpress.XtraEditors.SimpleButton simpleButton7;
private DevExpress.XtraEditors.SimpleButton simpleButton6;
@@ -1377,5 +1379,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraBars.Alerter.AlertControl alertControl1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index d7af265..2b1f46d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -1,4 +1,10 @@
-锘縰sing DevExpress.XtraEditors;
+锘縰sing DevExpress.Utils.DirectXPaint;
+using DevExpress.XtraBars.Alerter;
+using DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -13,10 +19,97 @@
{
public partial class Frm_Work01 : DevExpress.XtraEditors.XtraForm
{
+ string _webServiceName = "WorkCollect/";
public Frm_Work01()
{
InitializeComponent();
-
+ txt_barCode.KeyDown += (s, e) =>
+ {
+ if (e.KeyCode == Keys.Enter) { getModel(); };
+ };
+ }
+
+ private void getModel()
+ {
+ string _barCode =txt_barCode.Text.Trim();
+ //string _guid = "";
+ string _inBz = ""; ; //澶囨敞
+ string _checkVal = ""; ; //妫�娴嬪��
+ string _checkResult = ""; ; //妫�娴嬬粨鏋�
+ if (string.IsNullOrEmpty(_barCode))
+ {
+ ToolBox.MsgHelper.ShowError("璇峰厛鎵爜锛�");
+ return;
+ }
+ var _obj = new
+ {
+ // guid = _guid,
+ barCode = _barCode,
+ inBz = _inBz,
+ checkVal = _checkVal,
+ checkResult = _checkResult,
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ dynamic dy = _rtn.rtnData;
+ JObject _job = JObject.Parse(strJson);
+ JArray array = new JArray();
+ foreach (var a in _job["rtnData"]["list"])
+ {
+ array.Add(a);
+ }
+ DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ if (dt.Rows.Count > 0)
+ {
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = dt;
+ gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ }
+ JArray array2 = new JArray();
+ foreach (var a in _job["rtnData"]["list2"])
+ {
+ array2.Add(a);
+ }
+ DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+ if (dt2.Rows.Count > 0)
+ {
+ gcMx2.BindingContext = new BindingContext();
+ gcMx2.DataSource = dt2;
+ gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ }
+ string _msg = _rtn.rtnMsg;
+ //璁剧疆鍗曠獥鍙ｅ嚭鐜板脊鍑虹殑閫熷害
+ this.alertControl1.FormDisplaySpeed = DevExpress.XtraBars.Alerter.AlertFormDisplaySpeed.Fast;
+ //璁剧疆鏄剧ず澶氬皯鏃堕棿绐楀彛浼氳嚜鍔ㄥ叧闂� 浠ユ绉掍负鍗曚綅
+ this.alertControl1.AutoFormDelay = 3000;
+ //璁剧疆鎻愬嚭绐楀彛鐨勬樉绀虹殑浣嶇疆
+ this.alertControl1.FormLocation = DevExpress.XtraBars.Alerter.AlertFormLocation.BottomRight;
+ this.alertControl1.Show(this, "鎻愮ず!", _msg);
+
+ }
+ else
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.resx b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.resx
index 1af7de1..fc44dd5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.resx
@@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="alertControl1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
</root>
\ No newline at end of file
--
Gitblit v1.9.3