到货单版本冲突

lu

5 天以前 c2e1de823e648ca7e62bc868d8aaf9ad5c65a287

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs

@@ -56,6 +56,7 @@
            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_parentId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -80,7 +81,6 @@
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -242,8 +242,6 @@
            this.gv_departmentid.OptionsColumn.AllowEdit = false;
            this.gv_departmentid.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_departmentid.Tag = "query_a.departmentid";
            this.gv_departmentid.Visible = true;
            this.gv_departmentid.VisibleIndex = 9;
            this.gv_departmentid.Width = 94;
            // 
            // gv_departmentcode
@@ -298,8 +296,6 @@
            this.gv_depextr2.OptionsColumn.AllowEdit = false;
            this.gv_depextr2.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_depextr2.Tag = "query_a.depextr2";
            this.gv_depextr2.Visible = true;
            this.gv_depextr2.VisibleIndex = 4;
            this.gv_depextr2.Width = 100;
            // 
            // gv_depextr3
@@ -312,8 +308,6 @@
            this.gv_depextr3.OptionsColumn.AllowEdit = false;
            this.gv_depextr3.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_depextr3.Tag = "query_a.depextr3";
            this.gv_depextr3.Visible = true;
            this.gv_depextr3.VisibleIndex = 5;
            this.gv_depextr3.Width = 94;
            // 
            // gv_depextr4
@@ -327,7 +321,7 @@
            this.gv_depextr4.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_depextr4.Tag = "query_a.depextr4";
            this.gv_depextr4.Visible = true;
            this.gv_depextr4.VisibleIndex = 6;
            this.gv_depextr4.VisibleIndex = 4;
            this.gv_depextr4.Width = 50;
            // 
            // gv_remark
@@ -341,7 +335,7 @@
            this.gv_remark.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_remark.Tag = "query_a.remark";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 7;
            this.gv_remark.VisibleIndex = 5;
            this.gv_remark.Width = 94;
            // 
            // gv_parentId
@@ -355,7 +349,7 @@
            this.gv_parentId.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_parentId.Tag = "query_c.Departmentname";
            this.gv_parentId.Visible = true;
            this.gv_parentId.VisibleIndex = 8;
            this.gv_parentId.VisibleIndex = 6;
            this.gv_parentId.Width = 150;
            // 
            // gridColumn1
@@ -366,8 +360,16 @@
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Tag = "query_a.lastupdate_date";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 10;
            this.gridColumn1.VisibleIndex = 7;
            this.gridColumn1.Width = 180;
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "主键Guid";
            this.gridColumn2.FieldName = "guid";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Width = 94;
            // 
            // pageBar1
            // 
@@ -645,14 +647,6 @@
            this.layoutControlItem10.Size = new System.Drawing.Size(225, 40);
            this.layoutControlItem10.Text = "WIP仓库";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "主键Guid";
            this.gridColumn2.FieldName = "guid";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Width = 94;
            // 
            // Frm_Department
            //