From 3dc0ce85e56e3b3d13ec6ab99409ea8e3c0d9078 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期四, 18 九月 2025 16:16:14 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 404 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 221 insertions(+), 183 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 16653d5..1ed25c0 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -51,6 +51,12 @@
DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Womdaa));
+ 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.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -86,7 +92,6 @@
this.gv_daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_daa011 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa005 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -94,8 +99,6 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa015 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa009 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_prepareTime = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_daa028 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa016 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa017 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_mesStartProd = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -136,6 +139,7 @@
this.txt_isQiTao = new DevExpress.XtraEditors.CheckEdit();
this.txt_daa018 = new DevExpress.XtraEditors.TextEdit();
this.txt_daa025 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_daa021 = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -153,16 +157,17 @@
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
this.txt_daa015label = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem46 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem48 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem49 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -195,6 +200,7 @@
this.gvMx1dab020 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab022 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab023 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn58 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPage6 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx6 = new DevExpress.XtraGrid.GridControl();
this.gvMx6 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -270,6 +276,8 @@
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptTuoBanNbz = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx98 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx98 = new DevExpress.XtraLayout.LayoutControl();
@@ -296,6 +304,7 @@
this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx100 = new DevExpress.XtraEditors.SplitContainerControl();
this.layMx100 = new DevExpress.XtraDataLayout.DataLayoutControl();
@@ -370,6 +379,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa025.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa021.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
@@ -387,16 +397,17 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa015label)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem48)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem49)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -444,6 +455,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptTuoBanNbz)).BeginInit();
this.xtraTabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx98)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).BeginInit();
@@ -582,7 +594,6 @@
this.gv_daa003,
this.gv_daa004,
this.gv_daa008,
- this.gv_daa011,
this.gridColumn4,
this.gv_daa010,
this.gv_daa005,
@@ -590,8 +601,6 @@
this.gridColumn1,
this.gv_daa015,
this.gv_daa009,
- this.gv_prepareTime,
- this.gv_daa028,
this.gv_daa016,
this.gv_daa017,
this.gv_mesStartProd,
@@ -617,8 +626,6 @@
this.gridColumn5.MinWidth = 50;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "query_a.jabs";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 0;
this.gridColumn5.Width = 50;
//
// gridColumn7
@@ -630,7 +637,7 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Tag = "query_a.jabs";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 1;
+ this.gridColumn7.VisibleIndex = 0;
this.gridColumn7.Width = 50;
//
// gridColumn10
@@ -642,7 +649,7 @@
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Tag = "query_a.jabs";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 2;
+ this.gridColumn10.VisibleIndex = 1;
this.gridColumn10.Width = 50;
//
// gridColumn12
@@ -653,8 +660,6 @@
this.gridColumn12.MinWidth = 50;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Tag = "query_a.jabs";
- this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 3;
this.gridColumn12.Width = 50;
//
// gridColumn6
@@ -666,7 +671,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Tag = "query_a.jabs";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 4;
+ this.gridColumn6.VisibleIndex = 2;
this.gridColumn6.Width = 50;
//
// gridColumn27
@@ -676,20 +681,20 @@
this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.Visible = true;
- this.gridColumn27.VisibleIndex = 19;
+ this.gridColumn27.VisibleIndex = 17;
this.gridColumn27.Width = 94;
//
// gv_daa018
//
this.gv_daa018.AppearanceCell.Options.UseFont = true;
this.gv_daa018.Caption = "宸ュ崟鐘舵��";
- this.gv_daa018.FieldName = "daa018Txt";
+ this.gv_daa018.FieldName = "daa018TxtColor";
this.gv_daa018.MinWidth = 90;
this.gv_daa018.Name = "gv_daa018";
this.gv_daa018.OptionsColumn.AllowEdit = false;
this.gv_daa018.Tag = "query_a.daa018";
this.gv_daa018.Visible = true;
- this.gv_daa018.VisibleIndex = 5;
+ this.gv_daa018.VisibleIndex = 3;
this.gv_daa018.Width = 90;
//
// gridColoun100
@@ -700,7 +705,7 @@
this.gridColoun100.Name = "gridColoun100";
this.gridColoun100.Tag = "org.fnamber";
this.gridColoun100.Visible = true;
- this.gridColoun100.VisibleIndex = 29;
+ this.gridColoun100.VisibleIndex = 25;
this.gridColoun100.Width = 250;
//
// gv_daa001
@@ -713,7 +718,7 @@
this.gv_daa001.OptionsColumn.AllowEdit = false;
this.gv_daa001.Tag = "query_a.daa001";
this.gv_daa001.Visible = true;
- this.gv_daa001.VisibleIndex = 6;
+ this.gv_daa001.VisibleIndex = 7;
this.gv_daa001.Width = 120;
//
// gv_daa021
@@ -726,7 +731,7 @@
this.gv_daa021.OptionsColumn.AllowEdit = false;
this.gv_daa021.Tag = "query_a.daa021";
this.gv_daa021.Visible = true;
- this.gv_daa021.VisibleIndex = 7;
+ this.gv_daa021.VisibleIndex = 19;
this.gv_daa021.Width = 100;
//
// gridColumn3
@@ -762,7 +767,7 @@
this.gv_daa004.OptionsColumn.AllowEdit = false;
this.gv_daa004.Tag = "query_a.daa004";
this.gv_daa004.Visible = true;
- this.gv_daa004.VisibleIndex = 12;
+ this.gv_daa004.VisibleIndex = 14;
this.gv_daa004.Width = 150;
//
// gv_daa008
@@ -776,22 +781,8 @@
this.gv_daa008.OptionsColumn.AllowEdit = false;
this.gv_daa008.Tag = "query_a.daa008";
this.gv_daa008.Visible = true;
- this.gv_daa008.VisibleIndex = 13;
+ this.gv_daa008.VisibleIndex = 4;
this.gv_daa008.Width = 50;
- //
- // gv_daa011
- //
- this.gv_daa011.AppearanceCell.Options.UseFont = true;
- this.gv_daa011.Caption = "宸茬敓浜ч噺";
- this.gv_daa011.FieldName = "daa011";
- this.gv_daa011.MaxWidth = 50;
- this.gv_daa011.MinWidth = 50;
- this.gv_daa011.Name = "gv_daa011";
- this.gv_daa011.OptionsColumn.AllowEdit = false;
- this.gv_daa011.Tag = "query_a.daa011";
- this.gv_daa011.Visible = true;
- this.gv_daa011.VisibleIndex = 14;
- this.gv_daa011.Width = 50;
//
// gridColumn4
//
@@ -799,19 +790,19 @@
this.gridColumn4.AppearanceCell.Options.UseForeColor = true;
this.gridColumn4.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
this.gridColumn4.AppearanceHeader.Options.UseForeColor = true;
- this.gridColumn4.Caption = "寰呯敓浜ч噺";
+ this.gridColumn4.Caption = "寰呭叆搴撻噺";
this.gridColumn4.FieldName = "dscl";
this.gridColumn4.MaxWidth = 50;
this.gridColumn4.MinWidth = 50;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 15;
+ this.gridColumn4.VisibleIndex = 6;
this.gridColumn4.Width = 50;
//
// gv_daa010
//
this.gv_daa010.AppearanceCell.Options.UseFont = true;
- this.gv_daa010.Caption = "鍏ュ簱鏁伴噺";
+ this.gv_daa010.Caption = "宸插叆搴撻噺";
this.gv_daa010.FieldName = "daa010";
this.gv_daa010.MaxWidth = 50;
this.gv_daa010.MinWidth = 50;
@@ -819,7 +810,7 @@
this.gv_daa010.OptionsColumn.AllowEdit = false;
this.gv_daa010.Tag = "query_a.daa010";
this.gv_daa010.Visible = true;
- this.gv_daa010.VisibleIndex = 17;
+ this.gv_daa010.VisibleIndex = 5;
this.gv_daa010.Width = 50;
//
// gv_daa005
@@ -833,7 +824,7 @@
this.gv_daa005.OptionsColumn.AllowEdit = false;
this.gv_daa005.Tag = "query_a.daa005";
this.gv_daa005.Visible = true;
- this.gv_daa005.VisibleIndex = 18;
+ this.gv_daa005.VisibleIndex = 16;
this.gv_daa005.Width = 50;
//
// gv_cust
@@ -854,7 +845,7 @@
this.gridColumn1.MinWidth = 50;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 20;
+ this.gridColumn1.VisibleIndex = 18;
this.gridColumn1.Width = 94;
//
// gv_daa015
@@ -880,30 +871,8 @@
this.gv_daa009.OptionsColumn.AllowEdit = false;
this.gv_daa009.Tag = "query_a.daa009";
this.gv_daa009.Visible = true;
- this.gv_daa009.VisibleIndex = 16;
+ this.gv_daa009.VisibleIndex = 15;
this.gv_daa009.Width = 94;
- //
- // gv_prepareTime
- //
- this.gv_prepareTime.AppearanceCell.Options.UseFont = true;
- this.gv_prepareTime.Caption = "棰勮澶囨枡鏃堕棿";
- this.gv_prepareTime.FieldName = "prepareTime";
- this.gv_prepareTime.MinWidth = 50;
- this.gv_prepareTime.Name = "gv_prepareTime";
- this.gv_prepareTime.OptionsColumn.AllowEdit = false;
- this.gv_prepareTime.Tag = "query_a.prepare_time";
- this.gv_prepareTime.Width = 180;
- //
- // gv_daa028
- //
- this.gv_daa028.AppearanceCell.Options.UseFont = true;
- this.gv_daa028.Caption = "澶囨枡瀹屾垚鏃堕棿";
- this.gv_daa028.FieldName = "daa028";
- this.gv_daa028.MinWidth = 50;
- this.gv_daa028.Name = "gv_daa028";
- this.gv_daa028.OptionsColumn.AllowEdit = false;
- this.gv_daa028.Tag = "query_a.daa028";
- this.gv_daa028.Width = 180;
//
// gv_daa016
//
@@ -927,8 +896,6 @@
this.gv_daa017.Name = "gv_daa017";
this.gv_daa017.OptionsColumn.AllowEdit = false;
this.gv_daa017.Tag = "query_a.daa017";
- this.gv_daa017.Visible = true;
- this.gv_daa017.VisibleIndex = 22;
this.gv_daa017.Width = 180;
//
// gv_mesStartProd
@@ -941,7 +908,7 @@
this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
this.gv_mesStartProd.Visible = true;
- this.gv_mesStartProd.VisibleIndex = 23;
+ this.gv_mesStartProd.VisibleIndex = 12;
this.gv_mesStartProd.Width = 180;
//
// gv_mesEndProd
@@ -954,7 +921,7 @@
this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
this.gv_mesEndProd.Visible = true;
- this.gv_mesEndProd.VisibleIndex = 24;
+ this.gv_mesEndProd.VisibleIndex = 13;
this.gv_mesEndProd.Width = 180;
//
// gridColumn21
@@ -964,7 +931,7 @@
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 25;
+ this.gridColumn21.VisibleIndex = 22;
this.gridColumn21.Width = 94;
//
// gridColumn22
@@ -974,7 +941,7 @@
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 26;
+ this.gridColumn22.VisibleIndex = 23;
this.gridColumn22.Width = 94;
//
// gridColumn23
@@ -992,7 +959,7 @@
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 27;
+ this.gridColumn24.VisibleIndex = 24;
this.gridColumn24.Width = 94;
//
// gridColumn25
@@ -1002,7 +969,7 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 28;
+ this.gridColumn25.VisibleIndex = 20;
this.gridColumn25.Width = 94;
//
// gridColumn52
@@ -1083,6 +1050,7 @@
this.layoutMx1.Controls.Add(this.txt_isQiTao);
this.layoutMx1.Controls.Add(this.txt_daa018);
this.layoutMx1.Controls.Add(this.txt_daa025);
+ this.layoutMx1.Controls.Add(this.txt_daa021);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem29,
@@ -1090,7 +1058,7 @@
this.layoutControlItem41});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1059, 277, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(797, 526, 812, 500);
this.layoutMx1.Root = this.Root;
this.layoutMx1.Size = new System.Drawing.Size(1650, 192);
this.layoutMx1.TabIndex = 0;
@@ -1115,10 +1083,10 @@
//
// txt_daa009
//
- this.txt_daa009.Location = new System.Drawing.Point(114, 155);
+ this.txt_daa009.Location = new System.Drawing.Point(521, 155);
this.txt_daa009.Name = "txt_daa009";
this.txt_daa009.Properties.Appearance.Options.UseFont = true;
- this.txt_daa009.Size = new System.Drawing.Size(708, 24);
+ this.txt_daa009.Size = new System.Drawing.Size(301, 24);
this.txt_daa009.StyleController = this.layoutMx1;
this.txt_daa009.TabIndex = 240;
this.txt_daa009.Tag = "";
@@ -1245,7 +1213,7 @@
//
// txt_daa029
//
- this.txt_daa029.Location = new System.Drawing.Point(114, 68);
+ this.txt_daa029.Location = new System.Drawing.Point(114, 97);
this.txt_daa029.Name = "txt_daa029";
this.txt_daa029.Properties.Appearance.Options.UseFont = true;
this.txt_daa029.Size = new System.Drawing.Size(301, 24);
@@ -1275,7 +1243,7 @@
//
// txt_daa003
//
- this.txt_daa003.Location = new System.Drawing.Point(114, 97);
+ this.txt_daa003.Location = new System.Drawing.Point(114, 126);
this.txt_daa003.Name = "txt_daa003";
this.txt_daa003.Properties.Appearance.Options.UseFont = true;
this.txt_daa003.Size = new System.Drawing.Size(301, 24);
@@ -1295,7 +1263,7 @@
//
// txt_daa004
//
- this.txt_daa004.Location = new System.Drawing.Point(114, 126);
+ this.txt_daa004.Location = new System.Drawing.Point(114, 155);
this.txt_daa004.Name = "txt_daa004";
this.txt_daa004.Properties.Appearance.Options.UseFont = true;
this.txt_daa004.Size = new System.Drawing.Size(301, 24);
@@ -1358,6 +1326,15 @@
this.txt_daa025.StyleController = this.layoutMx1;
this.txt_daa025.TabIndex = 479;
//
+ // txt_daa021
+ //
+ this.txt_daa021.Location = new System.Drawing.Point(114, 68);
+ this.txt_daa021.Name = "txt_daa021";
+ this.txt_daa021.Size = new System.Drawing.Size(301, 24);
+ this.txt_daa021.StyleController = this.layoutMx1;
+ this.txt_daa021.TabIndex = 480;
+ this.txt_daa021.Tag = "readonly";
+ //
// layoutControlItem29
//
this.layoutControlItem29.Control = this.lbGuid;
@@ -1411,16 +1388,17 @@
this.layoutControlItem12,
this.layoutControlItem16,
this.layoutControlItem9,
- this.layoutControlItem13,
- this.layoutControlItem19,
- this.layoutControlItem17,
- this.layoutControlItem28,
this.txt_daa015label,
this.layoutControlItem14,
this.layoutControlItem46,
this.layoutControlItem48,
this.layoutControlItem40,
- this.layoutControlItem27});
+ this.layoutControlItem27,
+ this.layoutControlItem28,
+ this.layoutControlItem17,
+ this.layoutControlItem19,
+ this.layoutControlItem13,
+ this.layoutControlItem49});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1596,47 +1574,6 @@
this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_daa029;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 56);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(407, 29);
- this.layoutControlItem13.Text = "浜у搧缂栫爜";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem19
- //
- this.layoutControlItem19.Control = this.txt_daa003;
- this.layoutControlItem19.Location = new System.Drawing.Point(0, 85);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem19.Size = new System.Drawing.Size(407, 29);
- this.layoutControlItem19.Text = "浜у搧鍚嶇О";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_daa004;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 114);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(407, 29);
- this.layoutControlItem17.Text = "浜у搧瑙勬牸";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem28
- //
- this.layoutControlItem28.Control = this.txt_daa009;
- this.layoutControlItem28.Location = new System.Drawing.Point(0, 143);
- this.layoutControlItem28.Name = "layoutControlItem28";
- this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem28.Size = new System.Drawing.Size(814, 29);
- this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
- this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
- //
// txt_daa015label
//
this.txt_daa015label.Control = this.txt_daa015;
@@ -1703,6 +1640,57 @@
this.layoutControlItem27.Size = new System.Drawing.Size(409, 29);
this.layoutControlItem27.Text = "鐢熶骇绫诲瀷";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem28
+ //
+ this.layoutControlItem28.Control = this.txt_daa009;
+ this.layoutControlItem28.Location = new System.Drawing.Point(407, 143);
+ this.layoutControlItem28.Name = "layoutControlItem28";
+ this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem28.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_daa004;
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 143);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem17.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem17.Text = "浜у搧瑙勬牸";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_daa003;
+ this.layoutControlItem19.Location = new System.Drawing.Point(0, 114);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem19.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem19.Text = "浜у搧鍚嶇О";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_daa029;
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 85);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem13.Text = "浜у搧缂栫爜";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem49
+ //
+ this.layoutControlItem49.Control = this.txt_daa021;
+ this.layoutControlItem49.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem49.Name = "layoutControlItem49";
+ this.layoutControlItem49.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem49.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem49.Text = "浠诲姟鍗曞彿";
+ this.layoutControlItem49.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
//
@@ -1775,7 +1763,8 @@
this.gvMx1dab019,
this.gvMx1dab020,
this.gvMx1dab022,
- this.gvMx1dab023});
+ this.gvMx1dab023,
+ this.gridColumn58});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1798,7 +1787,7 @@
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 0;
- this.gridColumn13.Width = 94;
+ this.gridColumn13.Width = 89;
//
// gvMx1dab001
//
@@ -1810,7 +1799,7 @@
this.gvMx1dab001.Tag = "query_a.dab001";
this.gvMx1dab001.Visible = true;
this.gvMx1dab001.VisibleIndex = 1;
- this.gvMx1dab001.Width = 94;
+ this.gvMx1dab001.Width = 89;
//
// gvMx1dab003
//
@@ -1822,7 +1811,7 @@
this.gvMx1dab003.Tag = "query_a.dab003";
this.gvMx1dab003.Visible = true;
this.gvMx1dab003.VisibleIndex = 2;
- this.gvMx1dab003.Width = 94;
+ this.gvMx1dab003.Width = 89;
//
// gvMx1dab004
//
@@ -1833,8 +1822,8 @@
this.gvMx1dab004.Name = "gvMx1dab004";
this.gvMx1dab004.Tag = "query_a.dab004";
this.gvMx1dab004.Visible = true;
- this.gvMx1dab004.VisibleIndex = 3;
- this.gvMx1dab004.Width = 94;
+ this.gvMx1dab004.VisibleIndex = 4;
+ this.gvMx1dab004.Width = 89;
//
// gvMx1dab005
//
@@ -1845,8 +1834,8 @@
this.gvMx1dab005.Name = "gvMx1dab005";
this.gvMx1dab005.Tag = "query_a.dab005";
this.gvMx1dab005.Visible = true;
- this.gvMx1dab005.VisibleIndex = 4;
- this.gvMx1dab005.Width = 94;
+ this.gvMx1dab005.VisibleIndex = 5;
+ this.gvMx1dab005.Width = 89;
//
// gvMx1dab006
//
@@ -1857,8 +1846,8 @@
this.gvMx1dab006.Name = "gvMx1dab006";
this.gvMx1dab006.Tag = "query_a.dab006";
this.gvMx1dab006.Visible = true;
- this.gvMx1dab006.VisibleIndex = 5;
- this.gvMx1dab006.Width = 94;
+ this.gvMx1dab006.VisibleIndex = 6;
+ this.gvMx1dab006.Width = 89;
//
// gvMx1dab007
//
@@ -1869,8 +1858,8 @@
this.gvMx1dab007.Name = "gvMx1dab007";
this.gvMx1dab007.Tag = "query_a.dab007";
this.gvMx1dab007.Visible = true;
- this.gvMx1dab007.VisibleIndex = 6;
- this.gvMx1dab007.Width = 94;
+ this.gvMx1dab007.VisibleIndex = 7;
+ this.gvMx1dab007.Width = 89;
//
// gridColumn14
//
@@ -1879,8 +1868,8 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 7;
- this.gridColumn14.Width = 94;
+ this.gridColumn14.VisibleIndex = 8;
+ this.gridColumn14.Width = 89;
//
// gvMx1dab014
//
@@ -1891,8 +1880,8 @@
this.gvMx1dab014.Name = "gvMx1dab014";
this.gvMx1dab014.Tag = "query_a.dab014";
this.gvMx1dab014.Visible = true;
- this.gvMx1dab014.VisibleIndex = 8;
- this.gvMx1dab014.Width = 94;
+ this.gvMx1dab014.VisibleIndex = 9;
+ this.gvMx1dab014.Width = 89;
//
// gridColumn15
//
@@ -1901,8 +1890,8 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 9;
- this.gridColumn15.Width = 94;
+ this.gridColumn15.VisibleIndex = 10;
+ this.gridColumn15.Width = 89;
//
// gridColumn16
//
@@ -1911,8 +1900,8 @@
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 10;
- this.gridColumn16.Width = 94;
+ this.gridColumn16.VisibleIndex = 11;
+ this.gridColumn16.Width = 89;
//
// gvMx1dab012
//
@@ -1923,8 +1912,8 @@
this.gvMx1dab012.Name = "gvMx1dab012";
this.gvMx1dab012.Tag = "query_a.dab012";
this.gvMx1dab012.Visible = true;
- this.gvMx1dab012.VisibleIndex = 11;
- this.gvMx1dab012.Width = 94;
+ this.gvMx1dab012.VisibleIndex = 12;
+ this.gvMx1dab012.Width = 89;
//
// gvMx1dab009
//
@@ -1935,8 +1924,8 @@
this.gvMx1dab009.Name = "gvMx1dab009";
this.gvMx1dab009.Tag = "query_a.dab009";
this.gvMx1dab009.Visible = true;
- this.gvMx1dab009.VisibleIndex = 12;
- this.gvMx1dab009.Width = 94;
+ this.gvMx1dab009.VisibleIndex = 13;
+ this.gvMx1dab009.Width = 246;
//
// gvMx1scrapqty
//
@@ -1967,8 +1956,8 @@
this.gvMx1zyBl.Name = "gvMx1zyBl";
this.gvMx1zyBl.Tag = "query_a.zy_bl";
this.gvMx1zyBl.Visible = true;
- this.gvMx1zyBl.VisibleIndex = 17;
- this.gvMx1zyBl.Width = 94;
+ this.gvMx1zyBl.VisibleIndex = 18;
+ this.gvMx1zyBl.Width = 72;
//
// gvMx1llBl
//
@@ -1979,8 +1968,8 @@
this.gvMx1llBl.Name = "gvMx1llBl";
this.gvMx1llBl.Tag = "query_a.ll_bl";
this.gvMx1llBl.Visible = true;
- this.gvMx1llBl.VisibleIndex = 15;
- this.gvMx1llBl.Width = 94;
+ this.gvMx1llBl.VisibleIndex = 16;
+ this.gvMx1llBl.Width = 58;
//
// gvMx1lpTl
//
@@ -1991,8 +1980,8 @@
this.gvMx1lpTl.Name = "gvMx1lpTl";
this.gvMx1lpTl.Tag = "query_a.lp_tl";
this.gvMx1lpTl.Visible = true;
- this.gvMx1lpTl.VisibleIndex = 16;
- this.gvMx1lpTl.Width = 94;
+ this.gvMx1lpTl.VisibleIndex = 17;
+ this.gvMx1lpTl.Width = 58;
//
// gvMx1dab021
//
@@ -2003,8 +1992,8 @@
this.gvMx1dab021.Name = "gvMx1dab021";
this.gvMx1dab021.Tag = "query_a.dab021";
this.gvMx1dab021.Visible = true;
- this.gvMx1dab021.VisibleIndex = 13;
- this.gvMx1dab021.Width = 94;
+ this.gvMx1dab021.VisibleIndex = 14;
+ this.gvMx1dab021.Width = 58;
//
// gvMx1dab010
//
@@ -2085,8 +2074,18 @@
this.gvMx1dab023.Name = "gvMx1dab023";
this.gvMx1dab023.Tag = "query_a.dab023";
this.gvMx1dab023.Visible = true;
- this.gvMx1dab023.VisibleIndex = 14;
- this.gvMx1dab023.Width = 94;
+ this.gvMx1dab023.VisibleIndex = 15;
+ this.gvMx1dab023.Width = 58;
+ //
+ // gridColumn58
+ //
+ this.gridColumn58.Caption = "棰嗘枡杩涘害";
+ this.gridColumn58.FieldName = "barbl";
+ this.gridColumn58.MinWidth = 25;
+ this.gridColumn58.Name = "gridColumn58";
+ this.gridColumn58.Visible = true;
+ this.gridColumn58.VisibleIndex = 3;
+ this.gridColumn58.Width = 94;
//
// xtraTabPage6
//
@@ -2494,7 +2493,7 @@
// gridColumn62
//
this.gridColumn62.Caption = "鏁版嵁鐘舵��";
- this.gridColumn62.FieldName = "barCodeRemark";
+ this.gridColumn62.FieldName = "bRemark";
this.gridColumn62.MinWidth = 25;
this.gridColumn62.Name = "gridColumn62";
this.gridColumn62.OptionsColumn.ReadOnly = true;
@@ -2844,6 +2843,8 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
+ this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.rptTuoBanNbz});
this.gcMx2.Size = new System.Drawing.Size(1648, 377);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -2868,7 +2869,8 @@
this.gvMx2createDate,
this.gridColumn30,
this.gridColumn31,
- this.gridColumn32});
+ this.gridColumn32,
+ this.gridColumn54});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -3020,6 +3022,27 @@
this.gridColumn32.Visible = true;
this.gridColumn32.VisibleIndex = 11;
this.gridColumn32.Width = 94;
+ //
+ // gridColumn54
+ //
+ this.gridColumn54.Caption = "鍙樻洿鍐呭寘瑁呮暟閲�";
+ this.gridColumn54.ColumnEdit = this.rptTuoBanNbz;
+ this.gridColumn54.MinWidth = 25;
+ this.gridColumn54.Name = "gridColumn54";
+ this.gridColumn54.Visible = true;
+ this.gridColumn54.VisibleIndex = 12;
+ this.gridColumn54.Width = 94;
+ //
+ // rptTuoBanNbz
+ //
+ this.rptTuoBanNbz.AutoHeight = false;
+ editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.rptTuoBanNbz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍙樻洿鍐呭寘瑁呮暟閲�", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.rptTuoBanNbz.Name = "rptTuoBanNbz";
+ this.rptTuoBanNbz.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.rptTuoBanNbz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptTuoBanNbz_ButtonClick);
//
// xtraTabPage3
//
@@ -3245,7 +3268,8 @@
this.gridColumn42,
this.gridColumn43,
this.gridColumn34,
- this.gridColumn35});
+ this.gridColumn35,
+ this.gridColumn55});
this.gvMx3.GridControl = this.gcMx3;
this.gvMx3.Name = "gvMx3";
this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -3338,8 +3362,6 @@
this.gridColumn34.MinWidth = 25;
this.gridColumn34.Name = "gridColumn34";
this.gridColumn34.OptionsColumn.ReadOnly = true;
- this.gridColumn34.Visible = true;
- this.gridColumn34.VisibleIndex = 5;
this.gridColumn34.Width = 94;
//
// gridColumn35
@@ -3350,8 +3372,18 @@
this.gridColumn35.Name = "gridColumn35";
this.gridColumn35.OptionsColumn.ReadOnly = true;
this.gridColumn35.Visible = true;
- this.gridColumn35.VisibleIndex = 6;
+ this.gridColumn35.VisibleIndex = 5;
this.gridColumn35.Width = 94;
+ //
+ // gridColumn55
+ //
+ this.gridColumn55.Caption = "鏁版嵁鐘舵��";
+ this.gridColumn55.FieldName = "bRemark";
+ this.gridColumn55.MinWidth = 25;
+ this.gridColumn55.Name = "gridColumn55";
+ this.gridColumn55.Visible = true;
+ this.gridColumn55.VisibleIndex = 6;
+ this.gridColumn55.Width = 94;
//
// xtraTabPage4
//
@@ -3785,6 +3817,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa025.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa021.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
@@ -3802,16 +3835,17 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa015label)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem48)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem49)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -3859,6 +3893,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptTuoBanNbz)).EndInit();
this.xtraTabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).EndInit();
this.splitMx98.Panel1.ResumeLayout(false);
@@ -3929,7 +3964,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_daa003;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa004;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa008;
- private DevExpress.XtraGrid.Columns.GridColumn gv_daa011;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa010;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa005;
@@ -3937,8 +3971,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa015;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa009;
- private DevExpress.XtraGrid.Columns.GridColumn gv_prepareTime;
- private DevExpress.XtraGrid.Columns.GridColumn gv_daa028;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa016;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa017;
private DevExpress.XtraGrid.Columns.GridColumn gv_mesStartProd;
@@ -4102,10 +4134,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
private DevExpress.XtraDataLayout.DataLayoutControl layMx100;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup4;
private DevExpress.XtraEditors.SimpleButton btnIn;
@@ -4171,5 +4199,15 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn63;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn64;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn65;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptTuoBanNbz;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
+ private DevExpress.XtraEditors.TextEdit txt_daa021;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem49;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn58;
}
}
\ No newline at end of file
--
Gitblit v1.9.3