bug
lu
10 天以前 45b0abd8850da515734792f01addd8aa5f18dd62
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -47,10 +47,9 @@
            this.txt_collectBy = new DevExpress.XtraEditors.TextEdit();
            this.txt_barCode = new DevExpress.XtraEditors.TextEdit();
            this.txt_currentBarCode = new DevExpress.XtraEditors.TextEdit();
            this.txt_gwm = new DevExpress.XtraEditors.TextEdit();
            this.txt_gongWei = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_bc = new DevExpress.XtraEditors.TextEdit();
            this.txt_gw = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
            this.txt_sbNo = new DevExpress.XtraEditors.TextEdit();
@@ -67,17 +66,10 @@
            this.layoutControlItem4 = 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.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layShuiJian = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layDianJian = new DevExpress.XtraLayout.LayoutControlItem();
            this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton();
            this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton();
@@ -134,6 +126,12 @@
            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
            this.splitMx1.Panel1.SuspendLayout();
@@ -153,10 +151,9 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_collectBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_currentBarCode.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gwm.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gongWei.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_bc.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gw.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sbNo.Properties)).BeginInit();
@@ -171,17 +168,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).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.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layShuiJian)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit();
            this.panel3.SuspendLayout();
@@ -196,6 +186,12 @@
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            this.SuspendLayout();
            // 
            // splitMx1
@@ -256,10 +252,9 @@
            this.layoutMx1.Controls.Add(this.txt_collectBy);
            this.layoutMx1.Controls.Add(this.txt_barCode);
            this.layoutMx1.Controls.Add(this.txt_currentBarCode);
            this.layoutMx1.Controls.Add(this.txt_gwm);
            this.layoutMx1.Controls.Add(this.txt_gongWei);
            this.layoutMx1.Controls.Add(this.txt_itemNo);
            this.layoutMx1.Controls.Add(this.txt_bc);
            this.layoutMx1.Controls.Add(this.txt_gw);
            this.layoutMx1.Controls.Add(this.txt_itemName);
            this.layoutMx1.Controls.Add(this.txt_itemModel);
            this.layoutMx1.Controls.Add(this.txt_sbNo);
@@ -326,17 +321,17 @@
            this.txt_currentBarCode.StyleController = this.layoutMx1;
            this.txt_currentBarCode.TabIndex = 8;
            // 
            // txt_gwm
            // txt_gongWei
            // 
            this.txt_gwm.Location = new System.Drawing.Point(111, 152);
            this.txt_gwm.Name = "txt_gwm";
            this.txt_gwm.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
            this.txt_gwm.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(78)))), ((int)(((byte)(138)))), ((int)(((byte)(200)))));
            this.txt_gwm.Properties.Appearance.Options.UseFont = true;
            this.txt_gwm.Properties.Appearance.Options.UseForeColor = true;
            this.txt_gwm.Size = new System.Drawing.Size(99, 24);
            this.txt_gwm.StyleController = this.layoutMx1;
            this.txt_gwm.TabIndex = 9;
            this.txt_gongWei.Location = new System.Drawing.Point(111, 152);
            this.txt_gongWei.Name = "txt_gongWei";
            this.txt_gongWei.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
            this.txt_gongWei.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(78)))), ((int)(((byte)(138)))), ((int)(((byte)(200)))));
            this.txt_gongWei.Properties.Appearance.Options.UseFont = true;
            this.txt_gongWei.Properties.Appearance.Options.UseForeColor = true;
            this.txt_gongWei.Size = new System.Drawing.Size(99, 24);
            this.txt_gongWei.StyleController = this.layoutMx1;
            this.txt_gongWei.TabIndex = 9;
            // 
            // txt_itemNo
            // 
@@ -356,18 +351,9 @@
            this.txt_bc.StyleController = this.layoutMx1;
            this.txt_bc.TabIndex = 11;
            // 
            // txt_gw
            //
            this.txt_gw.Location = new System.Drawing.Point(313, 68);
            this.txt_gw.Name = "txt_gw";
            this.txt_gw.Properties.ReadOnly = true;
            this.txt_gw.Size = new System.Drawing.Size(99, 24);
            this.txt_gw.StyleController = this.layoutMx1;
            this.txt_gw.TabIndex = 12;
            //
            // txt_itemName
            // 
            this.txt_itemName.Location = new System.Drawing.Point(515, 12);
            this.txt_itemName.Location = new System.Drawing.Point(515, 40);
            this.txt_itemName.Name = "txt_itemName";
            this.txt_itemName.Properties.ReadOnly = true;
            this.txt_itemName.Size = new System.Drawing.Size(99, 24);
@@ -376,16 +362,16 @@
            // 
            // txt_itemModel
            // 
            this.txt_itemModel.Location = new System.Drawing.Point(717, 12);
            this.txt_itemModel.Location = new System.Drawing.Point(515, 12);
            this.txt_itemModel.Name = "txt_itemModel";
            this.txt_itemModel.Properties.ReadOnly = true;
            this.txt_itemModel.Size = new System.Drawing.Size(99, 24);
            this.txt_itemModel.Size = new System.Drawing.Size(301, 24);
            this.txt_itemModel.StyleController = this.layoutMx1;
            this.txt_itemModel.TabIndex = 14;
            // 
            // txt_sbNo
            // 
            this.txt_sbNo.Location = new System.Drawing.Point(515, 68);
            this.txt_sbNo.Location = new System.Drawing.Point(313, 68);
            this.txt_sbNo.Name = "txt_sbNo";
            this.txt_sbNo.Properties.ReadOnly = true;
            this.txt_sbNo.Size = new System.Drawing.Size(99, 24);
@@ -394,7 +380,7 @@
            // 
            // txt_sjXt
            // 
            this.txt_sjXt.Location = new System.Drawing.Point(515, 40);
            this.txt_sjXt.Location = new System.Drawing.Point(515, 68);
            this.txt_sjXt.Name = "txt_sjXt";
            this.txt_sjXt.Properties.ReadOnly = true;
            this.txt_sjXt.Size = new System.Drawing.Size(99, 24);
@@ -461,18 +447,17 @@
            this.layoutControlItem4,
            this.layoutControlItem7,
            this.layoutControlItem8,
            this.layoutControlItem9,
            this.layoutControlItem10,
            this.layoutControlItem12,
            this.layoutControlItem14,
            this.layoutControlItem15,
            this.layoutControlItem5,
            this.layShuiJian,
            this.layoutControlItem16,
            this.layoutControlItem17,
            this.layDianJian,
            this.layoutControlItem12,
            this.layoutControlItem15,
            this.layoutControlItem14,
            this.layoutControlItem13,
            this.layoutControlItem11,
            this.layDianJian});
            this.layoutControlItem10,
            this.layoutControlItem11});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -572,60 +557,6 @@
            this.layoutControlItem8.Text = "班次";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem9
            //
            this.layoutControlItem9.Control = this.txt_gw;
            this.layoutControlItem9.Location = new System.Drawing.Point(202, 56);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem9.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem9.Text = "工位";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(87, 18);
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.txt_itemName;
            this.layoutControlItem10.Location = new System.Drawing.Point(404, 0);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem10.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem10.Text = "产品名称";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
            //
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_sbNo;
            this.layoutControlItem12.Location = new System.Drawing.Point(404, 56);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem12.Text = "设备编码";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(87, 18);
            //
            // layoutControlItem14
            //
            this.layoutControlItem14.Control = this.txt_yjDate;
            this.layoutControlItem14.Location = new System.Drawing.Point(606, 28);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem14.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem14.Text = "Mes计划开工";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(87, 18);
            //
            // layoutControlItem15
            //
            this.layoutControlItem15.Control = this.txt_sjDate;
            this.layoutControlItem15.Location = new System.Drawing.Point(606, 56);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem15.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem15.Text = "Mes实际开工";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(87, 18);
            //
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_currentBarCode;
@@ -639,7 +570,7 @@
            // 
            // layShuiJian
            // 
            this.layShuiJian.Control = this.txt_gwm;
            this.layShuiJian.Control = this.txt_gongWei;
            this.layShuiJian.Location = new System.Drawing.Point(0, 140);
            this.layShuiJian.Name = "layShuiJian";
            this.layShuiJian.OptionsTableLayoutItem.RowIndex = 5;
@@ -678,28 +609,6 @@
            this.layoutControlItem17.Text = "不良品按钮";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem17.TextVisible = false;
            //
            // layoutControlItem13
            //
            this.layoutControlItem13.Control = this.txt_sjXt;
            this.layoutControlItem13.CustomizationFormText = "生产线别";
            this.layoutControlItem13.Location = new System.Drawing.Point(404, 28);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem13.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem13.Text = "生产线别";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(87, 18);
            //
            // layoutControlItem11
            //
            this.layoutControlItem11.Control = this.txt_itemModel;
            this.layoutControlItem11.Location = new System.Drawing.Point(606, 0);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem11.Text = "产品规格";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layDianJian
            // 
@@ -1296,6 +1205,73 @@
            this.gridColumn25.VisibleIndex = 12;
            this.gridColumn25.Width = 94;
            // 
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_sbNo;
            this.layoutControlItem12.Location = new System.Drawing.Point(202, 56);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem12.Text = "设备编码";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(87, 18);
            //
            // layoutControlItem15
            //
            this.layoutControlItem15.Control = this.txt_sjDate;
            this.layoutControlItem15.Location = new System.Drawing.Point(606, 56);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem15.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem15.Text = "Mes实际开工";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(87, 18);
            //
            // layoutControlItem14
            //
            this.layoutControlItem14.Control = this.txt_yjDate;
            this.layoutControlItem14.Location = new System.Drawing.Point(606, 28);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem14.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem14.Text = "Mes计划开工";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(87, 18);
            //
            // layoutControlItem13
            //
            this.layoutControlItem13.Control = this.txt_sjXt;
            this.layoutControlItem13.CustomizationFormText = "生产线别";
            this.layoutControlItem13.Location = new System.Drawing.Point(404, 56);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem13.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem13.Text = "生产线别";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(87, 18);
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.txt_itemName;
            this.layoutControlItem10.Location = new System.Drawing.Point(404, 28);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem10.Text = "产品名称";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
            //
            // layoutControlItem11
            //
            this.layoutControlItem11.Control = this.txt_itemModel;
            this.layoutControlItem11.Location = new System.Drawing.Point(404, 0);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(404, 28);
            this.layoutControlItem11.Text = "产品规格";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18);
            //
            // Frm_Work01
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1327,10 +1303,9 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_collectBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_currentBarCode.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gwm.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gongWei.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_bc.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gw.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sbNo.Properties)).EndInit();
@@ -1345,17 +1320,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).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.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layShuiJian)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit();
            this.panel3.ResumeLayout(false);
@@ -1374,6 +1342,12 @@
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            this.ResumeLayout(false);
        }
@@ -1403,14 +1377,13 @@
        private DevExpress.XtraEditors.TextEdit txt_collectBy;
        private DevExpress.XtraEditors.TextEdit txt_barCode;
        private DevExpress.XtraEditors.TextEdit txt_currentBarCode;
        private DevExpress.XtraEditors.TextEdit txt_gwm;
        private DevExpress.XtraEditors.TextEdit txt_gongWei;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraEditors.TextEdit txt_itemNo;
        private DevExpress.XtraEditors.TextEdit txt_bc;
        private DevExpress.XtraEditors.TextEdit txt_gw;
        private DevExpress.XtraEditors.TextEdit txt_itemName;
        private DevExpress.XtraEditors.TextEdit txt_itemModel;
        private DevExpress.XtraEditors.TextEdit txt_sbNo;
@@ -1419,11 +1392,6 @@
        private DevExpress.XtraEditors.TextEdit txt_sjDate;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraEditors.SimpleButton btnGood;
        private DevExpress.XtraEditors.SimpleButton btnBad;
        private System.Windows.Forms.Panel panel3;
@@ -1448,8 +1416,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layShuiJian;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
@@ -1475,5 +1441,11 @@
        private DevExpress.XtraLayout.LayoutControlItem layDianJian;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
    }
}