Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

cdk

10 天以前 ae28c33700e413d5acf60d1e48bbc9870bdef5a5

 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();
@@ -66,12 +72,6 @@
            DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition11 = 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();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -276,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();
@@ -333,8 +335,7 @@
            this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
            this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.rptTuoBanNbz = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -452,6 +453,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();
@@ -499,7 +501,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
            this.xtraTabPage5.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.rptTuoBanNbz)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -2503,7 +2504,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;
@@ -3033,6 +3034,27 @@
            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
            // 
            this.xtraTabPage3.Controls.Add(this.splitMx98);
@@ -3257,7 +3279,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;
@@ -3350,8 +3373,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
@@ -3362,7 +3383,7 @@
            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;
            // 
            // xtraTabPage4
@@ -3745,26 +3766,15 @@
            this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32);
            this.ucBtnPrint101.TabIndex = 0;
            // 
            // gridColumn54
            // gridColumn55
            // 
            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);
            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;
            // 
            // Frm_Womdaa
            // 
@@ -3892,6 +3902,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);
@@ -3939,7 +3950,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
            this.xtraTabPage5.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.rptTuoBanNbz)).EndInit();
            this.ResumeLayout(false);

        }
@@ -4207,5 +4217,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn65;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptTuoBanNbz;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
    }
}