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

cnf

2025-07-24 262746cb15ee6779f24adeca62eded6389df6ef9

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs

@@ -155,6 +155,9 @@
            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
@@ -174,9 +177,7 @@
            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -1651,6 +1652,30 @@
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
            // 
            // gridColumn29
            // 
            this.gridColumn29.Caption = "仓库编码";
            this.gridColumn29.FieldName = "depotCode";
            this.gridColumn29.Name = "gridColumn29";
            this.gridColumn29.Visible = true;
            this.gridColumn29.VisibleIndex = 13;
            // 
            // gridColumn30
            // 
            this.gridColumn30.Caption = "仓库名称";
            this.gridColumn30.FieldName = "depotName";
            this.gridColumn30.Name = "gridColumn30";
            this.gridColumn30.Visible = true;
            this.gridColumn30.VisibleIndex = 14;
            // 
            // gridColumn31
            // 
            this.gridColumn31.Caption = "仓管员";
            this.gridColumn31.FieldName = "staffName";
            this.gridColumn31.Name = "gridColumn31";
            this.gridColumn31.Visible = true;
            this.gridColumn31.VisibleIndex = 15;
            // 
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
@@ -1705,7 +1730,8 @@
            this.gridColumn17,
            this.gridColumn22,
            this.gridColumn23,
            this.gridColumn24});
            this.gridColumn24,
            this.gridColumn32});
            this.gvMx2.DetailHeight = 272;
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
@@ -1850,29 +1876,13 @@
            this.gridColumn24.VisibleIndex = 11;
            this.gridColumn24.Width = 82;
            // 
            // gridColumn29
            // gridColumn32
            // 
            this.gridColumn29.Caption = "仓库编码";
            this.gridColumn29.FieldName = "depotCode";
            this.gridColumn29.Name = "gridColumn29";
            this.gridColumn29.Visible = true;
            this.gridColumn29.VisibleIndex = 13;
            // 
            // gridColumn30
            // 
            this.gridColumn30.Caption = "仓库名称";
            this.gridColumn30.FieldName = "depotName";
            this.gridColumn30.Name = "gridColumn30";
            this.gridColumn30.Visible = true;
            this.gridColumn30.VisibleIndex = 14;
            // 
            // gridColumn31
            // 
            this.gridColumn31.Caption = "仓管员";
            this.gridColumn31.FieldName = "staffName";
            this.gridColumn31.Name = "gridColumn31";
            this.gridColumn31.Visible = true;
            this.gridColumn31.VisibleIndex = 15;
            this.gridColumn32.Caption = "入库类型";
            this.gridColumn32.FieldName = "cgrkType";
            this.gridColumn32.Name = "gridColumn32";
            this.gridColumn32.Visible = true;
            this.gridColumn32.VisibleIndex = 12;
            // 
            // Frm_ArrivalBarcode
            // 
@@ -2108,5 +2118,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
    }
}