From d37df25d14c9bf8ddaa4a0578dd8a84e2ffc7900 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 11 三月 2025 08:17:03 +0800
Subject: [PATCH] 采购到货
---
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs | 6
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 49
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs | 210 +++--
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 988 ++++++++++++++--------------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 6
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs | 341 +++++----
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs | 425 ++++++-----
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 7
10 files changed, 1,070 insertions(+), 965 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
index aa94a90..2bfdf10 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
@@ -37,6 +37,7 @@
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.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();
@@ -91,12 +92,9 @@
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -122,8 +120,13 @@
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_guid = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -163,12 +166,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -176,8 +176,13 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -496,7 +501,7 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 142;
+ this.splitMx1.SplitterPosition = 177;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -517,19 +522,23 @@
this.layoutMx1.Controls.Add(this.txt_isFinish);
this.layoutMx1.Controls.Add(this.lastUpdateUser);
this.layoutMx1.Controls.Add(this.lastUpdateTime);
+ 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.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, 142);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 177);
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, 108);
+ this.btnSelect.Location = new System.Drawing.Point(12, 140);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(116, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -538,9 +547,9 @@
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(825, 108);
+ this.lbGuid.Location = new System.Drawing.Point(840, 114);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(268, 28);
+ this.lbGuid.Size = new System.Drawing.Size(274, 30);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
@@ -621,11 +630,11 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(656, 108);
+ this.txt_remark.Location = new System.Drawing.Point(385, 108);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(165, 28);
+ this.txt_remark.Size = new System.Drawing.Size(436, 28);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 252;
//
@@ -643,7 +652,7 @@
// txt_suppId
//
this.txt_suppId.IsReadly = false;
- this.txt_suppId.Location = new System.Drawing.Point(385, 108);
+ this.txt_suppId.Location = new System.Drawing.Point(114, 108);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
this.txt_suppId.Size = new System.Drawing.Size(165, 28);
@@ -660,20 +669,20 @@
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(554, 76);
+ this.txt_status.Location = new System.Drawing.Point(825, 76);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_status.Size = new System.Drawing.Size(267, 24);
+ this.txt_status.Size = new System.Drawing.Size(268, 24);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 528;
this.txt_status.Tag = "readonly";
//
// txt_isFinish
//
- this.txt_isFinish.Location = new System.Drawing.Point(825, 76);
+ this.txt_isFinish.Location = new System.Drawing.Point(554, 76);
this.txt_isFinish.Name = "txt_isFinish";
this.txt_isFinish.Properties.Caption = "瀹岀粨鏍囪瘑";
- this.txt_isFinish.Size = new System.Drawing.Size(268, 24);
+ this.txt_isFinish.Size = new System.Drawing.Size(267, 24);
this.txt_isFinish.StyleController = this.layoutMx1;
this.txt_isFinish.TabIndex = 529;
this.txt_isFinish.Tag = "readonly";
@@ -709,14 +718,13 @@
this.layoutControlItem8,
this.layoutControlItem9,
this.layoutControlItem10,
- this.layoutControlItem11,
- this.layoutControlItem12,
- this.layoutControlItem13,
this.layoutControlItem14,
this.layoutControlItem15,
- this.layoutControlItem7,
+ this.layoutControlItem16,
this.layoutControlItem4,
- this.layoutControlItem16});
+ this.layoutControlItem7,
+ this.layoutControlItem11,
+ this.layoutControlItem12});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -740,12 +748,15 @@
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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
rowDefinition3,
- rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1105, 148);
+ rowDefinition4,
+ rowDefinition5});
+ this.Root.Size = new System.Drawing.Size(1105, 180);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -831,38 +842,14 @@
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_status;
- this.layoutControlItem11.Location = new System.Drawing.Point(542, 64);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem11.TextVisible = false;
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_isFinish;
- this.layoutControlItem12.Location = new System.Drawing.Point(813, 64);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem12.TextVisible = false;
- //
// layoutControlItem13
//
this.layoutControlItem13.Control = this.lbGuid;
- this.layoutControlItem13.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem13.Location = new System.Drawing.Point(828, 102);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem13.Size = new System.Drawing.Size(278, 34);
this.layoutControlItem13.Text = "lbGuid";
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem13.TextVisible = false;
@@ -888,24 +875,13 @@
this.layoutControlItem15.Text = "鏈�鍚庢洿鏂版椂闂�";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_remark;
- this.layoutControlItem7.Location = new System.Drawing.Point(542, 96);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem7.Text = "閫�璐у娉�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
- //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 416);
+ this.tabMx.Size = new System.Drawing.Size(1126, 381);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -914,7 +890,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 384);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 349);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// gcMx1
@@ -925,7 +901,7 @@
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 384);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 349);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1201,30 +1177,84 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_suppId;
- this.layoutControlItem4.Location = new System.Drawing.Point(271, 96);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem4.Text = "閫変緵搴斿晢";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
- //
// layoutControlItem16
//
this.layoutControlItem16.Control = this.btnSelect;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 128);
this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "閫�璐ф槑缁�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_suppId;
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem4.Text = "閫変緵搴斿晢";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_remark;
+ this.layoutControlItem7.Location = new System.Drawing.Point(271, 96);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem7.Size = new System.Drawing.Size(542, 32);
+ this.layoutControlItem7.Text = "閫�璐у娉�";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_status;
+ this.layoutControlItem11.Location = new System.Drawing.Point(813, 64);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem11.TextVisible = false;
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_isFinish;
+ this.layoutControlItem12.Location = new System.Drawing.Point(542, 64);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem12.TextVisible = false;
+ //
+ // txt_guid
+ //
+ this.txt_guid.Location = new System.Drawing.Point(942, 148);
+ this.txt_guid.Name = "txt_guid";
+ this.txt_guid.Size = new System.Drawing.Size(172, 24);
+ this.txt_guid.StyleController = this.layoutMx1;
+ this.txt_guid.TabIndex = 532;
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_guid;
+ this.layoutControlItem17.Location = new System.Drawing.Point(828, 136);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
+ 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);
//
// Frm_MesCgthSq
//
@@ -1275,12 +1305,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1288,8 +1315,13 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
this.ResumeLayout(false);
}
@@ -1342,14 +1374,11 @@
private DevExpress.XtraEditors.CheckEdit txt_isFinish;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
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.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
@@ -1374,7 +1403,12 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1invWorkLine;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraEditors.TextEdit txt_guid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs
index 7cbf7cb..69801e6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs
@@ -39,7 +39,6 @@
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
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();
@@ -62,31 +61,32 @@
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.lbGuid = new System.Windows.Forms.Label();
this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
- this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
- this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
- this.txt_reason = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_remark = new DevExpress.XtraEditors.TextEdit();
+ this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_reason = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
- this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_remark = new DevExpress.XtraEditors.TextEdit();
+ this.txt_status = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_status = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.lbGuid = new System.Windows.Forms.Label();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.lb_guid = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -120,9 +120,10 @@
this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.layoutControlItem4 = 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();
@@ -138,31 +139,32 @@
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
this.splitMx1.Panel2.SuspendLayout();
this.splitMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lb_guid)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage2.SuspendLayout();
@@ -171,6 +173,8 @@
this.xtraTabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -200,17 +204,6 @@
this.xtraTabPage1,
this.xtraTabPage2});
//
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(968, 55);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 11;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
- //
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
@@ -225,13 +218,13 @@
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
//
- // split1.split1_Panel1
+ // split1.Panel1
//
this.split1.Panel1.Controls.Add(this.gcMain1);
this.split1.Panel1.Controls.Add(this.pageBar1);
this.split1.Panel1.Text = "Panel1";
//
- // split1.split1_Panel2
+ // split1.Panel2
//
this.split1.Panel2.Text = "Panel2";
this.split1.Size = new System.Drawing.Size(1126, 570);
@@ -486,18 +479,52 @@
this.splitMx1.Location = new System.Drawing.Point(0, 0);
this.splitMx1.Name = "splitMx1";
//
- // splitMx1.splitMx1_Panel1
+ // splitMx1.Panel1
//
this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
this.splitMx1.Panel1.Text = "Panel1";
//
- // splitMx1.splitMx1_Panel2
+ // splitMx1.Panel2
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
this.splitMx1.SplitterPosition = 137;
this.splitMx1.TabIndex = 0;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_suppName);
+ this.layoutMx1.Controls.Add(this.txt_checkUser);
+ this.layoutMx1.Controls.Add(this.txt_checkDate);
+ this.layoutMx1.Controls.Add(this.txt_depotName);
+ this.layoutMx1.Controls.Add(this.txt_reason);
+ this.layoutMx1.Controls.Add(this.txt_fmrmode);
+ this.layoutMx1.Controls.Add(this.txt_itemOutNo);
+ this.layoutMx1.Controls.Add(this.txt_fType);
+ this.layoutMx1.Controls.Add(this.txt_remark);
+ this.layoutMx1.Controls.Add(this.txt_status);
+ this.layoutMx1.Controls.Add(this.txt_guid);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.lb_guid,
+ this.layoutControlItem12});
+ this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(792, 394, 812, 500);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 137);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "layoutControl1";
+ //
+ // lbGuid
+ //
+ this.lbGuid.Location = new System.Drawing.Point(825, 108);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(268, 28);
+ this.lbGuid.TabIndex = 527;
+ this.lbGuid.Text = "lbGuid";
//
// txt_suppName
//
@@ -508,45 +535,6 @@
this.txt_suppName.Size = new System.Drawing.Size(195, 28);
this.txt_suppName.StyleController = this.layoutMx1;
this.txt_suppName.TabIndex = 524;
- //
- // txt_depotName
- //
- this.txt_depotName.Location = new System.Drawing.Point(84, 44);
- this.txt_depotName.Name = "txt_depotName";
- this.txt_depotName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_depotName.Properties.Appearance.Options.UseFont = true;
- this.txt_depotName.Size = new System.Drawing.Size(195, 28);
- this.txt_depotName.StyleController = this.layoutMx1;
- this.txt_depotName.TabIndex = 523;
- //
- // txt_fmrmode
- //
- this.txt_fmrmode.Location = new System.Drawing.Point(355, 44);
- this.txt_fmrmode.Name = "txt_fmrmode";
- this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_fmrmode.Properties.Items.AddRange(new object[] {
- "閫�鏂欒ˉ鏂�",
- "閫�鏂欏苟鎵ｆ"});
- this.txt_fmrmode.Size = new System.Drawing.Size(195, 24);
- this.txt_fmrmode.StyleController = this.layoutMx1;
- this.txt_fmrmode.TabIndex = 519;
- //
- // txt_reason
- //
- this.txt_reason.Location = new System.Drawing.Point(355, 76);
- this.txt_reason.Name = "txt_reason";
- this.txt_reason.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_reason.Properties.Items.AddRange(new object[] {
- "鏉ユ枡涓嶈壇",
- "渚涘簲鍟嗗閫�",
- "浣滀笟涓嶈壇",
- "渚涘簲鍟嗙墿鍝佸彿閿欒",
- "閲囪喘鏂欏彿鍙樻洿"});
- this.txt_reason.Size = new System.Drawing.Size(195, 24);
- this.txt_reason.StyleController = this.layoutMx1;
- this.txt_reason.TabIndex = 518;
//
// txt_checkUser
//
@@ -568,15 +556,44 @@
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 252;
//
- // txt_remark
+ // txt_depotName
//
- this.txt_remark.Location = new System.Drawing.Point(84, 108);
- this.txt_remark.Name = "txt_remark";
- this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(195, 28);
- this.txt_remark.StyleController = this.layoutMx1;
- this.txt_remark.TabIndex = 235;
+ this.txt_depotName.Location = new System.Drawing.Point(84, 44);
+ this.txt_depotName.Name = "txt_depotName";
+ this.txt_depotName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_depotName.Properties.Appearance.Options.UseFont = true;
+ this.txt_depotName.Size = new System.Drawing.Size(195, 28);
+ this.txt_depotName.StyleController = this.layoutMx1;
+ this.txt_depotName.TabIndex = 523;
+ //
+ // txt_reason
+ //
+ this.txt_reason.Location = new System.Drawing.Point(355, 76);
+ this.txt_reason.Name = "txt_reason";
+ this.txt_reason.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_reason.Properties.Items.AddRange(new object[] {
+ "鏉ユ枡涓嶈壇",
+ "渚涘簲鍟嗗閫�",
+ "浣滀笟涓嶈壇",
+ "渚涘簲鍟嗙墿鍝佸彿閿欒",
+ "閲囪喘鏂欏彿鍙樻洿"});
+ this.txt_reason.Size = new System.Drawing.Size(195, 24);
+ this.txt_reason.StyleController = this.layoutMx1;
+ this.txt_reason.TabIndex = 518;
+ //
+ // txt_fmrmode
+ //
+ this.txt_fmrmode.Location = new System.Drawing.Point(355, 44);
+ this.txt_fmrmode.Name = "txt_fmrmode";
+ this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_fmrmode.Properties.Items.AddRange(new object[] {
+ "閫�鏂欒ˉ鏂�",
+ "閫�鏂欏苟鎵ｆ"});
+ this.txt_fmrmode.Size = new System.Drawing.Size(195, 24);
+ this.txt_fmrmode.StyleController = this.layoutMx1;
+ this.txt_fmrmode.TabIndex = 519;
//
// txt_itemOutNo
//
@@ -588,27 +605,41 @@
this.txt_itemOutNo.StyleController = this.layoutMx1;
this.txt_itemOutNo.TabIndex = 210;
//
- // layoutMx1
+ // txt_fType
//
- this.layoutMx1.Controls.Add(this.lbGuid);
- this.layoutMx1.Controls.Add(this.txt_suppName);
- this.layoutMx1.Controls.Add(this.txt_checkUser);
- this.layoutMx1.Controls.Add(this.txt_checkDate);
- this.layoutMx1.Controls.Add(this.txt_depotName);
- this.layoutMx1.Controls.Add(this.txt_reason);
- this.layoutMx1.Controls.Add(this.txt_fmrmode);
- this.layoutMx1.Controls.Add(this.txt_itemOutNo);
- this.layoutMx1.Controls.Add(this.txt_fType);
- this.layoutMx1.Controls.Add(this.txt_remark);
- this.layoutMx1.Controls.Add(this.txt_status);
- this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 97, 812, 500);
- this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 137);
- this.layoutMx1.TabIndex = 0;
- this.layoutMx1.Text = "layoutControl1";
+ this.txt_fType.Location = new System.Drawing.Point(283, 12);
+ this.txt_fType.Name = "txt_fType";
+ this.txt_fType.Properties.Caption = "濮斿";
+ this.txt_fType.Size = new System.Drawing.Size(267, 24);
+ this.txt_fType.StyleController = this.layoutMx1;
+ this.txt_fType.TabIndex = 525;
+ //
+ // txt_remark
+ //
+ this.txt_remark.Location = new System.Drawing.Point(84, 108);
+ this.txt_remark.Name = "txt_remark";
+ this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_remark.Properties.Appearance.Options.UseFont = true;
+ this.txt_remark.Size = new System.Drawing.Size(195, 28);
+ this.txt_remark.StyleController = this.layoutMx1;
+ this.txt_remark.TabIndex = 235;
+ //
+ // txt_status
+ //
+ this.txt_status.Location = new System.Drawing.Point(825, 12);
+ this.txt_status.Name = "txt_status";
+ this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
+ this.txt_status.Size = new System.Drawing.Size(268, 24);
+ this.txt_status.StyleController = this.layoutMx1;
+ this.txt_status.TabIndex = 526;
+ //
+ // txt_guid
+ //
+ this.txt_guid.Location = new System.Drawing.Point(626, 108);
+ this.txt_guid.Name = "txt_guid";
+ this.txt_guid.Size = new System.Drawing.Size(195, 24);
+ this.txt_guid.StyleController = this.layoutMx1;
+ this.txt_guid.TabIndex = 528;
//
// Root
//
@@ -624,8 +655,7 @@
this.layoutControlItem8,
this.layoutControlItem9,
this.layoutControlItem10,
- this.layoutControlItem11,
- this.layoutControlItem12});
+ this.layoutControlItem11});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -666,14 +696,6 @@
this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem2.Text = "渚涘簲鍟�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_reason;
- this.layoutControlItem4.Location = new System.Drawing.Point(276, 0);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.Size = new System.Drawing.Size(138, 73);
- this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20);
//
// layoutControlItem1
//
@@ -716,15 +738,6 @@
this.layoutControlItem3.Text = "閫�鏂欐柟寮�";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
- // txt_fType
- //
- this.txt_fType.Location = new System.Drawing.Point(283, 12);
- this.txt_fType.Name = "txt_fType";
- this.txt_fType.Properties.Caption = "濮斿";
- this.txt_fType.Size = new System.Drawing.Size(267, 24);
- this.txt_fType.StyleController = this.layoutMx1;
- this.txt_fType.TabIndex = 525;
- //
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_fType;
@@ -732,6 +745,7 @@
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem7.Text = "濮斿鏍囪瘑";
this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem7.TextVisible = false;
//
@@ -767,15 +781,6 @@
this.layoutControlItem10.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
- // txt_status
- //
- this.txt_status.Location = new System.Drawing.Point(825, 12);
- this.txt_status.Name = "txt_status";
- this.txt_status.Properties.Caption = "checkEdit1";
- this.txt_status.Size = new System.Drawing.Size(268, 24);
- this.txt_status.StyleController = this.layoutMx1;
- this.txt_status.TabIndex = 526;
- //
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_status;
@@ -783,16 +788,9 @@
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
- //
- // lbGuid
- //
- this.lbGuid.Location = new System.Drawing.Point(825, 108);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(268, 28);
- this.lbGuid.TabIndex = 527;
- this.lbGuid.Text = "lbGuid";
//
// layoutControlItem12
//
@@ -802,8 +800,20 @@
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem12.Text = "lbGuid";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
+ //
+ // lb_guid
+ //
+ this.lb_guid.Control = this.txt_guid;
+ this.lb_guid.Location = new System.Drawing.Point(542, 96);
+ this.lb_guid.Name = "lb_guid";
+ this.lb_guid.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.lb_guid.OptionsTableLayoutItem.RowIndex = 3;
+ this.lb_guid.Size = new System.Drawing.Size(271, 32);
+ this.lb_guid.Text = "涓婚敭Guid";
+ this.lb_guid.TextSize = new System.Drawing.Size(60, 18);
//
// tabMx
//
@@ -1047,7 +1057,7 @@
//
this.xtraTabPage3.Controls.Add(this.gcMx2);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1124, 538);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1124, 389);
this.xtraTabPage3.Text = "閫�璐х墿鏂欐壂鐮佹槑缁�";
//
// gcMx2
@@ -1056,7 +1066,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(1124, 538);
+ this.gcMx2.Size = new System.Drawing.Size(1124, 389);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1205,6 +1215,25 @@
this.gvMx1lineK3id.VisibleIndex = 9;
this.gvMx1lineK3id.Width = 94;
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(968, 55);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 11;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_reason;
+ this.layoutControlItem4.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.Size = new System.Drawing.Size(138, 73);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20);
+ //
// Frm_MesCgthSqDj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1217,7 +1246,6 @@
this.Text = "閲囪喘閫�璐у崟";
((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);
@@ -1233,31 +1261,32 @@
this.splitMx1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
this.splitMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lb_guid)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage2.ResumeLayout(false);
@@ -1266,6 +1295,8 @@
this.xtraTabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
this.ResumeLayout(false);
}
@@ -1353,5 +1384,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnK3id;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1lineK3id;
+ private DevExpress.XtraEditors.TextEdit txt_guid;
+ private DevExpress.XtraLayout.LayoutControlItem lb_guid;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index 8bb3d2d..c60f4c3 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -56,12 +56,43 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
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.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_ftype = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fbatchQty = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fcheckBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fcheckDate = 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_fngHandle = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_iqcDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
- this.txt_lotNo1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
this.txt_fngHandle = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit();
@@ -142,40 +173,17 @@
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
- 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.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_ftype = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fbatchQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fcheckBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fcheckDate = 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_fngHandle = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_iqcDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UserControls.Data.UcPageBar();
this.picCheckBox = new System.Windows.Forms.PictureBox();
((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();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
@@ -186,7 +194,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).BeginInit();
@@ -244,14 +252,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).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();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
@@ -281,6 +281,438 @@
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
this.xtraTabPage2});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1342, 688);
+ 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.Panel1
+ //
+ this.split1.Panel1.Controls.Add(this.gcMain1);
+ this.split1.Panel1.Controls.Add(this.pageBar1);
+ this.split1.Panel1.Text = "Panel1";
+ //
+ // split1.Panel2
+ //
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.Size = new System.Drawing.Size(1342, 688);
+ this.split1.SplitterPosition = 623;
+ this.split1.TabIndex = 0;
+ //
+ // gcMain1
+ //
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
+ 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(1342, 584);
+ this.gcMain1.TabIndex = 5;
+ this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn19,
+ this.gv_ftype,
+ this.gridColumn12,
+ this.gridColumn13,
+ this.gv_fcheckResu,
+ this.gv_lotNo,
+ this.gv_releaseNo,
+ this.gv_itemNo,
+ this.gv_boardStyle,
+ this.gridColumn14,
+ this.gv_fbatchQty,
+ this.gv_fcovertQty,
+ this.gv_lifnr,
+ this.gv_remarks,
+ this.gv_createBy,
+ this.gv_fcheckBy,
+ this.gv_fcheckDate,
+ this.gv_createDate,
+ this.gv_lastupdateBy,
+ this.gv_lastupdateDate,
+ this.gv_fngHandle,
+ this.gv_iqcDate,
+ this.gridColumn18,
+ this.gridColumn17,
+ this.gridColumn15,
+ this.gridColumn20});
+ 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;
+ //
+ // gridColumn19
+ //
+ this.gridColumn19.Caption = "鏀舵枡缁勭粐";
+ this.gridColumn19.FieldName = "receivingOrg";
+ this.gridColumn19.MinWidth = 50;
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.Tag = "org.fnamber";
+ this.gridColumn19.Visible = true;
+ this.gridColumn19.VisibleIndex = 0;
+ this.gridColumn19.Width = 250;
+ //
+ // gv_ftype
+ //
+ this.gv_ftype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_ftype.AppearanceCell.Options.UseFont = true;
+ this.gv_ftype.Caption = "绫诲瀷";
+ this.gv_ftype.FieldName = "ftypeTxt";
+ this.gv_ftype.MaxWidth = 50;
+ this.gv_ftype.MinWidth = 50;
+ this.gv_ftype.Name = "gv_ftype";
+ this.gv_ftype.OptionsColumn.AllowEdit = false;
+ this.gv_ftype.Tag = "query_a.ftype";
+ this.gv_ftype.Visible = true;
+ this.gv_ftype.VisibleIndex = 1;
+ this.gv_ftype.Width = 50;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "瀹℃牳鏍囪瘑";
+ this.gridColumn12.FieldName = "modifyFlagTxt";
+ this.gridColumn12.MaxWidth = 50;
+ this.gridColumn12.MinWidth = 50;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Tag = "query_a.quality_audit";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 2;
+ this.gridColumn12.Width = 50;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "鎬ユ枡鏍囪瘑";
+ this.gridColumn13.FieldName = "urgentLagTxt";
+ this.gridColumn13.MaxWidth = 50;
+ this.gridColumn13.MinWidth = 50;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.OptionsColumn.ReadOnly = true;
+ this.gridColumn13.Tag = "query_a.fsubmit";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 3;
+ this.gridColumn13.Width = 50;
+ //
+ // gv_fcheckResu
+ //
+ this.gv_fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
+ this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
+ this.gv_fcheckResu.FieldName = "fcheckResu";
+ this.gv_fcheckResu.MaxWidth = 70;
+ this.gv_fcheckResu.MinWidth = 70;
+ this.gv_fcheckResu.Name = "gv_fcheckResu";
+ this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
+ this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
+ this.gv_fcheckResu.Visible = true;
+ this.gv_fcheckResu.VisibleIndex = 4;
+ this.gv_fcheckResu.Width = 70;
+ //
+ // gv_lotNo
+ //
+ this.gv_lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lotNo.AppearanceCell.Options.UseFont = true;
+ this.gv_lotNo.Caption = "閫佹鎵规";
+ this.gv_lotNo.FieldName = "lotNo";
+ this.gv_lotNo.MinWidth = 50;
+ this.gv_lotNo.Name = "gv_lotNo";
+ this.gv_lotNo.OptionsColumn.AllowEdit = false;
+ this.gv_lotNo.Tag = "query_a.lot_no";
+ this.gv_lotNo.Visible = true;
+ this.gv_lotNo.VisibleIndex = 5;
+ this.gv_lotNo.Width = 150;
+ //
+ // gv_releaseNo
+ //
+ this.gv_releaseNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_releaseNo.AppearanceCell.Options.UseFont = true;
+ this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
+ this.gv_releaseNo.FieldName = "releaseNo";
+ this.gv_releaseNo.MinWidth = 50;
+ this.gv_releaseNo.Name = "gv_releaseNo";
+ this.gv_releaseNo.OptionsColumn.AllowEdit = false;
+ this.gv_releaseNo.Tag = "query_a.release_no";
+ this.gv_releaseNo.Visible = true;
+ this.gv_releaseNo.VisibleIndex = 6;
+ this.gv_releaseNo.Width = 150;
+ //
+ // gv_itemNo
+ //
+ this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_itemNo.AppearanceCell.Options.UseFont = true;
+ this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
+ this.gv_itemNo.FieldName = "itemNo2";
+ 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 = 7;
+ this.gv_itemNo.Width = 100;
+ //
+ // gv_boardStyle
+ //
+ this.gv_boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_boardStyle.AppearanceCell.Options.UseFont = true;
+ this.gv_boardStyle.Caption = "鐗╂枡鍚嶇О";
+ this.gv_boardStyle.FieldName = "itemName";
+ this.gv_boardStyle.MinWidth = 50;
+ this.gv_boardStyle.Name = "gv_boardStyle";
+ this.gv_boardStyle.OptionsColumn.AllowEdit = false;
+ this.gv_boardStyle.Tag = "query_a.board_style";
+ this.gv_boardStyle.Visible = true;
+ this.gv_boardStyle.VisibleIndex = 8;
+ this.gv_boardStyle.Width = 200;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn14.FieldName = "itemModel";
+ this.gridColumn14.MinWidth = 50;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.OptionsColumn.ReadOnly = true;
+ this.gridColumn14.Visible = true;
+ this.gridColumn14.VisibleIndex = 9;
+ this.gridColumn14.Width = 200;
+ //
+ // gv_fbatchQty
+ //
+ this.gv_fbatchQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
+ this.gv_fbatchQty.Caption = "閲囪喘鏁伴噺";
+ this.gv_fbatchQty.FieldName = "fbatchQty";
+ this.gv_fbatchQty.MinWidth = 50;
+ this.gv_fbatchQty.Name = "gv_fbatchQty";
+ this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
+ this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
+ this.gv_fbatchQty.Visible = true;
+ this.gv_fbatchQty.VisibleIndex = 10;
+ this.gv_fbatchQty.Width = 80;
+ //
+ // gv_fcovertQty
+ //
+ this.gv_fcovertQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
+ this.gv_fcovertQty.Caption = "杞崲鏁伴噺";
+ this.gv_fcovertQty.FieldName = "fcovertQty";
+ this.gv_fcovertQty.MinWidth = 50;
+ this.gv_fcovertQty.Name = "gv_fcovertQty";
+ this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
+ this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
+ this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
+ this.gv_fcovertQty.Visible = true;
+ this.gv_fcovertQty.VisibleIndex = 11;
+ this.gv_fcovertQty.Width = 100;
+ //
+ // gv_lifnr
+ //
+ this.gv_lifnr.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lifnr.AppearanceCell.Options.UseFont = true;
+ this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�";
+ this.gv_lifnr.FieldName = "suppName";
+ this.gv_lifnr.MinWidth = 50;
+ this.gv_lifnr.Name = "gv_lifnr";
+ this.gv_lifnr.OptionsColumn.AllowEdit = false;
+ this.gv_lifnr.Tag = "query_a.lifnr";
+ this.gv_lifnr.Visible = true;
+ this.gv_lifnr.VisibleIndex = 12;
+ this.gv_lifnr.Width = 250;
+ //
+ // gv_remarks
+ //
+ this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_remarks.AppearanceCell.Options.UseFont = true;
+ this.gv_remarks.Caption = "澶囨敞璇存槑";
+ this.gv_remarks.FieldName = "remarks";
+ this.gv_remarks.MinWidth = 50;
+ this.gv_remarks.Name = "gv_remarks";
+ this.gv_remarks.OptionsColumn.AllowEdit = false;
+ this.gv_remarks.Tag = "query_a.remarks";
+ this.gv_remarks.Visible = true;
+ this.gv_remarks.VisibleIndex = 13;
+ this.gv_remarks.Width = 150;
+ //
+ // gv_createBy
+ //
+ this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ 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 = 14;
+ this.gv_createBy.Width = 100;
+ //
+ // gv_fcheckBy
+ //
+ this.gv_fcheckBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
+ this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
+ this.gv_fcheckBy.FieldName = "fcheckBy";
+ this.gv_fcheckBy.MinWidth = 50;
+ this.gv_fcheckBy.Name = "gv_fcheckBy";
+ this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
+ this.gv_fcheckBy.Tag = "query_a.fcheck_by";
+ this.gv_fcheckBy.Visible = true;
+ this.gv_fcheckBy.VisibleIndex = 15;
+ this.gv_fcheckBy.Width = 100;
+ //
+ // gv_fcheckDate
+ //
+ this.gv_fcheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
+ this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
+ this.gv_fcheckDate.FieldName = "fcheckDate";
+ this.gv_fcheckDate.MinWidth = 50;
+ this.gv_fcheckDate.Name = "gv_fcheckDate";
+ this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
+ this.gv_fcheckDate.Tag = "query_a.fcheck_date";
+ this.gv_fcheckDate.Visible = true;
+ this.gv_fcheckDate.VisibleIndex = 16;
+ this.gv_fcheckDate.Width = 180;
+ //
+ // gv_createDate
+ //
+ this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_createDate.AppearanceCell.Options.UseFont = true;
+ this.gv_createDate.Caption = "鍒涘缓鏃ユ湡";
+ this.gv_createDate.FieldName = "createDate";
+ this.gv_createDate.MinWidth = 50;
+ 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 = 17;
+ this.gv_createDate.Width = 180;
+ //
+ // gv_lastupdateBy
+ //
+ this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ 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 = 18;
+ this.gv_lastupdateBy.Width = 100;
+ //
+ // gv_lastupdateDate
+ //
+ this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
+ this.gv_lastupdateDate.Caption = "鏇存柊鏃ユ湡";
+ this.gv_lastupdateDate.FieldName = "lastupdateDate";
+ this.gv_lastupdateDate.MinWidth = 50;
+ 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 = 19;
+ this.gv_lastupdateDate.Width = 180;
+ //
+ // gv_fngHandle
+ //
+ this.gv_fngHandle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fngHandle.AppearanceCell.Options.UseFont = true;
+ this.gv_fngHandle.Caption = "涓嶈壇澶勭悊鏂规硶";
+ this.gv_fngHandle.FieldName = "fngHandle";
+ this.gv_fngHandle.MinWidth = 50;
+ this.gv_fngHandle.Name = "gv_fngHandle";
+ this.gv_fngHandle.OptionsColumn.AllowEdit = false;
+ this.gv_fngHandle.Tag = "query_a.fng_handle";
+ this.gv_fngHandle.Visible = true;
+ this.gv_fngHandle.VisibleIndex = 20;
+ this.gv_fngHandle.Width = 100;
+ //
+ // gv_iqcDate
+ //
+ this.gv_iqcDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_iqcDate.AppearanceCell.Options.UseFont = true;
+ this.gv_iqcDate.Caption = "IQC鎻愪氦鏃堕棿";
+ this.gv_iqcDate.FieldName = "iqcDate";
+ this.gv_iqcDate.MinWidth = 50;
+ this.gv_iqcDate.Name = "gv_iqcDate";
+ this.gv_iqcDate.OptionsColumn.AllowEdit = false;
+ this.gv_iqcDate.Tag = "query_a.iqc_date";
+ this.gv_iqcDate.Visible = true;
+ this.gv_iqcDate.VisibleIndex = 21;
+ this.gv_iqcDate.Width = 180;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.Caption = "瀹℃牳浜�";
+ this.gridColumn18.FieldName = "modify1By";
+ this.gridColumn18.MinWidth = 50;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Visible = true;
+ this.gridColumn18.VisibleIndex = 22;
+ this.gridColumn18.Width = 50;
+ //
+ // gridColumn17
+ //
+ this.gridColumn17.Caption = "瀹℃牳鏃堕棿";
+ this.gridColumn17.FieldName = "modify1Date";
+ this.gridColumn17.MinWidth = 50;
+ this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.Visible = true;
+ this.gridColumn17.VisibleIndex = 23;
+ this.gridColumn17.Width = 180;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "鐗╂枡ID";
+ this.gridColumn15.FieldName = "itemId";
+ this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 24;
+ this.gridColumn15.Width = 94;
+ //
+ // gridColumn20
+ //
+ this.gridColumn20.Caption = "涓婚敭Guid";
+ this.gridColumn20.FieldName = "guid";
+ this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.Width = 94;
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 584);
+ 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(1342, 39);
+ this.pageBar1.TabIndex = 6;
+ this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
@@ -313,7 +745,7 @@
//
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_fmrmode);
- this.layoutMx1.Controls.Add(this.txt_lotNo1);
+ this.layoutMx1.Controls.Add(this.txt_remarks);
this.layoutMx1.Controls.Add(this.txt_fngHandle);
this.layoutMx1.Controls.Add(this.txt_suppName);
this.layoutMx1.Controls.Add(this.txt_releaseNo);
@@ -366,16 +798,16 @@
this.txt_fmrmode.StyleController = this.layoutMx1;
this.txt_fmrmode.TabIndex = 795;
//
- // txt_lotNo1
+ // txt_remarks
//
- this.txt_lotNo1.Location = new System.Drawing.Point(414, 140);
- this.txt_lotNo1.Name = "txt_lotNo1";
- this.txt_lotNo1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_lotNo1.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo1.Size = new System.Drawing.Size(569, 28);
- this.txt_lotNo1.StyleController = this.layoutMx1;
- this.txt_lotNo1.TabIndex = 810;
- this.txt_lotNo1.Tag = "readonly";
+ this.txt_remarks.Location = new System.Drawing.Point(414, 140);
+ this.txt_remarks.Name = "txt_remarks";
+ this.txt_remarks.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_remarks.Properties.Appearance.Options.UseFont = true;
+ this.txt_remarks.Size = new System.Drawing.Size(569, 28);
+ this.txt_remarks.StyleController = this.layoutMx1;
+ this.txt_remarks.TabIndex = 810;
+ this.txt_remarks.Tag = "readonly";
//
// txt_fngHandle
//
@@ -759,7 +1191,7 @@
//
// layoutControlItem11
//
- this.layoutControlItem11.Control = this.txt_lotNo1;
+ this.layoutControlItem11.Control = this.txt_remarks;
this.layoutControlItem11.Location = new System.Drawing.Point(325, 128);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -1352,438 +1784,6 @@
this.ucUpFile1.Size = new System.Drawing.Size(1340, 57);
this.ucUpFile1.TabIndex = 0;
//
- // xtraTabPage1
- //
- this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1342, 688);
- 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.Panel1
- //
- this.split1.Panel1.Controls.Add(this.gcMain1);
- this.split1.Panel1.Controls.Add(this.pageBar1);
- this.split1.Panel1.Text = "Panel1";
- //
- // split1.Panel2
- //
- this.split1.Panel2.Text = "Panel2";
- this.split1.Size = new System.Drawing.Size(1342, 688);
- this.split1.SplitterPosition = 623;
- this.split1.TabIndex = 0;
- //
- // gcMain1
- //
- this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
- 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(1342, 584);
- this.gcMain1.TabIndex = 5;
- this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gridView1});
- //
- // gridView1
- //
- this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
- this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.ColumnPanelRowHeight = 50;
- this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn19,
- this.gv_ftype,
- this.gridColumn12,
- this.gridColumn13,
- this.gv_fcheckResu,
- this.gv_lotNo,
- this.gv_releaseNo,
- this.gv_itemNo,
- this.gv_boardStyle,
- this.gridColumn14,
- this.gv_fbatchQty,
- this.gv_fcovertQty,
- this.gv_lifnr,
- this.gv_remarks,
- this.gv_createBy,
- this.gv_fcheckBy,
- this.gv_fcheckDate,
- this.gv_createDate,
- this.gv_lastupdateBy,
- this.gv_lastupdateDate,
- this.gv_fngHandle,
- this.gv_iqcDate,
- this.gridColumn18,
- this.gridColumn17,
- this.gridColumn15,
- this.gridColumn20});
- 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;
- //
- // gridColumn19
- //
- this.gridColumn19.Caption = "鏀舵枡缁勭粐";
- this.gridColumn19.FieldName = "receivingOrg";
- this.gridColumn19.MinWidth = 50;
- this.gridColumn19.Name = "gridColumn19";
- this.gridColumn19.Tag = "org.fnamber";
- this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 0;
- this.gridColumn19.Width = 250;
- //
- // gv_ftype
- //
- this.gv_ftype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_ftype.AppearanceCell.Options.UseFont = true;
- this.gv_ftype.Caption = "绫诲瀷";
- this.gv_ftype.FieldName = "ftypeTxt";
- this.gv_ftype.MaxWidth = 50;
- this.gv_ftype.MinWidth = 50;
- this.gv_ftype.Name = "gv_ftype";
- this.gv_ftype.OptionsColumn.AllowEdit = false;
- this.gv_ftype.Tag = "query_a.ftype";
- this.gv_ftype.Visible = true;
- this.gv_ftype.VisibleIndex = 1;
- this.gv_ftype.Width = 50;
- //
- // gridColumn12
- //
- this.gridColumn12.Caption = "瀹℃牳鏍囪瘑";
- this.gridColumn12.FieldName = "modifyFlagTxt";
- this.gridColumn12.MaxWidth = 50;
- this.gridColumn12.MinWidth = 50;
- this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.Tag = "query_a.quality_audit";
- this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 2;
- this.gridColumn12.Width = 50;
- //
- // gridColumn13
- //
- this.gridColumn13.Caption = "鎬ユ枡鏍囪瘑";
- this.gridColumn13.FieldName = "urgentLagTxt";
- this.gridColumn13.MaxWidth = 50;
- this.gridColumn13.MinWidth = 50;
- this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.OptionsColumn.ReadOnly = true;
- this.gridColumn13.Tag = "query_a.fsubmit";
- this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 3;
- this.gridColumn13.Width = 50;
- //
- // gv_fcheckResu
- //
- this.gv_fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
- this.gv_fcheckResu.FieldName = "fcheckResu";
- this.gv_fcheckResu.MaxWidth = 70;
- this.gv_fcheckResu.MinWidth = 70;
- this.gv_fcheckResu.Name = "gv_fcheckResu";
- this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
- this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
- this.gv_fcheckResu.Visible = true;
- this.gv_fcheckResu.VisibleIndex = 4;
- this.gv_fcheckResu.Width = 70;
- //
- // gv_lotNo
- //
- this.gv_lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lotNo.AppearanceCell.Options.UseFont = true;
- this.gv_lotNo.Caption = "閫佹鎵规";
- this.gv_lotNo.FieldName = "lotNo";
- this.gv_lotNo.MinWidth = 50;
- this.gv_lotNo.Name = "gv_lotNo";
- this.gv_lotNo.OptionsColumn.AllowEdit = false;
- this.gv_lotNo.Tag = "query_a.lot_no";
- this.gv_lotNo.Visible = true;
- this.gv_lotNo.VisibleIndex = 5;
- this.gv_lotNo.Width = 150;
- //
- // gv_releaseNo
- //
- this.gv_releaseNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_releaseNo.AppearanceCell.Options.UseFont = true;
- this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
- this.gv_releaseNo.FieldName = "releaseNo";
- this.gv_releaseNo.MinWidth = 50;
- this.gv_releaseNo.Name = "gv_releaseNo";
- this.gv_releaseNo.OptionsColumn.AllowEdit = false;
- this.gv_releaseNo.Tag = "query_a.release_no";
- this.gv_releaseNo.Visible = true;
- this.gv_releaseNo.VisibleIndex = 6;
- this.gv_releaseNo.Width = 150;
- //
- // gv_itemNo
- //
- this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_itemNo.AppearanceCell.Options.UseFont = true;
- this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
- this.gv_itemNo.FieldName = "itemNo2";
- 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 = 7;
- this.gv_itemNo.Width = 100;
- //
- // gv_boardStyle
- //
- this.gv_boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_boardStyle.AppearanceCell.Options.UseFont = true;
- this.gv_boardStyle.Caption = "鐗╂枡鍚嶇О";
- this.gv_boardStyle.FieldName = "itemName";
- this.gv_boardStyle.MinWidth = 50;
- this.gv_boardStyle.Name = "gv_boardStyle";
- this.gv_boardStyle.OptionsColumn.AllowEdit = false;
- this.gv_boardStyle.Tag = "query_a.board_style";
- this.gv_boardStyle.Visible = true;
- this.gv_boardStyle.VisibleIndex = 8;
- this.gv_boardStyle.Width = 200;
- //
- // gridColumn14
- //
- this.gridColumn14.Caption = "鐗╂枡瑙勬牸";
- this.gridColumn14.FieldName = "itemModel";
- this.gridColumn14.MinWidth = 50;
- this.gridColumn14.Name = "gridColumn14";
- this.gridColumn14.OptionsColumn.ReadOnly = true;
- this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 9;
- this.gridColumn14.Width = 200;
- //
- // gv_fbatchQty
- //
- this.gv_fbatchQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
- this.gv_fbatchQty.Caption = "閲囪喘鏁伴噺";
- this.gv_fbatchQty.FieldName = "fbatchQty";
- this.gv_fbatchQty.MinWidth = 50;
- this.gv_fbatchQty.Name = "gv_fbatchQty";
- this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
- this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
- this.gv_fbatchQty.Visible = true;
- this.gv_fbatchQty.VisibleIndex = 10;
- this.gv_fbatchQty.Width = 80;
- //
- // gv_fcovertQty
- //
- this.gv_fcovertQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
- this.gv_fcovertQty.Caption = "杞崲鏁伴噺";
- this.gv_fcovertQty.FieldName = "fcovertQty";
- this.gv_fcovertQty.MinWidth = 50;
- this.gv_fcovertQty.Name = "gv_fcovertQty";
- this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
- this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
- this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
- this.gv_fcovertQty.Visible = true;
- this.gv_fcovertQty.VisibleIndex = 11;
- this.gv_fcovertQty.Width = 100;
- //
- // gv_lifnr
- //
- this.gv_lifnr.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lifnr.AppearanceCell.Options.UseFont = true;
- this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�";
- this.gv_lifnr.FieldName = "suppName";
- this.gv_lifnr.MinWidth = 50;
- this.gv_lifnr.Name = "gv_lifnr";
- this.gv_lifnr.OptionsColumn.AllowEdit = false;
- this.gv_lifnr.Tag = "query_a.lifnr";
- this.gv_lifnr.Visible = true;
- this.gv_lifnr.VisibleIndex = 12;
- this.gv_lifnr.Width = 250;
- //
- // gv_remarks
- //
- this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_remarks.AppearanceCell.Options.UseFont = true;
- this.gv_remarks.Caption = "澶囨敞璇存槑";
- this.gv_remarks.FieldName = "remarks";
- this.gv_remarks.MinWidth = 50;
- this.gv_remarks.Name = "gv_remarks";
- this.gv_remarks.OptionsColumn.AllowEdit = false;
- this.gv_remarks.Tag = "query_a.remarks";
- this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 13;
- this.gv_remarks.Width = 150;
- //
- // gv_createBy
- //
- this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- 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 = 14;
- this.gv_createBy.Width = 100;
- //
- // gv_fcheckBy
- //
- this.gv_fcheckBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
- this.gv_fcheckBy.FieldName = "fcheckBy";
- this.gv_fcheckBy.MinWidth = 50;
- this.gv_fcheckBy.Name = "gv_fcheckBy";
- this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
- this.gv_fcheckBy.Tag = "query_a.fcheck_by";
- this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.VisibleIndex = 15;
- this.gv_fcheckBy.Width = 100;
- //
- // gv_fcheckDate
- //
- this.gv_fcheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
- this.gv_fcheckDate.FieldName = "fcheckDate";
- this.gv_fcheckDate.MinWidth = 50;
- this.gv_fcheckDate.Name = "gv_fcheckDate";
- this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
- this.gv_fcheckDate.Tag = "query_a.fcheck_date";
- this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 16;
- this.gv_fcheckDate.Width = 180;
- //
- // gv_createDate
- //
- this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_createDate.AppearanceCell.Options.UseFont = true;
- this.gv_createDate.Caption = "鍒涘缓鏃ユ湡";
- this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 50;
- 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 = 17;
- this.gv_createDate.Width = 180;
- //
- // gv_lastupdateBy
- //
- this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- 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 = 18;
- this.gv_lastupdateBy.Width = 100;
- //
- // gv_lastupdateDate
- //
- this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateDate.Caption = "鏇存柊鏃ユ湡";
- this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 50;
- 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 = 19;
- this.gv_lastupdateDate.Width = 180;
- //
- // gv_fngHandle
- //
- this.gv_fngHandle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fngHandle.AppearanceCell.Options.UseFont = true;
- this.gv_fngHandle.Caption = "涓嶈壇澶勭悊鏂规硶";
- this.gv_fngHandle.FieldName = "fngHandle";
- this.gv_fngHandle.MinWidth = 50;
- this.gv_fngHandle.Name = "gv_fngHandle";
- this.gv_fngHandle.OptionsColumn.AllowEdit = false;
- this.gv_fngHandle.Tag = "query_a.fng_handle";
- this.gv_fngHandle.Visible = true;
- this.gv_fngHandle.VisibleIndex = 20;
- this.gv_fngHandle.Width = 100;
- //
- // gv_iqcDate
- //
- this.gv_iqcDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_iqcDate.AppearanceCell.Options.UseFont = true;
- this.gv_iqcDate.Caption = "IQC鎻愪氦鏃堕棿";
- this.gv_iqcDate.FieldName = "iqcDate";
- this.gv_iqcDate.MinWidth = 50;
- this.gv_iqcDate.Name = "gv_iqcDate";
- this.gv_iqcDate.OptionsColumn.AllowEdit = false;
- this.gv_iqcDate.Tag = "query_a.iqc_date";
- this.gv_iqcDate.Visible = true;
- this.gv_iqcDate.VisibleIndex = 21;
- this.gv_iqcDate.Width = 180;
- //
- // gridColumn18
- //
- this.gridColumn18.Caption = "瀹℃牳浜�";
- this.gridColumn18.FieldName = "modify1By";
- this.gridColumn18.MinWidth = 50;
- this.gridColumn18.Name = "gridColumn18";
- this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 22;
- this.gridColumn18.Width = 50;
- //
- // gridColumn17
- //
- this.gridColumn17.Caption = "瀹℃牳鏃堕棿";
- this.gridColumn17.FieldName = "modify1Date";
- this.gridColumn17.MinWidth = 50;
- this.gridColumn17.Name = "gridColumn17";
- this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 23;
- this.gridColumn17.Width = 180;
- //
- // gridColumn15
- //
- this.gridColumn15.Caption = "鐗╂枡ID";
- this.gridColumn15.FieldName = "itemId";
- this.gridColumn15.MinWidth = 25;
- this.gridColumn15.Name = "gridColumn15";
- this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 24;
- this.gridColumn15.Width = 94;
- //
- // gridColumn20
- //
- this.gridColumn20.Caption = "涓婚敭Guid";
- this.gridColumn20.FieldName = "guid";
- this.gridColumn20.MinWidth = 25;
- this.gridColumn20.Name = "gridColumn20";
- this.gridColumn20.Width = 94;
- //
- // pageBar1
- //
- this.pageBar1.CurrentPage = 1;
- this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 584);
- 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(1342, 39);
- this.pageBar1.TabIndex = 6;
- this.pageBar1.TotalPages = 0;
- //
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1806,6 +1806,14 @@
this.Name = "Frm_MesQaItemsDetect01Check";
((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);
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
this.splitMx1.Panel1.ResumeLayout(false);
@@ -1816,7 +1824,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).EndInit();
@@ -1874,14 +1882,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).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();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -1894,7 +1894,7 @@
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraEditors.TextEdit txt_lotNo1;
+ private DevExpress.XtraEditors.TextEdit txt_remarks;
private DevExpress.XtraEditors.TextEdit txt_fcovertQty;
private DevExpress.XtraEditors.TextEdit txt_suppName;
private DevExpress.XtraEditors.TextEdit txt_itemName;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
index a47f184..f51ae09 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -29,29 +29,28 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = 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();
+ 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
- this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_isenabled = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -65,9 +64,11 @@
this.gv_foneCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_foneCheckdate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_ftwoCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -85,21 +86,20 @@
this.txt_gg = new DevExpress.XtraEditors.TextEdit();
this.txt_ftwoChecked = new DevExpress.XtraEditors.CheckEdit();
this.txt_foneChecked = new DevExpress.XtraEditors.CheckEdit();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
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();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -140,6 +140,7 @@
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnSave = new DevExpress.XtraEditors.SimpleButton();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -148,7 +149,7 @@
this.split1.Panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
this.split1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
@@ -169,21 +170,20 @@
((System.ComponentModel.ISupportInitialize)(this.txt_gg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((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();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -202,6 +202,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
this.panelControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -247,7 +248,7 @@
//
// split1.Panel1
//
- this.split1.Panel1.Controls.Add(this.gcMain);
+ this.split1.Panel1.Controls.Add(this.gcMain1);
this.split1.Panel1.Controls.Add(this.pageBar1);
this.split1.Panel1.Text = "Panel1";
//
@@ -258,16 +259,16 @@
this.split1.SplitterPosition = 558;
this.split1.TabIndex = 0;
//
- // gcMain
+ // gcMain1
//
- this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
- 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(1127, 519);
- this.gcMain.TabIndex = 2;
- this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
+ 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(1127, 519);
+ this.gcMain1.TabIndex = 2;
+ this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
//
// gridView1
@@ -290,10 +291,12 @@
this.gv_foneCheckor,
this.gv_foneCheckdate,
this.gv_ftwoCheckor,
+ this.gridColumn10,
this.gridColumn1,
this.gridColumn4,
- this.gv_memo});
- this.gridView1.GridControl = this.gcMain;
+ this.gv_memo,
+ this.gridColumn16});
+ this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -382,6 +385,8 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.AllowEdit = false;
this.gridColumn7.Tag = "query_a.ITEM_ID";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 5;
this.gridColumn7.Width = 94;
//
// gv_itemNo
@@ -395,7 +400,7 @@
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_b.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 5;
+ this.gv_itemNo.VisibleIndex = 6;
this.gv_itemNo.Width = 150;
//
// gridColumn3
@@ -407,7 +412,7 @@
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.Tag = "query_b.item_name";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 6;
+ this.gridColumn3.VisibleIndex = 7;
this.gridColumn3.Width = 250;
//
// gridColumn2
@@ -419,7 +424,7 @@
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Tag = "query_b.item_model";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 7;
+ this.gridColumn2.VisibleIndex = 8;
this.gridColumn2.Width = 100;
//
// gv_foneCheckor
@@ -433,7 +438,7 @@
this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR";
this.gv_foneCheckor.Visible = true;
- this.gv_foneCheckor.VisibleIndex = 8;
+ this.gv_foneCheckor.VisibleIndex = 9;
this.gv_foneCheckor.Width = 94;
//
// gv_foneCheckdate
@@ -447,7 +452,7 @@
this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
this.gv_foneCheckdate.Visible = true;
- this.gv_foneCheckdate.VisibleIndex = 9;
+ this.gv_foneCheckdate.VisibleIndex = 10;
this.gv_foneCheckdate.Width = 120;
//
// gv_ftwoCheckor
@@ -461,8 +466,18 @@
this.gv_ftwoCheckor.OptionsColumn.AllowEdit = false;
this.gv_ftwoCheckor.Tag = "query_a.FTWO_CHECKOR";
this.gv_ftwoCheckor.Visible = true;
- this.gv_ftwoCheckor.VisibleIndex = 10;
+ this.gv_ftwoCheckor.VisibleIndex = 11;
this.gv_ftwoCheckor.Width = 94;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "鎵瑰噯鏃堕棿";
+ this.gridColumn10.FieldName = "ftwoCheckdate";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 12;
+ this.gridColumn10.Width = 94;
//
// gridColumn1
//
@@ -473,7 +488,7 @@
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Tag = "query_a.CREATE_BY";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 11;
+ this.gridColumn1.VisibleIndex = 13;
this.gridColumn1.Width = 94;
//
// gridColumn4
@@ -485,7 +500,7 @@
this.gridColumn4.OptionsColumn.AllowEdit = false;
this.gridColumn4.Tag = "query_a.CREATE_DATE";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 12;
+ this.gridColumn4.VisibleIndex = 14;
this.gridColumn4.Width = 180;
//
// gv_memo
@@ -499,8 +514,16 @@
this.gv_memo.OptionsColumn.AllowEdit = false;
this.gv_memo.Tag = "query_a.MEMO";
this.gv_memo.Visible = true;
- this.gv_memo.VisibleIndex = 13;
+ this.gv_memo.VisibleIndex = 15;
this.gv_memo.Width = 150;
+ //
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "涓婚敭GUID";
+ this.gridColumn16.FieldName = "guid";
+ this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Width = 94;
//
// pageBar1
//
@@ -538,7 +561,7 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.Size = new System.Drawing.Size(1127, 570);
- this.splitMx1.SplitterPosition = 142;
+ this.splitMx1.SplitterPosition = 114;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -557,16 +580,19 @@
this.layoutMx1.Controls.Add(this.txt_ftwoChecked);
this.layoutMx1.Controls.Add(this.txt_foneChecked);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem13});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(852, 71, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1127, 142);
+ this.layoutMx1.Size = new System.Drawing.Size(1127, 114);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "dataLayoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(825, 108);
+ this.lbGuid.Location = new System.Drawing.Point(825, 102);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(269, 28);
this.lbGuid.TabIndex = 387;
@@ -575,103 +601,104 @@
// txt_fSubsidiary
//
this.txt_fSubsidiary.IsReadly = false;
- this.txt_fSubsidiary.Location = new System.Drawing.Point(84, 12);
+ this.txt_fSubsidiary.Location = new System.Drawing.Point(96, 12);
this.txt_fSubsidiary.Name = "txt_fSubsidiary";
- this.txt_fSubsidiary.Size = new System.Drawing.Size(195, 28);
+ this.txt_fSubsidiary.Size = new System.Drawing.Size(183, 28);
this.txt_fSubsidiary.TabIndex = 383;
//
// txt_itemId
//
this.txt_itemId.IsReadly = false;
- this.txt_itemId.Location = new System.Drawing.Point(84, 44);
+ this.txt_itemId.Location = new System.Drawing.Point(96, 44);
this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Size = new System.Drawing.Size(195, 28);
+ this.txt_itemId.Size = new System.Drawing.Size(183, 28);
this.txt_itemId.TabIndex = 380;
this.txt_itemId.Tag = "no";
//
// txt_foneCheckdate
//
- this.txt_foneCheckdate.Location = new System.Drawing.Point(897, 44);
+ this.txt_foneCheckdate.Location = new System.Drawing.Point(909, 44);
this.txt_foneCheckdate.Name = "txt_foneCheckdate";
this.txt_foneCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
- this.txt_foneCheckdate.Size = new System.Drawing.Size(197, 28);
+ this.txt_foneCheckdate.Size = new System.Drawing.Size(185, 28);
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(897, 12);
+ this.txt_foneCheckor.Location = new System.Drawing.Point(909, 12);
this.txt_foneCheckor.Name = "txt_foneCheckor";
this.txt_foneCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
- this.txt_foneCheckor.Size = new System.Drawing.Size(197, 28);
+ this.txt_foneCheckor.Size = new System.Drawing.Size(185, 28);
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(84, 76);
+ this.txt_itemNo.Location = new System.Drawing.Point(367, 44);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(195, 28);
+ this.txt_itemNo.Size = new System.Drawing.Size(183, 28);
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(355, 12);
+ this.txt_memo.Location = new System.Drawing.Point(96, 76);
this.txt_memo.Name = "txt_memo";
this.txt_memo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_memo.Properties.Appearance.Options.UseFont = true;
- this.txt_memo.Size = new System.Drawing.Size(195, 28);
+ this.txt_memo.Size = new System.Drawing.Size(183, 28);
this.txt_memo.StyleController = this.layoutMx1;
this.txt_memo.TabIndex = 219;
//
// txt_ftwoCheckor
//
- this.txt_ftwoCheckor.Location = new System.Drawing.Point(626, 12);
+ this.txt_ftwoCheckor.Location = new System.Drawing.Point(638, 12);
this.txt_ftwoCheckor.Name = "txt_ftwoCheckor";
this.txt_ftwoCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true;
- this.txt_ftwoCheckor.Size = new System.Drawing.Size(195, 28);
+ this.txt_ftwoCheckor.Size = new System.Drawing.Size(183, 28);
this.txt_ftwoCheckor.StyleController = this.layoutMx1;
this.txt_ftwoCheckor.TabIndex = 280;
this.txt_ftwoCheckor.Tag = "readOnly";
//
// txt_fversion
//
- this.txt_fversion.Enabled = false;
- this.txt_fversion.Location = new System.Drawing.Point(355, 44);
+ this.txt_fversion.Location = new System.Drawing.Point(367, 12);
this.txt_fversion.Name = "txt_fversion";
this.txt_fversion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fversion.Properties.Appearance.Options.UseFont = true;
- this.txt_fversion.Size = new System.Drawing.Size(195, 28);
+ this.txt_fversion.Size = new System.Drawing.Size(183, 28);
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(626, 44);
+ this.txt_ftwoCheckdate.Location = new System.Drawing.Point(638, 44);
this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate";
this.txt_ftwoCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true;
- this.txt_ftwoCheckdate.Size = new System.Drawing.Size(195, 28);
+ this.txt_ftwoCheckdate.Size = new System.Drawing.Size(183, 28);
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(355, 76);
+ this.txt_gg.Location = new System.Drawing.Point(367, 76);
this.txt_gg.Name = "txt_gg";
- this.txt_gg.Size = new System.Drawing.Size(195, 24);
+ this.txt_gg.Size = new System.Drawing.Size(183, 24);
this.txt_gg.StyleController = this.layoutMx1;
this.txt_gg.TabIndex = 384;
+ this.txt_gg.Tag = "readOnly";
//
// txt_ftwoChecked
//
@@ -681,6 +708,7 @@
this.txt_ftwoChecked.Size = new System.Drawing.Size(267, 24);
this.txt_ftwoChecked.StyleController = this.layoutMx1;
this.txt_ftwoChecked.TabIndex = 385;
+ this.txt_ftwoChecked.Tag = "readOnly";
//
// txt_foneChecked
//
@@ -690,6 +718,19 @@
this.txt_foneChecked.Size = new System.Drawing.Size(269, 24);
this.txt_foneChecked.StyleController = this.layoutMx1;
this.txt_foneChecked.TabIndex = 386;
+ this.txt_foneChecked.Tag = "readOnly";
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.lbGuid;
+ this.layoutControlItem13.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(273, 32);
+ this.layoutControlItem13.Text = "lbGuid";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem13.TextVisible = false;
//
// Root
//
@@ -697,47 +738,43 @@
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
- this.layoutControlItem2,
this.layoutControlItem3,
this.layoutControlItem4,
- this.layoutControlItem5,
this.layoutControlItem6,
- this.layoutControlItem7,
- this.layoutControlItem8,
this.layoutControlItem9,
this.layoutControlItem10,
this.layoutControlItem11,
this.layoutControlItem12,
- this.layoutControlItem13});
+ this.layoutControlItem2,
+ this.layoutControlItem5,
+ this.layoutControlItem8,
+ 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});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ 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[] {
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8});
- this.Root.Size = new System.Drawing.Size(1106, 148);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3});
+ this.Root.Size = new System.Drawing.Size(1106, 116);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -747,17 +784,7 @@
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem1.Text = "閫夋嫨缁勭粐";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_memo;
- this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem2.Text = "澶囨敞";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 18);
//
// layoutControlItem3
//
@@ -767,7 +794,7 @@
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem3.Text = "鎵瑰噯浜�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 18);
//
// layoutControlItem4
//
@@ -777,18 +804,7 @@
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem4.Text = "閫夋嫨鐗╂枡";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_fversion;
- this.layoutControlItem5.Location = new System.Drawing.Point(271, 32);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem5.Text = "鐗堟湰";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 18);
//
// layoutControlItem6
//
@@ -799,28 +815,7 @@
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem6.Text = "鎵瑰噯鏃ユ湡";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_itemNo;
- this.layoutControlItem7.Location = new System.Drawing.Point(0, 64);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem7.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_gg;
- this.layoutControlItem8.Location = new System.Drawing.Point(271, 64);
- 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.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 18);
//
// layoutControlItem9
//
@@ -830,6 +825,7 @@
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem9.Text = "鎵瑰噯鏍囪瘑";
this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem9.TextVisible = false;
//
@@ -841,7 +837,7 @@
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.Size = new System.Drawing.Size(273, 32);
this.layoutControlItem10.Text = "瀹℃牳浜�";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 18);
//
// layoutControlItem11
//
@@ -852,7 +848,7 @@
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem11.Size = new System.Drawing.Size(273, 32);
this.layoutControlItem11.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 18);
//
// layoutControlItem12
//
@@ -862,30 +858,51 @@
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem12.Size = new System.Drawing.Size(273, 32);
+ this.layoutControlItem12.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
//
- // layoutControlItem13
+ // layoutControlItem2
//
- this.layoutControlItem13.Control = this.lbGuid;
- this.layoutControlItem13.Location = new System.Drawing.Point(813, 96);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(273, 32);
- this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem13.TextVisible = false;
+ this.layoutControlItem2.Control = this.txt_memo;
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem2.Text = "澶囨敞";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 18);
//
- // picCheckBox
+ // layoutControlItem5
//
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(945, 55);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 6;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
+ this.layoutControlItem5.Control = this.txt_fversion;
+ 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, 32);
+ 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.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(271, 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.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem7.Text = "鐗╂枡缂栫爜";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 18);
//
// tabMx
//
@@ -893,7 +910,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1127, 416);
+ this.tabMx.Size = new System.Drawing.Size(1127, 444);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -903,7 +920,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1125, 384);
+ this.tabMxPage1.Size = new System.Drawing.Size(1125, 412);
this.tabMxPage1.Text = "妫�楠岄」鐩槑缁�";
//
// gcMx1
@@ -920,7 +937,7 @@
this.rptJYSP,
this.repositoryItemButtonEdit1,
this.repositoryItemComboBox1});
- this.gcMx1.Size = new System.Drawing.Size(1125, 384);
+ this.gcMx1.Size = new System.Drawing.Size(1125, 412);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1097,6 +1114,7 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.rptJYBZ.Name = "rptJYBZ";
this.rptJYBZ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.rptJYBZ.EditValueChanged += new System.EventHandler(this.rptJYBZ_SelectedIndexChanged);
//
// sampleSizeName
//
@@ -1206,19 +1224,20 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ 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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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);
//
// xtraTabPageCopy
//
this.xtraTabPageCopy.Controls.Add(this.gridControl2);
this.xtraTabPageCopy.Controls.Add(this.panelControl1);
this.xtraTabPageCopy.Name = "xtraTabPageCopy";
- this.xtraTabPageCopy.Size = new System.Drawing.Size(1125, 538);
+ this.xtraTabPageCopy.Size = new System.Drawing.Size(1125, 412);
this.xtraTabPageCopy.Text = "澶嶅埗鍒板叾瀹冪墿鏂�";
//
// gridControl2
@@ -1229,7 +1248,7 @@
this.gridControl2.Name = "gridControl2";
this.gridControl2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit3});
- this.gridControl2.Size = new System.Drawing.Size(1125, 495);
+ this.gridControl2.Size = new System.Drawing.Size(1125, 369);
this.gridControl2.TabIndex = 1;
this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView2});
@@ -1330,12 +1349,13 @@
// repositoryItemButtonEdit3
//
this.repositoryItemButtonEdit3.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
//
// gridColumn9
//
@@ -1373,6 +1393,17 @@
this.btnSelect.TabIndex = 449;
this.btnSelect.Text = "閫夋嫨鐗╂枡";
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(945, 55);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 6;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
// Frm_MesQmCheckitemDt
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1391,7 +1422,7 @@
((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
this.split1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
@@ -1412,21 +1443,20 @@
((System.ComponentModel.ISupportInitialize)(this.txt_gg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((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();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1445,6 +1475,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
this.panelControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
@@ -1454,7 +1485,7 @@
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
- private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gv_isenabled;
@@ -1486,14 +1517,10 @@
private DevExpress.XtraEditors.TextEdit txt_foneCheckor;
private DevExpress.XtraEditors.TextEdit txt_memo;
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;
private DevExpress.XtraEditors.TextEdit txt_gg;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraEditors.CheckEdit txt_ftwoChecked;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private System.Windows.Forms.Label lbGuid;
@@ -1542,5 +1569,11 @@
private DevExpress.XtraEditors.PanelControl panelControl1;
private DevExpress.XtraEditors.SimpleButton btnSave;
private DevExpress.XtraEditors.SimpleButton btnSelect;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index 5abad4e..1894c76 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -18,7 +18,6 @@
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesQmCheckitemManager/";
-
public Frm_MesQmCheckitemDt()
{
InitializeComponent();
@@ -31,9 +30,7 @@
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
- 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.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "foneChecked", "", (value) =>
{
@@ -139,7 +136,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
/// <summary>
@@ -219,7 +216,7 @@
UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
xtraTabPageCopy.PageEnabled = false;
}
-
+
/// <summary>
/// 淇濆瓨浜嬩欢
/// </summary>
@@ -236,6 +233,7 @@
return;
}
gvMx1.CloseEditor();
+ gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
if (gvMx1.DataRowCount <= 0)
{
@@ -316,12 +314,12 @@
SampleSizeNo = row["SampleSizeNo"].ToString(),
FcheckTool = row["FcheckTool"].ToString(),
FcheckLevel = row["FcheckLevel"].ToString(),
- Fstand = row["Fstand"].ToString(),
+ Fstand = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["Fstand"].ToString()),
FacLevel = row["FacLevel"].ToString(),
FspecRequ = row["FspecRequ"].ToString(),
Memo = row["memo"].ToString(),
- FupAllow = row["FupAllow"].ToString(),
- FdownAllow = row["FdownAllow"].ToString(),
+ FupAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FupAllow"].ToString()),
+ FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()),
});
}
}
@@ -364,7 +362,7 @@
}
}
-
+
/// <summary>
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
@@ -384,17 +382,18 @@
UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
+ gcMain1.DataSource = null;
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();
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
@@ -437,17 +436,14 @@
{
var dy = _rtn.rtnData;
lbGuid.Text = strGuid;
- var gvList =
- new List<GridView>();
+ var gvList = new List<GridView>();
gvList.Add(gvMx1);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy,
isEdit, gvList);
var _job = JObject.Parse(strJson);
var array = new JArray();
foreach (var a in _job["rtnData"]["list"]) array.Add(a);
- var dt =
- JsonConvert.DeserializeObject<DataTable>(
- array.ToString());
+ var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
if (dt.Rows.Count > 0)
{
gcMx1.BindingContext = new BindingContext();
@@ -518,10 +514,14 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
+ UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, this, _inFieldValue>0?"1":"0");
}
- int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
- gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, this, _inFieldValue.ToString());
+ else {
+ //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+ getPageList(this.pageBar1.CurrentPage);
+ int rowHandle = gridView1.LocateByValue("guid", rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ }
}
}
catch (Exception ex)
@@ -788,11 +788,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- }
-
- private void lb_ftwoCheckdate_Click(object sender, EventArgs e)
- {
-
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
index a16e7e3..7ca0633 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
@@ -55,7 +55,7 @@
/// 涓婂叕宸�
///</summary>
- public string FupAllow { get; set; }
+ public decimal? FupAllow { get; set; }
/// <summary>
/// 妫�楠岄」鐩�
///</summary>
@@ -90,7 +90,7 @@
/// 涓嬪叕宸�
///</summary>
- public string FdownAllow { get; set; }
+ public decimal? FdownAllow { get; set; }
/// <summary>
/// 妫�楠屾按骞�
///</summary>
@@ -100,7 +100,7 @@
/// 鏍囧噯鍊�
///</summary>
- public string Fstand { get; set; }
+ public decimal? Fstand { get; set; }
/// <summary>
/// 鎺ユ敹姘村钩
///</summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 96b5bf5..6a6406b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -1311,13 +1311,17 @@
// gvMx1memo
//
this.gvMx1memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1memo.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
this.gvMx1memo.AppearanceCell.Options.UseFont = true;
+ this.gvMx1memo.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1memo.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1memo.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1memo.Caption = "澶囨敞";
this.gvMx1memo.FieldName = "memo";
this.gvMx1memo.MinWidth = 50;
this.gvMx1memo.Name = "gvMx1memo";
this.gvMx1memo.OptionsColumn.ReadOnly = true;
- this.gvMx1memo.Tag = "query_a.memo";
+ this.gvMx1memo.Tag = "edit";
this.gvMx1memo.Visible = true;
this.gvMx1memo.VisibleIndex = 15;
this.gvMx1memo.Width = 180;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 5e0a855..f739e3c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -376,6 +376,7 @@
ItemId = int.Parse(row["itemId"].ToString()),
Quantity = decimal.Parse(row["quantity"].ToString()),
UrgentFlag = Gs.DevApp.ToolBox.UtilityHelper.ToBit(row["urgentFlag"].ToString()),
+ Remark = row["memo"].ToString(),
});
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index b05d9ba..5efd486 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -423,8 +423,8 @@
}
else {
//娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
- int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
getPageList(this.pageBar1.CurrentPage);
+ int rowHandle = gridView1.LocateByValue("guid", rowGuid);
gridView1.FocusedRowHandle = rowHandle;
}
}
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index faebd02..9eea9e9 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1374,6 +1374,11 @@
return 0;
}
}
+ public static decimal? GetDecimal(string s)
+ {
+ if (string.IsNullOrEmpty(s)) return null;
+ return decimal.Parse(s);
+ }
public static int ToInt(string str)
{
try
@@ -1595,7 +1600,7 @@
GridView dgv = s as GridView;
if (dgv != null)
{
- if (dgv.GetSelectedRows() != null)
+ if (dgv.GetSelectedRows() != null && dgv.GetSelectedRows().Count()>0)
{
var selectedRow = dgv.GetSelectedRows()[0]; // 鑾峰彇绗竴涓�変腑琛岀殑绱㈠紩
if (selectedRow >= 0)
--
Gitblit v1.9.3