From 45658068e0fb7bc4359c9ec4ce194f17aaab5e3e Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期一, 17 十一月 2025 18:00:56 +0800
Subject: [PATCH] ID转人名:计时单价、异常工时、部门产线对应维护、排班管理、工艺设置、现场修理
---
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs | 1134 +++++++++++++++++++++++++++-------------------------------
1 files changed, 527 insertions(+), 607 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
index e169cea..71459bc 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
@@ -29,18 +29,18 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -49,17 +49,12 @@
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_isFinish = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_isOut = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastUpdateUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastUpdateTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_returnMethod = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_returnType = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -73,10 +68,10 @@
this.txt_billType = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
- this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkByName = new DevExpress.XtraEditors.TextEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
- this.lastUpdateUser = new DevExpress.XtraEditors.TextEdit();
- this.lastUpdateTime = new DevExpress.XtraEditors.TextEdit();
+ this.txt_lastUpdateByName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_lastUpdateDate = new DevExpress.XtraEditors.TextEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -85,31 +80,16 @@
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.mxGuid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pGuid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1sqNum = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1ysNum = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.gcMx2 = new DevExpress.XtraGrid.GridControl();
- this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -121,12 +101,23 @@
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.mxGuid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pGuid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1sqNum = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1ysNum = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -152,10 +143,10 @@
((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkByName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.lastUpdateUser.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.lastUpdateTime.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateByName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
@@ -164,12 +155,12 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -191,9 +182,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -201,10 +193,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -213,8 +206,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -223,6 +217,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -235,17 +230,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.Size = new System.Drawing.Size(1408, 698);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1408, 635);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -255,25 +252,21 @@
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.ColumnPanelRowHeight = 61;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn1,
this.gv_status,
- this.gv_isFinish,
- this.gv_isOut,
this.gv_billNo,
this.gv_lastUpdateUser,
this.gv_lastUpdateTime,
this.gv_checkUser,
this.gv_checkDate,
this.gv_returnMethod,
- this.gv_returnType,
- this.gv_depotId,
- this.gv_suppId,
this.gv_remark,
this.gridColumn7});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 62;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -281,199 +274,146 @@
//
// gridColumn1
//
- this.gridColumn1.Caption = "閫�璐х粍缁�";
- this.gridColumn1.FieldName = "receivingOrg";
+ this.gridColumn1.Caption = "鐢宠缁勭粐";
+ this.gridColumn1.FieldName = "kcOrg";
+ this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "org.fnamber";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 250;
+ this.gridColumn1.VisibleIndex = 1;
+ this.gridColumn1.Width = 312;
//
// gv_status
//
this.gv_status.AppearanceCell.Options.UseFont = true;
this.gv_status.Caption = "瀹℃牳鐘舵��";
- this.gv_status.FieldName = "status";
- this.gv_status.MaxWidth = 50;
- this.gv_status.MinWidth = 50;
+ this.gv_status.FieldName = "checkStatus";
+ this.gv_status.MaxWidth = 62;
+ this.gv_status.MinWidth = 62;
this.gv_status.Name = "gv_status";
this.gv_status.OptionsColumn.AllowEdit = false;
this.gv_status.Tag = "query_a.STATUS";
this.gv_status.Visible = true;
- this.gv_status.VisibleIndex = 1;
- this.gv_status.Width = 50;
- //
- // gv_isFinish
- //
- this.gv_isFinish.AppearanceCell.Options.UseFont = true;
- this.gv_isFinish.Caption = "鏄惁瀹屾垚";
- this.gv_isFinish.FieldName = "isFinish";
- this.gv_isFinish.MaxWidth = 50;
- this.gv_isFinish.MinWidth = 50;
- this.gv_isFinish.Name = "gv_isFinish";
- this.gv_isFinish.OptionsColumn.AllowEdit = false;
- this.gv_isFinish.Tag = "query_a.IS_FINISH";
- this.gv_isFinish.Width = 50;
- //
- // gv_isOut
- //
- this.gv_isOut.AppearanceCell.Options.UseFont = true;
- this.gv_isOut.Caption = "濮斿鏍囪瘑";
- this.gv_isOut.FieldName = "isOut";
- this.gv_isOut.MaxWidth = 50;
- this.gv_isOut.MinWidth = 50;
- this.gv_isOut.Name = "gv_isOut";
- this.gv_isOut.OptionsColumn.AllowEdit = false;
- this.gv_isOut.Tag = "query_a.IS_OUT";
- this.gv_isOut.Visible = true;
- this.gv_isOut.VisibleIndex = 2;
- this.gv_isOut.Width = 50;
+ this.gv_status.VisibleIndex = 0;
+ this.gv_status.Width = 62;
//
// gv_billNo
//
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鍗曟嵁缂栫爜";
this.gv_billNo.FieldName = "billNo";
+ this.gv_billNo.MinWidth = 25;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 3;
- this.gv_billNo.Width = 120;
+ this.gv_billNo.VisibleIndex = 2;
+ this.gv_billNo.Width = 150;
//
// gv_lastUpdateUser
//
this.gv_lastUpdateUser.AppearanceCell.Options.UseFont = true;
- this.gv_lastUpdateUser.Caption = "鏈�鍚庤窡鏂颁汉 ";
- this.gv_lastUpdateUser.FieldName = "lastUpdateUser";
+ this.gv_lastUpdateUser.Caption = "鏈�鍚庢洿鏂颁汉 ";
+ this.gv_lastUpdateUser.FieldName = "lastUpdateByName";
+ this.gv_lastUpdateUser.MinWidth = 25;
this.gv_lastUpdateUser.Name = "gv_lastUpdateUser";
this.gv_lastUpdateUser.OptionsColumn.AllowEdit = false;
this.gv_lastUpdateUser.Tag = "query_a.LAST_UPDATE_USER";
this.gv_lastUpdateUser.Visible = true;
- this.gv_lastUpdateUser.VisibleIndex = 4;
- this.gv_lastUpdateUser.Width = 94;
+ this.gv_lastUpdateUser.VisibleIndex = 3;
+ this.gv_lastUpdateUser.Width = 117;
//
// gv_lastUpdateTime
//
this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true;
this.gv_lastUpdateTime.Caption = "鏈�鍚庝慨鏀规椂闂� ";
- this.gv_lastUpdateTime.FieldName = "lastUpdateTime";
+ this.gv_lastUpdateTime.FieldName = "lastUpdateDate";
+ this.gv_lastUpdateTime.MinWidth = 25;
this.gv_lastUpdateTime.Name = "gv_lastUpdateTime";
this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false;
this.gv_lastUpdateTime.Tag = "query_a.LAST_UPDATE_TIME";
this.gv_lastUpdateTime.Visible = true;
- this.gv_lastUpdateTime.VisibleIndex = 5;
- this.gv_lastUpdateTime.Width = 180;
+ this.gv_lastUpdateTime.VisibleIndex = 4;
+ this.gv_lastUpdateTime.Width = 225;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
- this.gv_checkUser.FieldName = "checkUser";
+ this.gv_checkUser.FieldName = "checkByName";
+ this.gv_checkUser.MinWidth = 25;
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 = 6;
- this.gv_checkUser.Width = 94;
+ this.gv_checkUser.VisibleIndex = 5;
+ this.gv_checkUser.Width = 117;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃堕棿 ";
this.gv_checkDate.FieldName = "checkDate";
+ this.gv_checkDate.MinWidth = 25;
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 = 7;
- this.gv_checkDate.Width = 94;
+ this.gv_checkDate.VisibleIndex = 6;
+ this.gv_checkDate.Width = 117;
//
// gv_returnMethod
//
this.gv_returnMethod.AppearanceCell.Options.UseFont = true;
- this.gv_returnMethod.Caption = "閫�鏂欐柟寮� ";
- this.gv_returnMethod.FieldName = "returnMethod";
+ this.gv_returnMethod.Caption = "鐢宠绫诲瀷";
+ this.gv_returnMethod.FieldName = "billType";
+ this.gv_returnMethod.MinWidth = 25;
this.gv_returnMethod.Name = "gv_returnMethod";
this.gv_returnMethod.OptionsColumn.AllowEdit = false;
this.gv_returnMethod.Tag = "query_a.RETURN_METHOD";
this.gv_returnMethod.Visible = true;
- this.gv_returnMethod.VisibleIndex = 8;
- this.gv_returnMethod.Width = 94;
- //
- // gv_returnType
- //
- this.gv_returnType.AppearanceCell.Options.UseFont = true;
- this.gv_returnType.Caption = "閫�鏂欑被鍨� ";
- this.gv_returnType.FieldName = "returnType";
- this.gv_returnType.Name = "gv_returnType";
- this.gv_returnType.OptionsColumn.AllowEdit = false;
- this.gv_returnType.Tag = "query_a.RETURN_TYPE";
- this.gv_returnType.Visible = true;
- this.gv_returnType.VisibleIndex = 9;
- this.gv_returnType.Width = 94;
- //
- // gv_depotId
- //
- this.gv_depotId.AppearanceCell.Options.UseFont = true;
- this.gv_depotId.Caption = "浠撳簱";
- this.gv_depotId.FieldName = "dptName";
- this.gv_depotId.Name = "gv_depotId";
- this.gv_depotId.OptionsColumn.AllowEdit = false;
- this.gv_depotId.Tag = "query_a.DEPOT_ID";
- this.gv_depotId.Visible = true;
- this.gv_depotId.VisibleIndex = 10;
- this.gv_depotId.Width = 94;
- //
- // gv_suppId
- //
- this.gv_suppId.AppearanceCell.Options.UseFont = true;
- this.gv_suppId.Caption = "渚涘簲鍟�";
- this.gv_suppId.FieldName = "supName";
- this.gv_suppId.Name = "gv_suppId";
- this.gv_suppId.OptionsColumn.AllowEdit = false;
- this.gv_suppId.Tag = "query_a.SUPP_ID";
- this.gv_suppId.Visible = true;
- this.gv_suppId.VisibleIndex = 11;
- this.gv_suppId.Width = 94;
+ this.gv_returnMethod.VisibleIndex = 7;
+ this.gv_returnMethod.Width = 117;
//
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "鐢宠澶囨敞";
this.gv_remark.FieldName = "remark";
+ this.gv_remark.MinWidth = 25;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.REMARK";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 12;
- this.gv_remark.Width = 94;
+ this.gv_remark.VisibleIndex = 8;
+ this.gv_remark.Width = 117;
//
// gridColumn7
//
this.gridColumn7.Caption = "涓婚敭GUID";
this.gridColumn7.FieldName = "guid";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 31;
this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 117;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1408, 48);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
this.xtraTabPage2.Text = "鏁版嵁璇︽儏";
//
// splitMx1
@@ -481,6 +421,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -493,8 +434,8 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 108;
+ this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+ this.splitMx1.SplitterPosition = 132;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -506,38 +447,41 @@
this.layoutMx1.Controls.Add(this.txt_billType);
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_remark);
- this.layoutMx1.Controls.Add(this.txt_checkUser);
+ this.layoutMx1.Controls.Add(this.txt_checkByName);
this.layoutMx1.Controls.Add(this.txt_status);
- this.layoutMx1.Controls.Add(this.lastUpdateUser);
- this.layoutMx1.Controls.Add(this.lastUpdateTime);
+ this.layoutMx1.Controls.Add(this.txt_lastUpdateByName);
+ this.layoutMx1.Controls.Add(this.txt_lastUpdateDate);
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem17,
this.layoutControlItem13});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(832, 224, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 108);
+ this.layoutMx1.Size = new System.Drawing.Size(1408, 132);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 69);
+ this.btnSelect.Location = new System.Drawing.Point(14, 90);
+ this.btnSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(116, 27);
+ this.btnSelect.Size = new System.Drawing.Size(146, 34);
this.btnSelect.StyleController = this.layoutMx1;
this.btnSelect.TabIndex = 525;
this.btnSelect.Text = "閫夋嫨瓒呮湡鏉$爜";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(840, 114);
+ this.lbGuid.Location = new System.Drawing.Point(1050, 139);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(274, 30);
+ this.lbGuid.Size = new System.Drawing.Size(342, 37);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
@@ -545,17 +489,19 @@
// txt_kcOrgId
//
this.txt_kcOrgId.IsReadly = false;
- this.txt_kcOrgId.Location = new System.Drawing.Point(114, 38);
+ this.txt_kcOrgId.Location = new System.Drawing.Point(137, 52);
+ this.txt_kcOrgId.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_kcOrgId.Name = "txt_kcOrgId";
- this.txt_kcOrgId.Size = new System.Drawing.Size(165, 24);
+ this.txt_kcOrgId.Size = new System.Drawing.Size(212, 28);
this.txt_kcOrgId.TabIndex = 526;
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(114, 7);
+ this.txt_billNo.Location = new System.Drawing.Point(137, 14);
+ this.txt_billNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(212, 28);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
@@ -563,7 +509,8 @@
// txt_billType
//
this.txt_billType.EditValue = "-璇烽�夋嫨-";
- this.txt_billType.Location = new System.Drawing.Point(385, 7);
+ this.txt_billType.Location = new System.Drawing.Point(476, 14);
+ this.txt_billType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_billType.Name = "txt_billType";
this.txt_billType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -576,72 +523,79 @@
"閿�鍞渶姹�",
"瀹為獙闇�姹�"});
this.txt_billType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_billType.Size = new System.Drawing.Size(165, 24);
+ this.txt_billType.Size = new System.Drawing.Size(212, 28);
this.txt_billType.StyleController = this.layoutMx1;
this.txt_billType.TabIndex = 520;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(927, 38);
+ this.txt_checkDate.Location = new System.Drawing.Point(1154, 52);
+ this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(166, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(214, 28);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 226;
this.txt_checkDate.Tag = "readonly";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(385, 69);
+ this.txt_remark.Location = new System.Drawing.Point(476, 52);
+ this.txt_remark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(436, 24);
+ this.txt_remark.Size = new System.Drawing.Size(212, 28);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 252;
//
- // txt_checkUser
+ // txt_checkByName
//
- this.txt_checkUser.Location = new System.Drawing.Point(927, 7);
- this.txt_checkUser.Name = "txt_checkUser";
- this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(166, 24);
- this.txt_checkUser.StyleController = this.layoutMx1;
- this.txt_checkUser.TabIndex = 222;
- this.txt_checkUser.Tag = "readonly";
+ this.txt_checkByName.Location = new System.Drawing.Point(1154, 14);
+ this.txt_checkByName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_checkByName.Name = "txt_checkByName";
+ this.txt_checkByName.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkByName.Size = new System.Drawing.Size(214, 28);
+ this.txt_checkByName.StyleController = this.layoutMx1;
+ this.txt_checkByName.TabIndex = 222;
+ this.txt_checkByName.Tag = "readonly";
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(825, 69);
+ this.txt_status.Location = new System.Drawing.Point(1031, 90);
+ this.txt_status.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_status.Size = new System.Drawing.Size(268, 24);
+ this.txt_status.Size = new System.Drawing.Size(337, 27);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 528;
this.txt_status.Tag = "readonly";
//
- // lastUpdateUser
+ // txt_lastUpdateByName
//
- this.lastUpdateUser.Location = new System.Drawing.Point(656, 7);
- this.lastUpdateUser.Name = "lastUpdateUser";
- this.lastUpdateUser.Size = new System.Drawing.Size(165, 24);
- this.lastUpdateUser.StyleController = this.layoutMx1;
- this.lastUpdateUser.TabIndex = 530;
- this.lastUpdateUser.Tag = "readonly";
+ this.txt_lastUpdateByName.Location = new System.Drawing.Point(815, 14);
+ this.txt_lastUpdateByName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_lastUpdateByName.Name = "txt_lastUpdateByName";
+ this.txt_lastUpdateByName.Size = new System.Drawing.Size(212, 28);
+ this.txt_lastUpdateByName.StyleController = this.layoutMx1;
+ this.txt_lastUpdateByName.TabIndex = 530;
+ this.txt_lastUpdateByName.Tag = "readonly";
//
- // lastUpdateTime
+ // txt_lastUpdateDate
//
- this.lastUpdateTime.Location = new System.Drawing.Point(656, 38);
- this.lastUpdateTime.Name = "lastUpdateTime";
- this.lastUpdateTime.Size = new System.Drawing.Size(165, 24);
- this.lastUpdateTime.StyleController = this.layoutMx1;
- this.lastUpdateTime.TabIndex = 531;
- this.lastUpdateTime.Tag = "readonly";
+ this.txt_lastUpdateDate.Location = new System.Drawing.Point(815, 52);
+ this.txt_lastUpdateDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_lastUpdateDate.Name = "txt_lastUpdateDate";
+ this.txt_lastUpdateDate.Size = new System.Drawing.Size(212, 28);
+ this.txt_lastUpdateDate.StyleController = this.layoutMx1;
+ this.txt_lastUpdateDate.TabIndex = 531;
+ this.txt_lastUpdateDate.Tag = "readonly";
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(942, 148);
+ this.txt_guid.Location = new System.Drawing.Point(1178, 181);
+ this.txt_guid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(172, 24);
+ this.txt_guid.Size = new System.Drawing.Size(215, 28);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 532;
//
@@ -654,7 +608,7 @@
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem17.Size = new System.Drawing.Size(278, 35);
this.layoutControlItem17.Text = "涓婚敭Guid";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(50, 20);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(62, 24);
//
// layoutControlItem13
//
@@ -677,38 +631,38 @@
this.layoutControlItem2,
this.layoutControlItem9,
this.layoutControlItem10,
- this.layoutControlItem14,
- this.layoutControlItem15,
+ this.layoutControlItem16,
this.layoutControlItem11,
+ this.layoutControlItem15,
+ this.layoutControlItem14,
this.layoutControlItem5,
- this.layoutControlItem7,
- this.layoutControlItem16});
+ this.layoutControlItem7});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ 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[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ 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[] {
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1105, 113);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3});
+ this.Root.Size = new System.Drawing.Size(1382, 138);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -716,118 +670,118 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_kcOrgId;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 38);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem2.Text = "閫夋嫨缁勭粐";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem9
//
- this.layoutControlItem9.Control = this.txt_checkUser;
+ this.layoutControlItem9.Control = this.txt_checkByName;
this.layoutControlItem9.CustomizationFormText = "瀹℃牳浜哄憳";
- this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(1017, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(341, 38);
this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_checkDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(813, 31);
+ this.layoutControlItem10.Location = new System.Drawing.Point(1017, 38);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(341, 38);
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.lastUpdateUser;
- this.layoutControlItem14.Location = new System.Drawing.Point(542, 0);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem14.Text = "鏈�鍚庢洿鏂颁汉";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.lastUpdateTime;
- this.layoutControlItem15.Location = new System.Drawing.Point(542, 31);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem15.Text = "鏈�鍚庢洿鏂版椂闂�";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_status;
- this.layoutControlItem11.Location = new System.Drawing.Point(813, 62);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(272, 31);
- this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem11.TextVisible = false;
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_billType;
- this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem5.Text = "鐢宠绫诲瀷";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_remark;
- this.layoutControlItem7.Location = new System.Drawing.Point(271, 62);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
- this.layoutControlItem7.Text = "鐢宠澶囨敞";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.btnSelect;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 62);
- this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
- this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 76);
+ this.layoutControlItem16.MaxSize = new System.Drawing.Size(150, 38);
+ this.layoutControlItem16.MinSize = new System.Drawing.Size(25, 38);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem16.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "閫�璐ф槑缁�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
//
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_status;
+ this.layoutControlItem11.Location = new System.Drawing.Point(1017, 76);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(341, 38);
+ this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem11.TextVisible = false;
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_lastUpdateDate;
+ this.layoutControlItem15.Location = new System.Drawing.Point(678, 38);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem15.Size = new System.Drawing.Size(339, 38);
+ this.layoutControlItem15.Text = "鏈�鍚庢洿鏂版椂闂�";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_lastUpdateByName;
+ this.layoutControlItem14.Location = new System.Drawing.Point(678, 0);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(339, 38);
+ this.layoutControlItem14.Text = "鏈�鍚庢洿鏂颁汉";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_billType;
+ this.layoutControlItem5.Location = new System.Drawing.Point(339, 0);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem5.Size = new System.Drawing.Size(339, 38);
+ this.layoutControlItem5.Text = "鐢宠绫诲瀷";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_remark;
+ this.layoutControlItem7.Location = new System.Drawing.Point(339, 38);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem7.Size = new System.Drawing.Size(339, 38);
+ this.layoutControlItem7.Text = "鐢宠澶囨敞";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(108, 22);
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 450);
+ this.tabMx.Size = new System.Drawing.Size(1408, 551);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -836,197 +790,29 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 418);
- this.tabMxPage1.Text = "鐢宠鏄庣粏";
+ this.tabMxPage1.Size = new System.Drawing.Size(1406, 513);
+ this.tabMxPage1.Text = "鏉$爜鏄庣粏";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 418);
- this.gcMx1.TabIndex = 0;
+ this.gcMx1.Size = new System.Drawing.Size(1406, 513);
+ this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
//
// gvMx1
//
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.mxGuid,
- this.pGuid,
- this.gvMx1itemId,
- this.gridColumn2,
- this.gridColumn5,
- this.gridColumn3,
- this.gvMx1sqNum,
- this.gvMx1ysNum,
- this.gridColumn4,
- this.gvMx1remark,
- this.gvMxDel});
- this.gvMx1.GridControl = this.gcMx1;
- this.gvMx1.Name = "gvMx1";
- this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
- this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.ShowGroupPanel = false;
- //
- // mxGuid
- //
- this.mxGuid.Caption = "鏄庣粏GUID";
- this.mxGuid.FieldName = "guid";
- this.mxGuid.MinWidth = 25;
- this.mxGuid.Name = "mxGuid";
- this.mxGuid.Width = 94;
- //
- // pGuid
- //
- this.pGuid.AppearanceCell.Options.UseFont = true;
- this.pGuid.Caption = "涓昏〃GUID";
- this.pGuid.FieldName = "pGuid";
- this.pGuid.MinWidth = 50;
- this.pGuid.Name = "pGuid";
- this.pGuid.Tag = "query_a.MID";
- this.pGuid.Width = 94;
- //
- // gvMx1itemId
- //
- this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
- this.gvMx1itemId.Caption = "鐗╂枡ID";
- this.gvMx1itemId.FieldName = "itemId";
- this.gvMx1itemId.MinWidth = 50;
- this.gvMx1itemId.Name = "gvMx1itemId";
- this.gvMx1itemId.Tag = "query_a.ITEM_ID";
- this.gvMx1itemId.Width = 94;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "鐗╂枡缂栫爜";
- this.gridColumn2.FieldName = "itemNo";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 0;
- this.gridColumn2.Width = 94;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
- this.gridColumn5.FieldName = "itemName";
- this.gridColumn5.MinWidth = 25;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 1;
- this.gridColumn5.Width = 94;
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "鐗╂枡瑙勬牸";
- this.gridColumn3.FieldName = "itemModel";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 2;
- this.gridColumn3.Width = 94;
- //
- // gvMx1sqNum
- //
- this.gvMx1sqNum.AppearanceCell.Options.UseFont = true;
- this.gvMx1sqNum.Caption = "褰撴椂杩囨湡鏁伴噺";
- this.gvMx1sqNum.FieldName = "gqsl";
- this.gvMx1sqNum.MinWidth = 50;
- this.gvMx1sqNum.Name = "gvMx1sqNum";
- this.gvMx1sqNum.Tag = "yz_quantity_0_edit";
- this.gvMx1sqNum.Visible = true;
- this.gvMx1sqNum.VisibleIndex = 3;
- this.gvMx1sqNum.Width = 94;
- //
- // gvMx1ysNum
- //
- this.gvMx1ysNum.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1ysNum.AppearanceCell.Options.UseFont = true;
- this.gvMx1ysNum.AppearanceCell.Options.UseForeColor = true;
- this.gvMx1ysNum.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1ysNum.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1ysNum.Caption = "鐢宠鏁伴噺";
- this.gvMx1ysNum.FieldName = "sqsl";
- this.gvMx1ysNum.MinWidth = 50;
- this.gvMx1ysNum.Name = "gvMx1ysNum";
- this.gvMx1ysNum.Tag = "yz_quantity_0_edit";
- this.gvMx1ysNum.Visible = true;
- this.gvMx1ysNum.VisibleIndex = 4;
- this.gvMx1ysNum.Width = 94;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "瀹屾垚鏁伴噺";
- this.gridColumn4.FieldName = "wcsl";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 6;
- this.gridColumn4.Width = 94;
- //
- // gvMx1remark
- //
- this.gvMx1remark.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1remark.AppearanceCell.Options.UseFont = true;
- this.gvMx1remark.AppearanceCell.Options.UseForeColor = true;
- this.gvMx1remark.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1remark.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1remark.Caption = "澶囨敞";
- this.gvMx1remark.FieldName = "remark";
- this.gvMx1remark.MinWidth = 50;
- this.gvMx1remark.Name = "gvMx1remark";
- this.gvMx1remark.Tag = "edit";
- this.gvMx1remark.Visible = true;
- this.gvMx1remark.VisibleIndex = 5;
- this.gvMx1remark.Width = 94;
- //
- // gvMxDel
- //
- this.gvMxDel.Caption = "绉诲嚭";
- this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 25;
- this.gvMxDel.Name = "gvMxDel";
- this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 7;
- this.gvMxDel.Width = 94;
- //
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
- this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
- //
- // tabMxPage2
- //
- this.tabMxPage2.Controls.Add(this.gcMx2);
- this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1124, 418);
- this.tabMxPage2.Text = "鏉$爜鏄庣粏";
- //
- // gcMx2
- //
- this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- 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(1124, 418);
- this.gcMx2.TabIndex = 1;
- this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx2});
- //
- // gvMx2
- //
- this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn6,
this.gridColumn8,
this.gridColumn9,
@@ -1038,191 +824,333 @@
this.gridColumn15,
this.gridColumn16,
this.gridColumn17,
- this.gridColumn18,
- this.gridColumn19,
this.gridColumn20,
this.gridColumn21,
- this.gridColumn22,
- this.gridColumn23});
- this.gvMx2.GridControl = this.gcMx2;
- this.gvMx2.Name = "gvMx2";
- this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
- this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx2.OptionsView.ShowGroupPanel = false;
+ this.gvMxDel});
+ this.gvMx1.DetailHeight = 428;
+ this.gvMx1.GridControl = this.gcMx1;
+ this.gvMx1.Name = "gvMx1";
+ this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx1.OptionsView.ShowGroupPanel = false;
//
// gridColumn6
//
this.gridColumn6.Caption = "鏄庣粏GUID";
this.gridColumn6.FieldName = "guid";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
//
// gridColumn8
//
this.gridColumn8.AppearanceCell.Options.UseFont = true;
this.gridColumn8.Caption = "涓昏〃GUID";
this.gridColumn8.FieldName = "pGuid";
- this.gridColumn8.MinWidth = 50;
+ this.gridColumn8.MinWidth = 62;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Tag = "query_a.MID";
- this.gridColumn8.Width = 94;
+ this.gridColumn8.Width = 117;
//
// gridColumn9
//
this.gridColumn9.AppearanceCell.Options.UseFont = true;
this.gridColumn9.Caption = "鐗╂枡ID";
this.gridColumn9.FieldName = "itemId";
- this.gridColumn9.MinWidth = 50;
+ this.gridColumn9.MinWidth = 62;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Tag = "query_a.ITEM_ID";
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 0;
+ this.gridColumn9.Width = 117;
//
// gridColumn10
//
this.gridColumn10.Caption = "鐗╂枡缂栫爜";
this.gridColumn10.FieldName = "itemNo";
- this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.MinWidth = 31;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 1;
- this.gridColumn10.Width = 94;
+ this.gridColumn10.VisibleIndex = 2;
+ this.gridColumn10.Width = 117;
//
// gridColumn11
//
this.gridColumn11.Caption = "鐗╂枡鍚嶇О";
this.gridColumn11.FieldName = "itemName";
- this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.MinWidth = 31;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 2;
- this.gridColumn11.Width = 94;
+ this.gridColumn11.VisibleIndex = 3;
+ this.gridColumn11.Width = 117;
//
// gridColumn12
//
this.gridColumn12.Caption = "鐗╂枡瑙勬牸";
this.gridColumn12.FieldName = "itemModel";
- this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.MinWidth = 31;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 3;
- this.gridColumn12.Width = 94;
+ this.gridColumn12.VisibleIndex = 4;
+ this.gridColumn12.Width = 117;
//
// gridColumn13
//
this.gridColumn13.AppearanceCell.Options.UseFont = true;
this.gridColumn13.Caption = "鏁伴噺";
- this.gridColumn13.FieldName = "gqsl";
- this.gridColumn13.MinWidth = 50;
+ this.gridColumn13.FieldName = "itemBarCodeSl";
+ this.gridColumn13.MinWidth = 62;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Tag = "yz_quantity_0_edit";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 4;
- this.gridColumn13.Width = 94;
+ this.gridColumn13.VisibleIndex = 5;
+ this.gridColumn13.Width = 117;
//
// gridColumn14
//
this.gridColumn14.AppearanceCell.Options.UseFont = true;
- this.gridColumn14.Caption = "鏈夋晥鏈熻嚦(澶嶆鍓�)";
- this.gridColumn14.FieldName = "sqsl";
- this.gridColumn14.MinWidth = 50;
+ this.gridColumn14.Caption = "鏈夋晥鏈熻嚦";
+ this.gridColumn14.FieldName = "yxqDate";
+ this.gridColumn14.MinWidth = 62;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Tag = "yz_quantity_0_edit";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 5;
- this.gridColumn14.Width = 94;
+ this.gridColumn14.VisibleIndex = 6;
+ this.gridColumn14.Width = 117;
//
// gridColumn15
//
this.gridColumn15.Caption = "閲嶆娆℃暟";
- this.gridColumn15.FieldName = "wcsl";
- this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.FieldName = "cjcs";
+ this.gridColumn15.MinWidth = 31;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 7;
- this.gridColumn15.Width = 94;
+ this.gridColumn15.VisibleIndex = 8;
+ this.gridColumn15.Width = 117;
//
// gridColumn16
//
this.gridColumn16.AppearanceCell.Options.UseFont = true;
- this.gridColumn16.Caption = "鍓╀綑瓒呮湡澶╂暟";
- this.gridColumn16.FieldName = "remark";
- this.gridColumn16.MinWidth = 50;
+ this.gridColumn16.Caption = "鍓╀綑澶╂暟";
+ this.gridColumn16.FieldName = "syts";
+ this.gridColumn16.MinWidth = 62;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Tag = "edit";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 6;
- this.gridColumn16.Width = 94;
+ this.gridColumn16.VisibleIndex = 7;
+ this.gridColumn16.Width = 117;
//
// gridColumn17
//
this.gridColumn17.Caption = "鐗╂枡鏉$爜";
- this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.FieldName = "itemBarCode";
+ this.gridColumn17.MinWidth = 31;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 0;
- this.gridColumn17.Width = 94;
- //
- // gridColumn18
- //
- this.gridColumn18.Caption = "閫佹浜�";
- this.gridColumn18.MinWidth = 25;
- this.gridColumn18.Name = "gridColumn18";
- this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 8;
- this.gridColumn18.Width = 94;
- //
- // gridColumn19
- //
- this.gridColumn19.Caption = "閫佹鏃堕棿";
- this.gridColumn19.MinWidth = 25;
- this.gridColumn19.Name = "gridColumn19";
- this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 9;
- this.gridColumn19.Width = 94;
+ this.gridColumn17.VisibleIndex = 1;
+ this.gridColumn17.Width = 117;
//
// gridColumn20
//
- this.gridColumn20.Caption = "鍙栧嚭搴撲綅";
- this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.Caption = "褰撳墠搴撲綅";
+ this.gridColumn20.FieldName = "qckw";
+ this.gridColumn20.MinWidth = 31;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 10;
- this.gridColumn20.Width = 94;
+ this.gridColumn20.VisibleIndex = 9;
+ this.gridColumn20.Width = 117;
//
// gridColumn21
//
this.gridColumn21.Caption = "澶嶆缁撴灉";
- this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.FieldNameSortGroup = "fjjg";
+ this.gridColumn21.MinWidth = 31;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 11;
- this.gridColumn21.Width = 94;
+ this.gridColumn21.VisibleIndex = 10;
+ this.gridColumn21.Width = 117;
//
- // gridColumn22
+ // gvMxDel
//
- this.gridColumn22.Caption = "鏈夋晥鏈熻嚦(澶嶆鍚�)";
- this.gridColumn22.MinWidth = 25;
- this.gridColumn22.Name = "gridColumn22";
- this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 12;
- this.gridColumn22.Width = 94;
+ this.gvMxDel.Caption = "绉诲嚭";
+ this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gvMxDel.MinWidth = 31;
+ this.gvMxDel.Name = "gvMxDel";
+ this.gvMxDel.Visible = true;
+ this.gvMxDel.VisibleIndex = 11;
+ this.gvMxDel.Width = 117;
//
- // gridColumn23
+ // repositoryItemButtonEdit1
//
- this.gridColumn23.Caption = "gridColumn23";
- this.gridColumn23.MinWidth = 25;
- this.gridColumn23.Name = "gridColumn23";
- this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 13;
- this.gridColumn23.Width = 94;
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
+ // tabMxPage2
+ //
+ this.tabMxPage2.Controls.Add(this.gcMx2);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabMxPage2.Name = "tabMxPage2";
+ this.tabMxPage2.Size = new System.Drawing.Size(1406, 508);
+ this.tabMxPage2.Text = "鐗╂枡鏄庣粏";
+ //
+ // gcMx2
+ //
+ this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMx2.Location = new System.Drawing.Point(0, 0);
+ this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMx2.Name = "gcMx2";
+ this.gcMx2.Size = new System.Drawing.Size(1406, 508);
+ this.gcMx2.TabIndex = 1;
+ this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx2});
+ //
+ // gvMx2
+ //
+ this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.mxGuid,
+ this.pGuid,
+ this.gvMx1itemId,
+ this.gridColumn2,
+ this.gridColumn5,
+ this.gridColumn3,
+ this.gvMx1sqNum,
+ this.gvMx1ysNum,
+ this.gridColumn4,
+ this.gvMx1remark});
+ this.gvMx2.DetailHeight = 428;
+ this.gvMx2.GridControl = this.gcMx2;
+ this.gvMx2.Name = "gvMx2";
+ this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx2.OptionsView.ShowGroupPanel = false;
+ //
+ // mxGuid
+ //
+ this.mxGuid.Caption = "鏄庣粏GUID";
+ this.mxGuid.FieldName = "guid";
+ this.mxGuid.MinWidth = 31;
+ this.mxGuid.Name = "mxGuid";
+ this.mxGuid.Width = 117;
+ //
+ // pGuid
+ //
+ this.pGuid.AppearanceCell.Options.UseFont = true;
+ this.pGuid.Caption = "涓昏〃GUID";
+ this.pGuid.FieldName = "pGuid";
+ this.pGuid.MinWidth = 62;
+ this.pGuid.Name = "pGuid";
+ this.pGuid.Tag = "query_a.MID";
+ this.pGuid.Width = 117;
+ //
+ // gvMx1itemId
+ //
+ this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
+ this.gvMx1itemId.Caption = "鐗╂枡ID";
+ this.gvMx1itemId.FieldName = "itemId";
+ this.gvMx1itemId.MinWidth = 62;
+ this.gvMx1itemId.Name = "gvMx1itemId";
+ this.gvMx1itemId.Tag = "query_a.ITEM_ID";
+ this.gvMx1itemId.Width = 117;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn2.FieldName = "itemNo";
+ this.gridColumn2.MinWidth = 31;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 0;
+ this.gridColumn2.Width = 117;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn5.FieldName = "itemName";
+ this.gridColumn5.MinWidth = 31;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 1;
+ this.gridColumn5.Width = 117;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn3.FieldName = "itemModel";
+ this.gridColumn3.MinWidth = 31;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.Width = 117;
+ //
+ // gvMx1sqNum
+ //
+ this.gvMx1sqNum.AppearanceCell.Options.UseFont = true;
+ this.gvMx1sqNum.Caption = "褰撴椂杩囨湡鏁伴噺";
+ this.gvMx1sqNum.FieldName = "gqsl";
+ this.gvMx1sqNum.MinWidth = 62;
+ this.gvMx1sqNum.Name = "gvMx1sqNum";
+ this.gvMx1sqNum.Tag = "yz_quantity_0_edit";
+ this.gvMx1sqNum.Visible = true;
+ this.gvMx1sqNum.VisibleIndex = 3;
+ this.gvMx1sqNum.Width = 117;
+ //
+ // gvMx1ysNum
+ //
+ this.gvMx1ysNum.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1ysNum.AppearanceCell.Options.UseFont = true;
+ this.gvMx1ysNum.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1ysNum.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1ysNum.AppearanceHeader.Options.UseForeColor = true;
+ this.gvMx1ysNum.Caption = "鐢宠鏁伴噺";
+ this.gvMx1ysNum.FieldName = "sqsl";
+ this.gvMx1ysNum.MinWidth = 62;
+ this.gvMx1ysNum.Name = "gvMx1ysNum";
+ this.gvMx1ysNum.Tag = "yz_quantity_0_edit";
+ this.gvMx1ysNum.Visible = true;
+ this.gvMx1ysNum.VisibleIndex = 4;
+ this.gvMx1ysNum.Width = 117;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "瀹屾垚鏁伴噺";
+ this.gridColumn4.FieldName = "wcsl";
+ this.gridColumn4.MinWidth = 31;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 6;
+ this.gridColumn4.Width = 117;
+ //
+ // gvMx1remark
+ //
+ this.gvMx1remark.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1remark.AppearanceCell.Options.UseFont = true;
+ this.gvMx1remark.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1remark.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1remark.AppearanceHeader.Options.UseForeColor = true;
+ this.gvMx1remark.Caption = "澶囨敞";
+ this.gvMx1remark.FieldName = "remark";
+ this.gvMx1remark.MinWidth = 62;
+ this.gvMx1remark.Name = "gvMx1remark";
+ this.gvMx1remark.Tag = "edit";
+ this.gvMx1remark.Visible = true;
+ this.gvMx1remark.VisibleIndex = 5;
+ this.gvMx1remark.Width = 117;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(965, 64);
+ this.picCheckBox.Location = new System.Drawing.Point(1206, 78);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.Size = new System.Drawing.Size(125, 61);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 8;
this.picCheckBox.TabStop = false;
@@ -1230,12 +1158,13 @@
//
// Frm_Cqsq
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.ClientSize = new System.Drawing.Size(1410, 834);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_Cqsq";
this.Text = "瓒呮湡妫�楠岀敵璇�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1261,10 +1190,10 @@
((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkByName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.lastUpdateUser.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.lastUpdateTime.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateByName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
@@ -1273,12 +1202,12 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1302,17 +1231,12 @@
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gv_status;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isFinish;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isOut;
private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateUser;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateTime;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_returnMethod;
- private DevExpress.XtraGrid.Columns.GridColumn gv_returnType;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
- private DevExpress.XtraGrid.Columns.GridColumn gv_suppId;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
@@ -1325,7 +1249,7 @@
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_remark;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
- private DevExpress.XtraEditors.TextEdit txt_checkUser;
+ private DevExpress.XtraEditors.TextEdit txt_checkByName;
private DevExpress.XtraEditors.TextEdit txt_billNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
@@ -1333,37 +1257,17 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraEditors.TextEdit lastUpdateUser;
- private DevExpress.XtraEditors.TextEdit lastUpdateTime;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraEditors.TextEdit txt_lastUpdateByName;
+ private DevExpress.XtraEditors.TextEdit txt_lastUpdateDate;
private DevExpress.XtraTab.XtraTabControl tabMx;
- private DevExpress.XtraTab.XtraTabPage tabMxPage1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraGrid.Columns.GridColumn mxGuid;
- private DevExpress.XtraGrid.Columns.GridColumn pGuid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1sqNum;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ysNum;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark;
- private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraEditors.TextEdit txt_guid;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraTab.XtraTabPage tabMxPage2;
- private DevExpress.XtraGrid.GridControl gcMx2;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+ private DevExpress.XtraGrid.GridControl gcMx1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
@@ -1375,11 +1279,27 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage2;
+ private DevExpress.XtraGrid.GridControl gcMx2;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
+ private DevExpress.XtraGrid.Columns.GridColumn mxGuid;
+ private DevExpress.XtraGrid.Columns.GridColumn pGuid;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1sqNum;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1ysNum;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
}
}
\ No newline at end of file
--
Gitblit v1.9.3