iqc
lu
2024-11-04 0a74392a5eba77891c9310413f19c099a4580d82
iqc
已修改22个文件
1909 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs 129 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs 523 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs 89 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.Designer.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.resx 247 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs 495 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs
@@ -43,7 +43,6 @@
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_workName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.weekdayName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -79,7 +78,7 @@
            this.gv_createTime.Name = "gv_createTime";
            this.gv_createTime.OptionsColumn.AllowEdit = false;
            this.gv_createTime.Visible = true;
            this.gv_createTime.VisibleIndex = 9;
            this.gv_createTime.VisibleIndex = 8;
            this.gv_createTime.Width = 94;
            // 
            // gv_createBy
@@ -92,7 +91,7 @@
            this.gv_createBy.Name = "gv_createBy";
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.Visible = true;
            this.gv_createBy.VisibleIndex = 8;
            this.gv_createBy.VisibleIndex = 7;
            this.gv_createBy.Width = 94;
            // 
            // gv_isStatus
@@ -105,7 +104,7 @@
            this.gv_isStatus.Name = "gv_isStatus";
            this.gv_isStatus.OptionsColumn.AllowEdit = false;
            this.gv_isStatus.Visible = true;
            this.gv_isStatus.VisibleIndex = 6;
            this.gv_isStatus.VisibleIndex = 5;
            this.gv_isStatus.Width = 94;
            // 
            // lb_time2
@@ -129,7 +128,7 @@
            this.gv_time2.Name = "gv_time2";
            this.gv_time2.OptionsColumn.AllowEdit = false;
            this.gv_time2.Visible = true;
            this.gv_time2.VisibleIndex = 4;
            this.gv_time2.VisibleIndex = 3;
            this.gv_time2.Width = 94;
            // 
            // lb_time1
@@ -153,7 +152,7 @@
            this.gv_time1.Name = "gv_time1";
            this.gv_time1.OptionsColumn.AllowEdit = false;
            this.gv_time1.Visible = true;
            this.gv_time1.VisibleIndex = 3;
            this.gv_time1.VisibleIndex = 2;
            this.gv_time1.Width = 94;
            // 
            // lb_name
@@ -187,7 +186,7 @@
            this.gv_name.Name = "gv_name";
            this.gv_name.OptionsColumn.AllowEdit = false;
            this.gv_name.Visible = true;
            this.gv_name.VisibleIndex = 2;
            this.gv_name.VisibleIndex = 1;
            this.gv_name.Width = 94;
            // 
            // toolBarMenu1
@@ -221,7 +220,6 @@
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_factory,
            this.gv_workName,
            this.gv_name,
            this.gv_time1,
@@ -238,17 +236,6 @@
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gv_factory
            //
            this.gv_factory.Caption = "工厂";
            this.gv_factory.FieldName = "factory";
            this.gv_factory.MinWidth = 25;
            this.gv_factory.Name = "gv_factory";
            this.gv_factory.OptionsColumn.AllowEdit = false;
            this.gv_factory.Visible = true;
            this.gv_factory.VisibleIndex = 0;
            this.gv_factory.Width = 94;
            //
            // gv_workName
            // 
            this.gv_workName.Caption = "产线名称";
@@ -257,7 +244,7 @@
            this.gv_workName.Name = "gv_workName";
            this.gv_workName.OptionsColumn.AllowEdit = false;
            this.gv_workName.Visible = true;
            this.gv_workName.VisibleIndex = 1;
            this.gv_workName.VisibleIndex = 0;
            this.gv_workName.Width = 94;
            // 
            // weekdayName
@@ -268,7 +255,7 @@
            this.weekdayName.Name = "weekdayName";
            this.weekdayName.OptionsColumn.AllowEdit = false;
            this.weekdayName.Visible = true;
            this.weekdayName.VisibleIndex = 5;
            this.weekdayName.VisibleIndex = 4;
            this.weekdayName.Width = 94;
            // 
            // gridColumn1
@@ -279,7 +266,7 @@
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.AllowEdit = false;
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 7;
            this.gridColumn1.VisibleIndex = 6;
            this.gridColumn1.Width = 94;
            // 
            // xtraTabControl1
@@ -461,7 +448,6 @@
        private DevExpress.XtraEditors.LabelControl labelControl8;
        private DevExpress.XtraEditors.LookUpEdit txt_workshopNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_workName;
        private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
    }
}
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -134,7 +134,7 @@
            this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_factory = new DevExpress.XtraEditors.LabelControl();
            this.txt_factory = new DevExpress.XtraEditors.TextEdit();
            this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -1357,21 +1357,21 @@
            this.txt_factory.TabIndex = 211;
            this.txt_factory.Tag = "factory";
            // 
            // gv_factory
            // gv_id
            // 
            this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_factory.AppearanceCell.Options.UseFont = true;
            this.gv_factory.Caption = "工厂";
            this.gv_factory.FieldName = "factory";
            this.gv_factory.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gv_factory.MinWidth = 80;
            this.gv_factory.Name = "gv_factory";
            this.gv_factory.OptionsColumn.AllowEdit = false;
            this.gv_factory.OptionsColumn.ReadOnly = true;
            this.gv_factory.Tag = "query_a.factory";
            this.gv_factory.Visible = true;
            this.gv_factory.VisibleIndex = 0;
            this.gv_factory.Width = 94;
            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_id.AppearanceCell.Options.UseFont = true;
            this.gv_id.Caption = "物料ID";
            this.gv_id.FieldName = "id";
            this.gv_id.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gv_id.MinWidth = 80;
            this.gv_id.Name = "gv_id";
            this.gv_id.OptionsColumn.AllowEdit = false;
            this.gv_id.OptionsColumn.ReadOnly = true;
            this.gv_id.Tag = "query_a.factory";
            this.gv_id.Visible = true;
            this.gv_id.VisibleIndex = 0;
            this.gv_id.Width = 94;
            // 
            // toolBarMenu1
            // 
@@ -1409,7 +1409,7 @@
            this.gridView1.Appearance.Row.Options.UseTextOptions = true;
            this.gridView1.Appearance.Row.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_factory,
            this.gv_id,
            this.gv_itemNo,
            this.gv_itemName,
            this.gv_itemModel,
@@ -1584,6 +1584,7 @@
            this.labelControl11.Size = new System.Drawing.Size(45, 18);
            this.labelControl11.TabIndex = 130;
            this.labelControl11.Text = "主键:";
            this.labelControl11.Visible = false;
            // 
            // lbGuid
            // 
@@ -1592,6 +1593,7 @@
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            // 
            // txt_itemName
            // 
@@ -1836,7 +1838,7 @@
        private DevExpress.XtraEditors.LabelControl lb_factory;
        private DevExpress.XtraEditors.TextEdit txt_factory;
        private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
        private DevExpress.XtraEditors.MemoEdit txt_itemName;
        private DevExpress.XtraEditors.MemoEdit txt_itemModel;
        private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs
@@ -349,7 +349,7 @@
            // 
            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_id.AppearanceCell.Options.UseFont = true;
            this.gv_id.Caption = "id ";
            this.gv_id.Caption = "岗位ID";
            this.gv_id.FieldName = "id";
            this.gv_id.MinWidth = 50;
            this.gv_id.Name = "gv_id";
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
@@ -62,9 +62,6 @@
            this.lb_fnumber = new DevExpress.XtraEditors.LabelControl();
            this.txt_fnumber = new DevExpress.XtraEditors.TextEdit();
            this.gv_fnumber = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_factory = new DevExpress.XtraEditors.LabelControl();
            this.txt_factory = new DevExpress.XtraEditors.TextEdit();
            this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_lastupdate_by = new DevExpress.XtraEditors.LabelControl();
            this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
            this.lb_lastupdate_date = new DevExpress.XtraEditors.LabelControl();
@@ -109,7 +106,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_funitgroupid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fname.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fnumber.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
@@ -132,7 +128,7 @@
            // 
            this.lb_fforbidstatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fforbidstatus.Appearance.Options.UseFont = true;
            this.lb_fforbidstatus.Location = new System.Drawing.Point(533, 208);
            this.lb_fforbidstatus.Location = new System.Drawing.Point(283, 286);
            this.lb_fforbidstatus.Name = "lb_fforbidstatus";
            this.lb_fforbidstatus.Size = new System.Drawing.Size(85, 21);
            this.lb_fforbidstatus.TabIndex = 298;
@@ -140,7 +136,7 @@
            // 
            // txt_fforbidstatus
            // 
            this.txt_fforbidstatus.Location = new System.Drawing.Point(618, 204);
            this.txt_fforbidstatus.Location = new System.Drawing.Point(368, 282);
            this.txt_fforbidstatus.Name = "txt_fforbidstatus";
            this.txt_fforbidstatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fforbidstatus.Properties.Appearance.Options.UseFont = true;
@@ -158,22 +154,22 @@
            this.gv_fforbidstatus.OptionsColumn.AllowEdit = false;
            this.gv_fforbidstatus.Tag = "query_a.fforbidstatus";
            this.gv_fforbidstatus.Visible = true;
            this.gv_fforbidstatus.VisibleIndex = 16;
            this.gv_fforbidstatus.VisibleIndex = 15;
            this.gv_fforbidstatus.Width = 94;
            // 
            // lb_fdescription
            // 
            this.lb_fdescription.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fdescription.Appearance.Options.UseFont = true;
            this.lb_fdescription.Location = new System.Drawing.Point(315, 247);
            this.lb_fdescription.Location = new System.Drawing.Point(13, 283);
            this.lb_fdescription.Name = "lb_fdescription";
            this.lb_fdescription.Size = new System.Drawing.Size(51, 21);
            this.lb_fdescription.Size = new System.Drawing.Size(85, 21);
            this.lb_fdescription.TabIndex = 291;
            this.lb_fdescription.Text = "描述:";
            this.lb_fdescription.Text = "单位描述:";
            // 
            // txt_fdescription
            // 
            this.txt_fdescription.Location = new System.Drawing.Point(368, 243);
            this.txt_fdescription.Location = new System.Drawing.Point(100, 279);
            this.txt_fdescription.Name = "txt_fdescription";
            this.txt_fdescription.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fdescription.Properties.Appearance.Options.UseFont = true;
@@ -191,18 +187,18 @@
            this.gv_fdescription.OptionsColumn.AllowEdit = false;
            this.gv_fdescription.Tag = "query_a.fdescription";
            this.gv_fdescription.Visible = true;
            this.gv_fdescription.VisibleIndex = 15;
            this.gv_fdescription.VisibleIndex = 14;
            this.gv_fdescription.Width = 94;
            // 
            // lb_fprecision
            // 
            this.lb_fprecision.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fprecision.Appearance.Options.UseFont = true;
            this.lb_fprecision.Location = new System.Drawing.Point(47, 247);
            this.lb_fprecision.Location = new System.Drawing.Point(13, 247);
            this.lb_fprecision.Name = "lb_fprecision";
            this.lb_fprecision.Size = new System.Drawing.Size(51, 21);
            this.lb_fprecision.Size = new System.Drawing.Size(85, 21);
            this.lb_fprecision.TabIndex = 285;
            this.lb_fprecision.Text = "精度:";
            this.lb_fprecision.Text = "单位精度:";
            // 
            // txt_fprecision
            // 
@@ -264,7 +260,7 @@
            // 
            this.lb_fbaseunit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fbaseunit.Appearance.Options.UseFont = true;
            this.lb_fbaseunit.Location = new System.Drawing.Point(281, 85);
            this.lb_fbaseunit.Location = new System.Drawing.Point(283, 85);
            this.lb_fbaseunit.Name = "lb_fbaseunit";
            this.lb_fbaseunit.Size = new System.Drawing.Size(85, 21);
            this.lb_fbaseunit.TabIndex = 273;
@@ -297,7 +293,7 @@
            // 
            this.lb_fconvertnumerator.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fconvertnumerator.Appearance.Options.UseFont = true;
            this.lb_fconvertnumerator.Location = new System.Drawing.Point(13, 85);
            this.lb_fconvertnumerator.Location = new System.Drawing.Point(13, 126);
            this.lb_fconvertnumerator.Name = "lb_fconvertnumerator";
            this.lb_fconvertnumerator.Size = new System.Drawing.Size(85, 21);
            this.lb_fconvertnumerator.TabIndex = 267;
@@ -305,7 +301,7 @@
            // 
            // txt_fconvertnumerator
            // 
            this.txt_fconvertnumerator.Location = new System.Drawing.Point(98, 81);
            this.txt_fconvertnumerator.Location = new System.Drawing.Point(98, 122);
            this.txt_fconvertnumerator.Name = "txt_fconvertnumerator";
            this.txt_fconvertnumerator.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fconvertnumerator.Properties.Appearance.Options.UseFont = true;
@@ -330,7 +326,7 @@
            // 
            this.lb_fcurrentunitid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fcurrentunitid.Appearance.Options.UseFont = true;
            this.lb_fcurrentunitid.Location = new System.Drawing.Point(6, 163);
            this.lb_fcurrentunitid.Location = new System.Drawing.Point(13, 204);
            this.lb_fcurrentunitid.Name = "lb_fcurrentunitid";
            this.lb_fcurrentunitid.Size = new System.Drawing.Size(85, 21);
            this.lb_fcurrentunitid.TabIndex = 262;
@@ -338,7 +334,7 @@
            // 
            // txt_fcurrentunitid
            // 
            this.txt_fcurrentunitid.Location = new System.Drawing.Point(98, 159);
            this.txt_fcurrentunitid.Location = new System.Drawing.Point(98, 200);
            this.txt_fcurrentunitid.Name = "txt_fcurrentunitid";
            this.txt_fcurrentunitid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fcurrentunitid.Properties.Appearance.Options.UseFont = true;
@@ -429,11 +425,11 @@
            // 
            this.lb_fname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fname.Appearance.Options.UseFont = true;
            this.lb_fname.Location = new System.Drawing.Point(315, 43);
            this.lb_fname.Location = new System.Drawing.Point(283, 43);
            this.lb_fname.Name = "lb_fname";
            this.lb_fname.Size = new System.Drawing.Size(51, 21);
            this.lb_fname.Size = new System.Drawing.Size(85, 21);
            this.lb_fname.TabIndex = 247;
            this.lb_fname.Text = "名称:";
            this.lb_fname.Text = "单位名称:";
            // 
            // txt_fname
            // 
@@ -462,15 +458,15 @@
            // 
            this.lb_fnumber.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fnumber.Appearance.Options.UseFont = true;
            this.lb_fnumber.Location = new System.Drawing.Point(47, 43);
            this.lb_fnumber.Location = new System.Drawing.Point(13, 84);
            this.lb_fnumber.Name = "lb_fnumber";
            this.lb_fnumber.Size = new System.Drawing.Size(51, 21);
            this.lb_fnumber.Size = new System.Drawing.Size(85, 21);
            this.lb_fnumber.TabIndex = 243;
            this.lb_fnumber.Text = "编码:";
            this.lb_fnumber.Text = "单位编码:";
            // 
            // txt_fnumber
            // 
            this.txt_fnumber.Location = new System.Drawing.Point(98, 39);
            this.txt_fnumber.Location = new System.Drawing.Point(98, 80);
            this.txt_fnumber.Name = "txt_fnumber";
            this.txt_fnumber.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fnumber.Properties.Appearance.Options.UseFont = true;
@@ -491,44 +487,11 @@
            this.gv_fnumber.VisibleIndex = 1;
            this.gv_fnumber.Width = 94;
            // 
            // lb_factory
            //
            this.lb_factory.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_factory.Appearance.Options.UseFont = true;
            this.lb_factory.Location = new System.Drawing.Point(13, 207);
            this.lb_factory.Name = "lb_factory";
            this.lb_factory.Size = new System.Drawing.Size(85, 21);
            this.lb_factory.TabIndex = 240;
            this.lb_factory.Text = "工厂编号:";
            //
            // txt_factory
            //
            this.txt_factory.Location = new System.Drawing.Point(98, 203);
            this.txt_factory.Name = "txt_factory";
            this.txt_factory.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_factory.Properties.Appearance.Options.UseFont = true;
            this.txt_factory.Size = new System.Drawing.Size(150, 28);
            this.txt_factory.TabIndex = 240;
            //
            // gv_factory
            //
            this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_factory.AppearanceCell.Options.UseFont = true;
            this.gv_factory.Caption = "工厂";
            this.gv_factory.FieldName = "factory";
            this.gv_factory.MinWidth = 50;
            this.gv_factory.Name = "gv_factory";
            this.gv_factory.OptionsColumn.AllowEdit = false;
            this.gv_factory.Tag = "query_a.factory";
            this.gv_factory.Visible = true;
            this.gv_factory.VisibleIndex = 0;
            this.gv_factory.Width = 94;
            //
            // lb_lastupdate_by
            // 
            this.lb_lastupdate_by.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lastupdate_by.Appearance.Options.UseFont = true;
            this.lb_lastupdate_by.Location = new System.Drawing.Point(298, 283);
            this.lb_lastupdate_by.Location = new System.Drawing.Point(300, 204);
            this.lb_lastupdate_by.Name = "lb_lastupdate_by";
            this.lb_lastupdate_by.Size = new System.Drawing.Size(68, 21);
            this.lb_lastupdate_by.TabIndex = 231;
@@ -536,7 +499,7 @@
            // 
            // txt_lastupdateBy
            // 
            this.txt_lastupdateBy.Location = new System.Drawing.Point(368, 279);
            this.txt_lastupdateBy.Location = new System.Drawing.Point(368, 200);
            this.txt_lastupdateBy.Name = "txt_lastupdateBy";
            this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
@@ -547,7 +510,7 @@
            // 
            this.lb_lastupdate_date.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lastupdate_date.Appearance.Options.UseFont = true;
            this.lb_lastupdate_date.Location = new System.Drawing.Point(8, 283);
            this.lb_lastupdate_date.Location = new System.Drawing.Point(278, 247);
            this.lb_lastupdate_date.Name = "lb_lastupdate_date";
            this.lb_lastupdate_date.Size = new System.Drawing.Size(90, 21);
            this.lb_lastupdate_date.TabIndex = 228;
@@ -555,7 +518,7 @@
            // 
            // txt_lastupdateDate
            // 
            this.txt_lastupdateDate.Location = new System.Drawing.Point(98, 279);
            this.txt_lastupdateDate.Location = new System.Drawing.Point(368, 243);
            this.txt_lastupdateDate.Name = "txt_lastupdateDate";
            this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
@@ -566,7 +529,7 @@
            // 
            this.lb_create_by.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_create_by.Appearance.Options.UseFont = true;
            this.lb_create_by.Location = new System.Drawing.Point(550, 249);
            this.lb_create_by.Location = new System.Drawing.Point(550, 204);
            this.lb_create_by.Name = "lb_create_by";
            this.lb_create_by.Size = new System.Drawing.Size(68, 21);
            this.lb_create_by.TabIndex = 226;
@@ -574,7 +537,7 @@
            // 
            // txt_createBy
            // 
            this.txt_createBy.Location = new System.Drawing.Point(618, 245);
            this.txt_createBy.Location = new System.Drawing.Point(618, 200);
            this.txt_createBy.Name = "txt_createBy";
            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
@@ -585,7 +548,7 @@
            // 
            this.lb_create_date.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_create_date.Appearance.Options.UseFont = true;
            this.lb_create_date.Location = new System.Drawing.Point(533, 283);
            this.lb_create_date.Location = new System.Drawing.Point(533, 247);
            this.lb_create_date.Name = "lb_create_date";
            this.lb_create_date.Size = new System.Drawing.Size(85, 21);
            this.lb_create_date.TabIndex = 222;
@@ -593,7 +556,7 @@
            // 
            // txt_createDate
            // 
            this.txt_createDate.Location = new System.Drawing.Point(618, 279);
            this.txt_createDate.Location = new System.Drawing.Point(618, 243);
            this.txt_createDate.Name = "txt_createDate";
            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
@@ -604,7 +567,7 @@
            // 
            this.lb_newqty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_newqty.Appearance.Options.UseFont = true;
            this.lb_newqty.Location = new System.Drawing.Point(247, 164);
            this.lb_newqty.Location = new System.Drawing.Point(249, 164);
            this.lb_newqty.Name = "lb_newqty";
            this.lb_newqty.Size = new System.Drawing.Size(119, 21);
            this.lb_newqty.TabIndex = 219;
@@ -637,7 +600,7 @@
            // 
            this.lb_oldqty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_oldqty.Appearance.Options.UseFont = true;
            this.lb_oldqty.Location = new System.Drawing.Point(264, 125);
            this.lb_oldqty.Location = new System.Drawing.Point(266, 125);
            this.lb_oldqty.Name = "lb_oldqty";
            this.lb_oldqty.Size = new System.Drawing.Size(102, 21);
            this.lb_oldqty.TabIndex = 217;
@@ -703,7 +666,7 @@
            // 
            this.lb_oldunit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_oldunit.Appearance.Options.UseFont = true;
            this.lb_oldunit.Location = new System.Drawing.Point(30, 125);
            this.lb_oldunit.Location = new System.Drawing.Point(30, 166);
            this.lb_oldunit.Name = "lb_oldunit";
            this.lb_oldunit.Size = new System.Drawing.Size(68, 21);
            this.lb_oldunit.TabIndex = 213;
@@ -711,7 +674,7 @@
            // 
            // txt_oldunit
            // 
            this.txt_oldunit.Location = new System.Drawing.Point(98, 121);
            this.txt_oldunit.Location = new System.Drawing.Point(98, 162);
            this.txt_oldunit.Name = "txt_oldunit";
            this.txt_oldunit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_oldunit.Properties.Appearance.Options.UseFont = true;
@@ -736,15 +699,15 @@
            // 
            this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_id.Appearance.Options.UseFont = true;
            this.lb_id.Location = new System.Drawing.Point(271, 207);
            this.lb_id.Location = new System.Drawing.Point(29, 43);
            this.lb_id.Name = "lb_id";
            this.lb_id.Size = new System.Drawing.Size(95, 21);
            this.lb_id.Size = new System.Drawing.Size(69, 21);
            this.lb_id.TabIndex = 211;
            this.lb_id.Text = "BASEINFO:";
            this.lb_id.Text = "单位ID:";
            // 
            // txt_id
            // 
            this.txt_id.Location = new System.Drawing.Point(368, 203);
            this.txt_id.Location = new System.Drawing.Point(98, 39);
            this.txt_id.Name = "txt_id";
            this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_id.Properties.Appearance.Options.UseFont = true;
@@ -755,14 +718,14 @@
            // 
            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_id.AppearanceCell.Options.UseFont = true;
            this.gv_id.Caption = "BASEINFO ";
            this.gv_id.Caption = "ID";
            this.gv_id.FieldName = "id";
            this.gv_id.MinWidth = 50;
            this.gv_id.Name = "gv_id";
            this.gv_id.OptionsColumn.AllowEdit = false;
            this.gv_id.Tag = "query_a.id";
            this.gv_id.Visible = true;
            this.gv_id.VisibleIndex = 14;
            this.gv_id.VisibleIndex = 0;
            this.gv_id.Width = 94;
            // 
            // toolBarMenu1
@@ -796,7 +759,7 @@
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_factory,
            this.gv_id,
            this.gv_fnumber,
            this.gv_fname,
            this.gv_funitgroupid,
@@ -810,7 +773,6 @@
            this.gv_oldqty,
            this.gv_newunit,
            this.gv_newqty,
            this.gv_id,
            this.gv_fdescription,
            this.gv_fforbidstatus});
            this.gridView1.GridControl = this.gcMain;
@@ -888,8 +850,6 @@
            this.panel1.Controls.Add(this.txt_fname);
            this.panel1.Controls.Add(this.lb_fnumber);
            this.panel1.Controls.Add(this.txt_fnumber);
            this.panel1.Controls.Add(this.lb_factory);
            this.panel1.Controls.Add(this.txt_factory);
            this.panel1.Controls.Add(this.lb_lastupdate_by);
            this.panel1.Controls.Add(this.txt_lastupdateBy);
            this.panel1.Controls.Add(this.lb_lastupdate_date);
@@ -952,7 +912,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_funitgroupid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fname.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fnumber.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
@@ -1028,10 +987,6 @@
private DevExpress.XtraEditors.LabelControl lb_fnumber;
private DevExpress.XtraEditors.TextEdit txt_fnumber;
 private DevExpress.XtraGrid.Columns.GridColumn gv_fnumber;
private DevExpress.XtraEditors.LabelControl lb_factory;
private DevExpress.XtraEditors.TextEdit txt_factory;
 private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
private DevExpress.XtraEditors.LabelControl lb_lastupdate_by;
private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
@@ -29,11 +29,11 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            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.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -69,7 +69,6 @@
            this.lb_name = new DevExpress.XtraEditors.LabelControl();
            this.txt_name = new DevExpress.XtraEditors.TextEdit();
            this.gv_name = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_workshopNo = new DevExpress.XtraEditors.LabelControl();
            this.txt_workshopNo = new DevExpress.XtraEditors.TextEdit();
            this.gv_workshopNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -82,10 +81,10 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
            this.txt_isStatus = new System.Windows.Forms.CheckBox();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -258,10 +257,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -287,7 +286,7 @@
            this.gv_checkStatus.OptionsColumn.AllowEdit = false;
            this.gv_checkStatus.Tag = "query_a.check_status";
            this.gv_checkStatus.Visible = true;
            this.gv_checkStatus.VisibleIndex = 7;
            this.gv_checkStatus.VisibleIndex = 6;
            this.gv_checkStatus.Width = 94;
            // 
            // lb_checkBy
@@ -321,7 +320,7 @@
            this.gv_checkBy.OptionsColumn.AllowEdit = false;
            this.gv_checkBy.Tag = "query_a.check_by";
            this.gv_checkBy.Visible = true;
            this.gv_checkBy.VisibleIndex = 9;
            this.gv_checkBy.VisibleIndex = 8;
            this.gv_checkBy.Width = 94;
            // 
            // lb_checkDate
@@ -355,7 +354,7 @@
            this.gv_checkDate.OptionsColumn.AllowEdit = false;
            this.gv_checkDate.Tag = "query_a.check_date";
            this.gv_checkDate.Visible = true;
            this.gv_checkDate.VisibleIndex = 8;
            this.gv_checkDate.VisibleIndex = 7;
            this.gv_checkDate.Width = 94;
            // 
            // lb_isStatus
@@ -372,14 +371,14 @@
            // 
            this.gv_isStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_isStatus.AppearanceCell.Options.UseFont = true;
            this.gv_isStatus.Caption = "状态 ";
            this.gv_isStatus.Caption = "状态";
            this.gv_isStatus.FieldName = "isStatus";
            this.gv_isStatus.MinWidth = 50;
            this.gv_isStatus.Name = "gv_isStatus";
            this.gv_isStatus.OptionsColumn.AllowEdit = false;
            this.gv_isStatus.Tag = "query_a.is_status";
            this.gv_isStatus.Visible = true;
            this.gv_isStatus.VisibleIndex = 6;
            this.gv_isStatus.VisibleIndex = 5;
            this.gv_isStatus.Width = 94;
            // 
            // lb_createDate
@@ -406,14 +405,14 @@
            // 
            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createDate.AppearanceCell.Options.UseFont = true;
            this.gv_createDate.Caption = "建立时间 ";
            this.gv_createDate.Caption = "建立时间";
            this.gv_createDate.FieldName = "createDate";
            this.gv_createDate.MinWidth = 50;
            this.gv_createDate.Name = "gv_createDate";
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_a.create_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 5;
            this.gv_createDate.VisibleIndex = 4;
            this.gv_createDate.Width = 94;
            // 
            // lb_createBy
@@ -440,14 +439,14 @@
            // 
            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createBy.AppearanceCell.Options.UseFont = true;
            this.gv_createBy.Caption = "建立者 ";
            this.gv_createBy.Caption = "建立者";
            this.gv_createBy.FieldName = "createBy";
            this.gv_createBy.MinWidth = 50;
            this.gv_createBy.Name = "gv_createBy";
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.Tag = "query_a.create_by";
            this.gv_createBy.Visible = true;
            this.gv_createBy.VisibleIndex = 4;
            this.gv_createBy.VisibleIndex = 3;
            this.gv_createBy.Width = 94;
            // 
            // lb_remark
@@ -473,14 +472,14 @@
            // 
            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.Caption = "备注 ";
            this.gv_remark.Caption = "备注";
            this.gv_remark.FieldName = "remark";
            this.gv_remark.MinWidth = 50;
            this.gv_remark.Name = "gv_remark";
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.remark";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 3;
            this.gv_remark.VisibleIndex = 2;
            this.gv_remark.Width = 94;
            // 
            // lb_name
@@ -506,29 +505,15 @@
            // 
            this.gv_name.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_name.AppearanceCell.Options.UseFont = true;
            this.gv_name.Caption = "车间名称 ";
            this.gv_name.Caption = "车间名称";
            this.gv_name.FieldName = "name";
            this.gv_name.MinWidth = 50;
            this.gv_name.Name = "gv_name";
            this.gv_name.OptionsColumn.AllowEdit = false;
            this.gv_name.Tag = "query_a.name";
            this.gv_name.Visible = true;
            this.gv_name.VisibleIndex = 2;
            this.gv_name.VisibleIndex = 1;
            this.gv_name.Width = 94;
            //
            // gv_factory
            //
            this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_factory.AppearanceCell.Options.UseFont = true;
            this.gv_factory.Caption = "工厂";
            this.gv_factory.FieldName = "factory";
            this.gv_factory.MinWidth = 50;
            this.gv_factory.Name = "gv_factory";
            this.gv_factory.OptionsColumn.AllowEdit = false;
            this.gv_factory.Tag = "query_a.factory";
            this.gv_factory.Visible = true;
            this.gv_factory.VisibleIndex = 0;
            this.gv_factory.Width = 94;
            // 
            // lb_workshopNo
            // 
@@ -553,14 +538,14 @@
            // 
            this.gv_workshopNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_workshopNo.AppearanceCell.Options.UseFont = true;
            this.gv_workshopNo.Caption = "车间编号 ";
            this.gv_workshopNo.Caption = "车间编号";
            this.gv_workshopNo.FieldName = "workshopNo";
            this.gv_workshopNo.MinWidth = 50;
            this.gv_workshopNo.Name = "gv_workshopNo";
            this.gv_workshopNo.OptionsColumn.AllowEdit = false;
            this.gv_workshopNo.Tag = "query_a.workshop_no";
            this.gv_workshopNo.Visible = true;
            this.gv_workshopNo.VisibleIndex = 1;
            this.gv_workshopNo.VisibleIndex = 0;
            this.gv_workshopNo.Width = 94;
            // 
            // toolBarMenu1
@@ -594,7 +579,6 @@
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_factory,
            this.gv_workshopNo,
            this.gv_name,
            this.gv_remark,
@@ -694,6 +678,15 @@
            this.panel1.Size = new System.Drawing.Size(1281, 114);
            this.panel1.TabIndex = 1;
            // 
            // txt_checkStatus
            //
            this.txt_checkStatus.Enabled = false;
            this.txt_checkStatus.Location = new System.Drawing.Point(1053, 49);
            this.txt_checkStatus.Name = "txt_checkStatus";
            this.txt_checkStatus.Properties.Caption = "";
            this.txt_checkStatus.Size = new System.Drawing.Size(94, 24);
            this.txt_checkStatus.TabIndex = 245;
            //
            // txt_isStatus
            // 
            this.txt_isStatus.AutoSize = true;
@@ -721,15 +714,6 @@
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            //
            // txt_checkStatus
            //
            this.txt_checkStatus.Enabled = false;
            this.txt_checkStatus.Location = new System.Drawing.Point(1053, 49);
            this.txt_checkStatus.Name = "txt_checkStatus";
            this.txt_checkStatus.Properties.Caption = "";
            this.txt_checkStatus.Size = new System.Drawing.Size(94, 24);
            this.txt_checkStatus.TabIndex = 245;
            // 
            // Frm_MesWorkshop
            // 
@@ -815,7 +799,6 @@
        private DevExpress.XtraEditors.LabelControl lb_name;
        private DevExpress.XtraEditors.TextEdit txt_name;
        private DevExpress.XtraGrid.Columns.GridColumn gv_name;
        private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
        private DevExpress.XtraEditors.LabelControl lb_workshopNo;
        private DevExpress.XtraEditors.TextEdit txt_workshopNo;
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -32,16 +32,6 @@
        /// </summary>
        private void InitializeComponent()
        {
            this.lb_remark5 = new DevExpress.XtraEditors.LabelControl();
            this.txt_remark5 = new DevExpress.XtraEditors.TextEdit();
            this.lb_remark4 = new DevExpress.XtraEditors.LabelControl();
            this.txt_remark4 = new DevExpress.XtraEditors.TextEdit();
            this.lb_remark3 = new DevExpress.XtraEditors.LabelControl();
            this.txt_remark3 = new DevExpress.XtraEditors.TextEdit();
            this.lb_useOrg = new DevExpress.XtraEditors.LabelControl();
            this.txt_useOrg = new DevExpress.XtraEditors.TextEdit();
            this.lb_createOrg = new DevExpress.XtraEditors.LabelControl();
            this.txt_createOrg = new DevExpress.XtraEditors.TextEdit();
            this.lb_fforbidstatus = new DevExpress.XtraEditors.LabelControl();
            this.txt_fforbidstatus = new DevExpress.XtraEditors.TextEdit();
            this.gv_fforbidstatus = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -53,29 +43,14 @@
            this.gv_lxr = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_lotFlag = new DevExpress.XtraEditors.LabelControl();
            this.txt_lotFlag = new DevExpress.XtraEditors.TextEdit();
            this.lb_itemSap = new DevExpress.XtraEditors.LabelControl();
            this.txt_itemSap = new DevExpress.XtraEditors.TextEdit();
            this.lb_itemC = new DevExpress.XtraEditors.LabelControl();
            this.txt_itemC = new DevExpress.XtraEditors.TextEdit();
            this.lb_factory = new DevExpress.XtraEditors.LabelControl();
            this.txt_factory = new DevExpress.XtraEditors.TextEdit();
            this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_company = new DevExpress.XtraEditors.LabelControl();
            this.txt_company = new DevExpress.XtraEditors.TextEdit();
            this.lb_fscode = new DevExpress.XtraEditors.LabelControl();
            this.txt_fscode = new DevExpress.XtraEditors.TextEdit();
            this.lb_remark = new DevExpress.XtraEditors.LabelControl();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
            this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
            this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl();
            this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
            this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_telfx = new DevExpress.XtraEditors.LabelControl();
            this.txt_telfx = new DevExpress.XtraEditors.TextEdit();
@@ -91,7 +66,6 @@
            this.lb_suppSname = new DevExpress.XtraEditors.LabelControl();
            this.txt_suppSname = new DevExpress.XtraEditors.TextEdit();
            this.lb_suppName = new DevExpress.XtraEditors.LabelControl();
            this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
            this.gv_suppName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_suppNo = new DevExpress.XtraEditors.LabelControl();
            this.txt_suppNo = new DevExpress.XtraEditors.TextEdit();
@@ -109,31 +83,19 @@
            this.panel1 = new System.Windows.Forms.Panel();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark4.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark3.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_useOrg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createOrg.Properties)).BeginInit();
            this.txt_suppName = new DevExpress.XtraEditors.MemoEdit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fstaffid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lxr.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lotFlag.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemSap.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemC.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_company.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fscode.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_telfx.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_telf1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_stras.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_land1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppSname.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -143,108 +105,14 @@
            this.xtraTabPage1.SuspendLayout();
            this.xtraTabPage2.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
            this.SuspendLayout();
            //
            // lb_remark5
            //
            this.lb_remark5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_remark5.Appearance.Options.UseFont = true;
            this.lb_remark5.Location = new System.Drawing.Point(283, 322);
            this.lb_remark5.Name = "lb_remark5";
            this.lb_remark5.Size = new System.Drawing.Size(99, 21);
            this.lb_remark5.TabIndex = 336;
            this.lb_remark5.Text = "自定义字段5 ";
            //
            // txt_remark5
            //
            this.txt_remark5.Location = new System.Drawing.Point(393, 318);
            this.txt_remark5.Name = "txt_remark5";
            this.txt_remark5.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark5.Properties.Appearance.Options.UseFont = true;
            this.txt_remark5.Size = new System.Drawing.Size(150, 28);
            this.txt_remark5.TabIndex = 336;
            //
            // lb_remark4
            //
            this.lb_remark4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_remark4.Appearance.Options.UseFont = true;
            this.lb_remark4.Location = new System.Drawing.Point(283, 286);
            this.lb_remark4.Name = "lb_remark4";
            this.lb_remark4.Size = new System.Drawing.Size(99, 21);
            this.lb_remark4.TabIndex = 327;
            this.lb_remark4.Text = "自定义字段4 ";
            //
            // txt_remark4
            //
            this.txt_remark4.Location = new System.Drawing.Point(393, 282);
            this.txt_remark4.Name = "txt_remark4";
            this.txt_remark4.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark4.Properties.Appearance.Options.UseFont = true;
            this.txt_remark4.Size = new System.Drawing.Size(150, 28);
            this.txt_remark4.TabIndex = 327;
            //
            // lb_remark3
            //
            this.lb_remark3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_remark3.Appearance.Options.UseFont = true;
            this.lb_remark3.Location = new System.Drawing.Point(283, 253);
            this.lb_remark3.Name = "lb_remark3";
            this.lb_remark3.Size = new System.Drawing.Size(99, 21);
            this.lb_remark3.TabIndex = 319;
            this.lb_remark3.Text = "自定义字段3 ";
            //
            // txt_remark3
            //
            this.txt_remark3.Location = new System.Drawing.Point(393, 249);
            this.txt_remark3.Name = "txt_remark3";
            this.txt_remark3.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark3.Properties.Appearance.Options.UseFont = true;
            this.txt_remark3.Size = new System.Drawing.Size(150, 28);
            this.txt_remark3.TabIndex = 319;
            //
            // lb_useOrg
            //
            this.lb_useOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_useOrg.Appearance.Options.UseFont = true;
            this.lb_useOrg.Location = new System.Drawing.Point(569, 116);
            this.lb_useOrg.Name = "lb_useOrg";
            this.lb_useOrg.Size = new System.Drawing.Size(73, 21);
            this.lb_useOrg.TabIndex = 312;
            this.lb_useOrg.Text = "使用组织 ";
            //
            // txt_useOrg
            //
            this.txt_useOrg.Location = new System.Drawing.Point(651, 112);
            this.txt_useOrg.Name = "txt_useOrg";
            this.txt_useOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_useOrg.Properties.Appearance.Options.UseFont = true;
            this.txt_useOrg.Size = new System.Drawing.Size(150, 28);
            this.txt_useOrg.TabIndex = 312;
            //
            // lb_createOrg
            //
            this.lb_createOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_createOrg.Appearance.Options.UseFont = true;
            this.lb_createOrg.Location = new System.Drawing.Point(309, 217);
            this.lb_createOrg.Name = "lb_createOrg";
            this.lb_createOrg.Size = new System.Drawing.Size(73, 21);
            this.lb_createOrg.TabIndex = 306;
            this.lb_createOrg.Text = "创建组织 ";
            //
            // txt_createOrg
            //
            this.txt_createOrg.Location = new System.Drawing.Point(393, 213);
            this.txt_createOrg.Name = "txt_createOrg";
            this.txt_createOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_createOrg.Properties.Appearance.Options.UseFont = true;
            this.txt_createOrg.Size = new System.Drawing.Size(150, 28);
            this.txt_createOrg.TabIndex = 306;
            // 
            // lb_fforbidstatus
            // 
            this.lb_fforbidstatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fforbidstatus.Appearance.Options.UseFont = true;
            this.lb_fforbidstatus.Location = new System.Drawing.Point(569, 148);
            this.lb_fforbidstatus.Location = new System.Drawing.Point(547, 18);
            this.lb_fforbidstatus.Name = "lb_fforbidstatus";
            this.lb_fforbidstatus.Size = new System.Drawing.Size(73, 21);
            this.lb_fforbidstatus.TabIndex = 298;
@@ -252,7 +120,7 @@
            // 
            // txt_fforbidstatus
            // 
            this.txt_fforbidstatus.Location = new System.Drawing.Point(651, 144);
            this.txt_fforbidstatus.Location = new System.Drawing.Point(629, 14);
            this.txt_fforbidstatus.Name = "txt_fforbidstatus";
            this.txt_fforbidstatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fforbidstatus.Properties.Appearance.Options.UseFont = true;
@@ -263,21 +131,21 @@
            // 
            this.gv_fforbidstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_fforbidstatus.AppearanceCell.Options.UseFont = true;
            this.gv_fforbidstatus.Caption = "状态 ";
            this.gv_fforbidstatus.Caption = "状态";
            this.gv_fforbidstatus.FieldName = "fforbidstatus";
            this.gv_fforbidstatus.MinWidth = 50;
            this.gv_fforbidstatus.Name = "gv_fforbidstatus";
            this.gv_fforbidstatus.OptionsColumn.AllowEdit = false;
            this.gv_fforbidstatus.Tag = "query_a.fforbidstatus";
            this.gv_fforbidstatus.Visible = true;
            this.gv_fforbidstatus.VisibleIndex = 10;
            this.gv_fforbidstatus.Width = 94;
            this.gv_fforbidstatus.VisibleIndex = 9;
            this.gv_fforbidstatus.Width = 50;
            // 
            // lb_fstaffid
            // 
            this.lb_fstaffid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fstaffid.Appearance.Options.UseFont = true;
            this.lb_fstaffid.Location = new System.Drawing.Point(326, 148);
            this.lb_fstaffid.Location = new System.Drawing.Point(289, 86);
            this.lb_fstaffid.Name = "lb_fstaffid";
            this.lb_fstaffid.Size = new System.Drawing.Size(56, 21);
            this.lb_fstaffid.TabIndex = 291;
@@ -285,7 +153,7 @@
            // 
            // txt_fstaffid
            // 
            this.txt_fstaffid.Location = new System.Drawing.Point(393, 144);
            this.txt_fstaffid.Location = new System.Drawing.Point(359, 82);
            this.txt_fstaffid.Name = "txt_fstaffid";
            this.txt_fstaffid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fstaffid.Properties.Appearance.Options.UseFont = true;
@@ -296,21 +164,21 @@
            // 
            this.gv_fstaffid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_fstaffid.AppearanceCell.Options.UseFont = true;
            this.gv_fstaffid.Caption = "负责人 ";
            this.gv_fstaffid.Caption = "负责人";
            this.gv_fstaffid.FieldName = "fstaffid";
            this.gv_fstaffid.MinWidth = 50;
            this.gv_fstaffid.Name = "gv_fstaffid";
            this.gv_fstaffid.OptionsColumn.AllowEdit = false;
            this.gv_fstaffid.Tag = "query_a.fstaffid";
            this.gv_fstaffid.Visible = true;
            this.gv_fstaffid.VisibleIndex = 9;
            this.gv_fstaffid.Width = 94;
            this.gv_fstaffid.VisibleIndex = 8;
            this.gv_fstaffid.Width = 50;
            // 
            // lb_lxr
            // 
            this.lb_lxr.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lxr.Appearance.Options.UseFont = true;
            this.lb_lxr.Location = new System.Drawing.Point(54, 180);
            this.lb_lxr.Location = new System.Drawing.Point(289, 18);
            this.lb_lxr.Name = "lb_lxr";
            this.lb_lxr.Size = new System.Drawing.Size(56, 21);
            this.lb_lxr.TabIndex = 285;
@@ -318,7 +186,7 @@
            // 
            // txt_lxr
            // 
            this.txt_lxr.Location = new System.Drawing.Point(124, 176);
            this.txt_lxr.Location = new System.Drawing.Point(359, 14);
            this.txt_lxr.Name = "txt_lxr";
            this.txt_lxr.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lxr.Properties.Appearance.Options.UseFont = true;
@@ -329,21 +197,21 @@
            // 
            this.gv_lxr.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lxr.AppearanceCell.Options.UseFont = true;
            this.gv_lxr.Caption = "联系人 ";
            this.gv_lxr.Caption = "联系人";
            this.gv_lxr.FieldName = "lxr";
            this.gv_lxr.MinWidth = 50;
            this.gv_lxr.Name = "gv_lxr";
            this.gv_lxr.OptionsColumn.AllowEdit = false;
            this.gv_lxr.Tag = "query_a.lxr";
            this.gv_lxr.Visible = true;
            this.gv_lxr.VisibleIndex = 7;
            this.gv_lxr.Width = 94;
            this.gv_lxr.VisibleIndex = 6;
            this.gv_lxr.Width = 52;
            // 
            // lb_lotFlag
            // 
            this.lb_lotFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lotFlag.Appearance.Options.UseFont = true;
            this.lb_lotFlag.Location = new System.Drawing.Point(34, 322);
            this.lb_lotFlag.Location = new System.Drawing.Point(534, 195);
            this.lb_lotFlag.Name = "lb_lotFlag";
            this.lb_lotFlag.Size = new System.Drawing.Size(172, 21);
            this.lb_lotFlag.TabIndex = 280;
@@ -351,37 +219,18 @@
            // 
            // txt_lotFlag
            // 
            this.txt_lotFlag.Location = new System.Drawing.Point(217, 318);
            this.txt_lotFlag.Location = new System.Drawing.Point(717, 191);
            this.txt_lotFlag.Name = "txt_lotFlag";
            this.txt_lotFlag.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lotFlag.Properties.Appearance.Options.UseFont = true;
            this.txt_lotFlag.Size = new System.Drawing.Size(57, 28);
            this.txt_lotFlag.TabIndex = 280;
            // 
            // lb_itemSap
            //
            this.lb_itemSap.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemSap.Appearance.Options.UseFont = true;
            this.lb_itemSap.Location = new System.Drawing.Point(-29, 286);
            this.lb_itemSap.Name = "lb_itemSap";
            this.lb_itemSap.Size = new System.Drawing.Size(235, 21);
            this.lb_itemSap.TabIndex = 273;
            this.lb_itemSap.Text = "物料是否回写SAP接口(是,否) ";
            //
            // txt_itemSap
            //
            this.txt_itemSap.Location = new System.Drawing.Point(217, 282);
            this.txt_itemSap.Name = "txt_itemSap";
            this.txt_itemSap.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemSap.Properties.Appearance.Options.UseFont = true;
            this.txt_itemSap.Size = new System.Drawing.Size(57, 28);
            this.txt_itemSap.TabIndex = 273;
            //
            // lb_itemC
            // 
            this.lb_itemC.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemC.Appearance.Options.UseFont = true;
            this.lb_itemC.Location = new System.Drawing.Point(34, 253);
            this.lb_itemC.Location = new System.Drawing.Point(534, 157);
            this.lb_itemC.Name = "lb_itemC";
            this.lb_itemC.Size = new System.Drawing.Size(172, 21);
            this.lb_itemC.TabIndex = 267;
@@ -389,71 +238,18 @@
            // 
            // txt_itemC
            // 
            this.txt_itemC.Location = new System.Drawing.Point(217, 249);
            this.txt_itemC.Location = new System.Drawing.Point(717, 153);
            this.txt_itemC.Name = "txt_itemC";
            this.txt_itemC.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemC.Properties.Appearance.Options.UseFont = true;
            this.txt_itemC.Size = new System.Drawing.Size(57, 28);
            this.txt_itemC.TabIndex = 267;
            // 
            // lb_factory
            //
            this.lb_factory.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_factory.Appearance.Options.UseFont = true;
            this.lb_factory.Location = new System.Drawing.Point(37, 148);
            this.lb_factory.Name = "lb_factory";
            this.lb_factory.Size = new System.Drawing.Size(73, 21);
            this.lb_factory.TabIndex = 262;
            this.lb_factory.Text = "分厂编码 ";
            //
            // txt_factory
            //
            this.txt_factory.Location = new System.Drawing.Point(124, 144);
            this.txt_factory.Name = "txt_factory";
            this.txt_factory.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_factory.Properties.Appearance.Options.UseFont = true;
            this.txt_factory.Size = new System.Drawing.Size(150, 28);
            this.txt_factory.TabIndex = 262;
            //
            // gv_factory
            //
            this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_factory.AppearanceCell.Options.UseFont = true;
            this.gv_factory.Caption = "工厂编码 ";
            this.gv_factory.FieldName = "factory";
            this.gv_factory.MinWidth = 50;
            this.gv_factory.Name = "gv_factory";
            this.gv_factory.OptionsColumn.AllowEdit = false;
            this.gv_factory.OptionsColumn.ReadOnly = true;
            this.gv_factory.Tag = "query_a.factory";
            this.gv_factory.Visible = true;
            this.gv_factory.VisibleIndex = 0;
            this.gv_factory.Width = 94;
            //
            // lb_company
            //
            this.lb_company.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_company.Appearance.Options.UseFont = true;
            this.lb_company.Location = new System.Drawing.Point(309, 116);
            this.lb_company.Name = "lb_company";
            this.lb_company.Size = new System.Drawing.Size(73, 21);
            this.lb_company.TabIndex = 258;
            this.lb_company.Text = "公司代码 ";
            //
            // txt_company
            //
            this.txt_company.Location = new System.Drawing.Point(393, 112);
            this.txt_company.Name = "txt_company";
            this.txt_company.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_company.Properties.Appearance.Options.UseFont = true;
            this.txt_company.Size = new System.Drawing.Size(150, 28);
            this.txt_company.TabIndex = 258;
            //
            // lb_fscode
            // 
            this.lb_fscode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fscode.Appearance.Options.UseFont = true;
            this.lb_fscode.Location = new System.Drawing.Point(68, 217);
            this.lb_fscode.Location = new System.Drawing.Point(568, 121);
            this.lb_fscode.Name = "lb_fscode";
            this.lb_fscode.Size = new System.Drawing.Size(138, 21);
            this.lb_fscode.TabIndex = 252;
@@ -461,7 +257,7 @@
            // 
            // txt_fscode
            // 
            this.txt_fscode.Location = new System.Drawing.Point(217, 213);
            this.txt_fscode.Location = new System.Drawing.Point(717, 117);
            this.txt_fscode.Name = "txt_fscode";
            this.txt_fscode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fscode.Properties.Appearance.Options.UseFont = true;
@@ -472,7 +268,7 @@
            // 
            this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_remark.Appearance.Options.UseFont = true;
            this.lb_remark.Location = new System.Drawing.Point(601, 214);
            this.lb_remark.Location = new System.Drawing.Point(579, 86);
            this.lb_remark.Name = "lb_remark";
            this.lb_remark.Size = new System.Drawing.Size(39, 21);
            this.lb_remark.TabIndex = 247;
@@ -480,7 +276,7 @@
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(651, 214);
            this.txt_remark.Location = new System.Drawing.Point(629, 82);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
@@ -491,125 +287,49 @@
            // 
            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.Caption = "备注 ";
            this.gv_remark.Caption = "备注";
            this.gv_remark.FieldName = "remark";
            this.gv_remark.MinWidth = 50;
            this.gv_remark.Name = "gv_remark";
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.remark";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 8;
            this.gv_remark.Width = 94;
            //
            // lb_lastupdateDate
            //
            this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lastupdateDate.Appearance.Options.UseFont = true;
            this.lb_lastupdateDate.Location = new System.Drawing.Point(3, 116);
            this.lb_lastupdateDate.Name = "lb_lastupdateDate";
            this.lb_lastupdateDate.Size = new System.Drawing.Size(107, 21);
            this.lb_lastupdateDate.TabIndex = 243;
            this.lb_lastupdateDate.Text = "最近更新时间 ";
            //
            // txt_lastupdateDate
            //
            this.txt_lastupdateDate.Location = new System.Drawing.Point(124, 112);
            this.txt_lastupdateDate.Name = "txt_lastupdateDate";
            this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
            this.txt_lastupdateDate.Size = new System.Drawing.Size(150, 28);
            this.txt_lastupdateDate.TabIndex = 243;
            //
            // lb_lastupdateBy
            //
            this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lastupdateBy.Appearance.Options.UseFont = true;
            this.lb_lastupdateBy.Location = new System.Drawing.Point(20, 86);
            this.lb_lastupdateBy.Name = "lb_lastupdateBy";
            this.lb_lastupdateBy.Size = new System.Drawing.Size(90, 21);
            this.lb_lastupdateBy.TabIndex = 240;
            this.lb_lastupdateBy.Text = "最近更新人 ";
            //
            // txt_lastupdateBy
            //
            this.txt_lastupdateBy.Location = new System.Drawing.Point(124, 82);
            this.txt_lastupdateBy.Name = "txt_lastupdateBy";
            this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
            this.txt_lastupdateBy.Size = new System.Drawing.Size(150, 28);
            this.txt_lastupdateBy.TabIndex = 240;
            //
            // lb_createDate
            //
            this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_createDate.Appearance.Options.UseFont = true;
            this.lb_createDate.Location = new System.Drawing.Point(569, 86);
            this.lb_createDate.Name = "lb_createDate";
            this.lb_createDate.Size = new System.Drawing.Size(73, 21);
            this.lb_createDate.TabIndex = 235;
            this.lb_createDate.Text = "创建时间 ";
            //
            // txt_createDate
            //
            this.txt_createDate.Location = new System.Drawing.Point(651, 82);
            this.txt_createDate.Name = "txt_createDate";
            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
            this.txt_createDate.Size = new System.Drawing.Size(150, 28);
            this.txt_createDate.TabIndex = 235;
            this.gv_remark.VisibleIndex = 7;
            this.gv_remark.Width = 50;
            // 
            // gv_createDate
            // 
            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createDate.AppearanceCell.Options.UseFont = true;
            this.gv_createDate.Caption = "创建时间 ";
            this.gv_createDate.Caption = "创建时间";
            this.gv_createDate.FieldName = "createDate";
            this.gv_createDate.MinWidth = 130;
            this.gv_createDate.Name = "gv_createDate";
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_a.create_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 12;
            this.gv_createDate.Width = 130;
            //
            // lb_createBy
            //
            this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_createBy.Appearance.Options.UseFont = true;
            this.lb_createBy.Location = new System.Drawing.Point(292, 86);
            this.lb_createBy.Name = "lb_createBy";
            this.lb_createBy.Size = new System.Drawing.Size(90, 21);
            this.lb_createBy.TabIndex = 231;
            this.lb_createBy.Text = "记录创建人 ";
            //
            // txt_createBy
            //
            this.txt_createBy.Location = new System.Drawing.Point(393, 82);
            this.txt_createBy.Name = "txt_createBy";
            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
            this.txt_createBy.Size = new System.Drawing.Size(150, 28);
            this.txt_createBy.TabIndex = 231;
            this.gv_createDate.VisibleIndex = 11;
            this.gv_createDate.Width = 200;
            // 
            // gv_createBy
            // 
            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createBy.AppearanceCell.Options.UseFont = true;
            this.gv_createBy.Caption = "创建人 ";
            this.gv_createBy.Caption = "创建人";
            this.gv_createBy.FieldName = "createBy";
            this.gv_createBy.MinWidth = 50;
            this.gv_createBy.Name = "gv_createBy";
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.Tag = "query_a.create_by";
            this.gv_createBy.Visible = true;
            this.gv_createBy.VisibleIndex = 11;
            this.gv_createBy.Width = 94;
            this.gv_createBy.VisibleIndex = 10;
            this.gv_createBy.Width = 50;
            // 
            // lb_telfx
            // 
            this.lb_telfx.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_telfx.Appearance.Options.UseFont = true;
            this.lb_telfx.Location = new System.Drawing.Point(343, 180);
            this.lb_telfx.Location = new System.Drawing.Point(306, 118);
            this.lb_telfx.Name = "lb_telfx";
            this.lb_telfx.Size = new System.Drawing.Size(39, 21);
            this.lb_telfx.TabIndex = 228;
@@ -617,7 +337,7 @@
            // 
            // txt_telfx
            // 
            this.txt_telfx.Location = new System.Drawing.Point(393, 176);
            this.txt_telfx.Location = new System.Drawing.Point(359, 114);
            this.txt_telfx.Name = "txt_telfx";
            this.txt_telfx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_telfx.Properties.Appearance.Options.UseFont = true;
@@ -628,7 +348,7 @@
            // 
            this.lb_telf1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_telf1.Appearance.Options.UseFont = true;
            this.lb_telf1.Location = new System.Drawing.Point(603, 180);
            this.lb_telf1.Location = new System.Drawing.Point(581, 51);
            this.lb_telf1.Name = "lb_telf1";
            this.lb_telf1.Size = new System.Drawing.Size(39, 21);
            this.lb_telf1.TabIndex = 226;
@@ -636,7 +356,7 @@
            // 
            // txt_telf1
            // 
            this.txt_telf1.Location = new System.Drawing.Point(651, 176);
            this.txt_telf1.Location = new System.Drawing.Point(629, 47);
            this.txt_telf1.Name = "txt_telf1";
            this.txt_telf1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_telf1.Properties.Appearance.Options.UseFont = true;
@@ -647,21 +367,21 @@
            // 
            this.gv_telf1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_telf1.AppearanceCell.Options.UseFont = true;
            this.gv_telf1.Caption = "电话 ";
            this.gv_telf1.Caption = "电话";
            this.gv_telf1.FieldName = "telf1";
            this.gv_telf1.MinWidth = 50;
            this.gv_telf1.Name = "gv_telf1";
            this.gv_telf1.OptionsColumn.AllowEdit = false;
            this.gv_telf1.Tag = "query_a.telf1";
            this.gv_telf1.Visible = true;
            this.gv_telf1.VisibleIndex = 6;
            this.gv_telf1.Width = 94;
            this.gv_telf1.VisibleIndex = 5;
            this.gv_telf1.Width = 66;
            // 
            // lb_stras
            // 
            this.lb_stras.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_stras.Appearance.Options.UseFont = true;
            this.lb_stras.Location = new System.Drawing.Point(603, 52);
            this.lb_stras.Location = new System.Drawing.Point(306, 154);
            this.lb_stras.Name = "lb_stras";
            this.lb_stras.Size = new System.Drawing.Size(39, 21);
            this.lb_stras.TabIndex = 222;
@@ -669,7 +389,7 @@
            // 
            // txt_stras
            // 
            this.txt_stras.Location = new System.Drawing.Point(651, 48);
            this.txt_stras.Location = new System.Drawing.Point(359, 150);
            this.txt_stras.Name = "txt_stras";
            this.txt_stras.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_stras.Properties.Appearance.Options.UseFont = true;
@@ -680,21 +400,21 @@
            // 
            this.gv_stras.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_stras.AppearanceCell.Options.UseFont = true;
            this.gv_stras.Caption = "地址 ";
            this.gv_stras.Caption = "地址";
            this.gv_stras.FieldName = "stras";
            this.gv_stras.MinWidth = 50;
            this.gv_stras.Name = "gv_stras";
            this.gv_stras.OptionsColumn.AllowEdit = false;
            this.gv_stras.Tag = "query_a.stras";
            this.gv_stras.Visible = true;
            this.gv_stras.VisibleIndex = 5;
            this.gv_stras.Width = 94;
            this.gv_stras.VisibleIndex = 4;
            this.gv_stras.Width = 66;
            // 
            // lb_land1
            // 
            this.lb_land1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_land1.Appearance.Options.UseFont = true;
            this.lb_land1.Location = new System.Drawing.Point(343, 52);
            this.lb_land1.Location = new System.Drawing.Point(306, 51);
            this.lb_land1.Name = "lb_land1";
            this.lb_land1.Size = new System.Drawing.Size(39, 21);
            this.lb_land1.TabIndex = 219;
@@ -702,7 +422,7 @@
            // 
            // txt_land1
            // 
            this.txt_land1.Location = new System.Drawing.Point(393, 48);
            this.txt_land1.Location = new System.Drawing.Point(359, 47);
            this.txt_land1.Name = "txt_land1";
            this.txt_land1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_land1.Properties.Appearance.Options.UseFont = true;
@@ -713,21 +433,21 @@
            // 
            this.gv_land1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_land1.AppearanceCell.Options.UseFont = true;
            this.gv_land1.Caption = "地区 ";
            this.gv_land1.Caption = "地区";
            this.gv_land1.FieldName = "land1";
            this.gv_land1.MinWidth = 50;
            this.gv_land1.Name = "gv_land1";
            this.gv_land1.OptionsColumn.AllowEdit = false;
            this.gv_land1.Tag = "query_a.land1";
            this.gv_land1.Visible = true;
            this.gv_land1.VisibleIndex = 4;
            this.gv_land1.Width = 94;
            this.gv_land1.VisibleIndex = 3;
            this.gv_land1.Width = 66;
            // 
            // lb_suppSname
            // 
            this.lb_suppSname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_suppSname.Appearance.Options.UseFont = true;
            this.lb_suppSname.Location = new System.Drawing.Point(20, 52);
            this.lb_suppSname.Location = new System.Drawing.Point(20, 86);
            this.lb_suppSname.Name = "lb_suppSname";
            this.lb_suppSname.Size = new System.Drawing.Size(90, 21);
            this.lb_suppSname.TabIndex = 217;
@@ -735,7 +455,7 @@
            // 
            // txt_suppSname
            // 
            this.txt_suppSname.Location = new System.Drawing.Point(124, 48);
            this.txt_suppSname.Location = new System.Drawing.Point(124, 82);
            this.txt_suppSname.Name = "txt_suppSname";
            this.txt_suppSname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_suppSname.Properties.Appearance.Options.UseFont = true;
@@ -746,40 +466,31 @@
            // 
            this.lb_suppName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_suppName.Appearance.Options.UseFont = true;
            this.lb_suppName.Location = new System.Drawing.Point(552, 18);
            this.lb_suppName.Location = new System.Drawing.Point(20, 122);
            this.lb_suppName.Name = "lb_suppName";
            this.lb_suppName.Size = new System.Drawing.Size(90, 21);
            this.lb_suppName.TabIndex = 216;
            this.lb_suppName.Text = "供应商名称 ";
            // 
            // txt_suppName
            //
            this.txt_suppName.Location = new System.Drawing.Point(651, 14);
            this.txt_suppName.Name = "txt_suppName";
            this.txt_suppName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_suppName.Properties.Appearance.Options.UseFont = true;
            this.txt_suppName.Size = new System.Drawing.Size(150, 28);
            this.txt_suppName.TabIndex = 216;
            //
            // gv_suppName
            // 
            this.gv_suppName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_suppName.AppearanceCell.Options.UseFont = true;
            this.gv_suppName.Caption = "供应商名称 ";
            this.gv_suppName.Caption = "供应商名称";
            this.gv_suppName.FieldName = "suppName";
            this.gv_suppName.MinWidth = 200;
            this.gv_suppName.MinWidth = 220;
            this.gv_suppName.Name = "gv_suppName";
            this.gv_suppName.OptionsColumn.AllowEdit = false;
            this.gv_suppName.Tag = "query_a.supp_name";
            this.gv_suppName.Visible = true;
            this.gv_suppName.VisibleIndex = 3;
            this.gv_suppName.Width = 200;
            this.gv_suppName.VisibleIndex = 2;
            this.gv_suppName.Width = 220;
            // 
            // lb_suppNo
            // 
            this.lb_suppNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_suppNo.Appearance.Options.UseFont = true;
            this.lb_suppNo.Location = new System.Drawing.Point(292, 18);
            this.lb_suppNo.Location = new System.Drawing.Point(20, 51);
            this.lb_suppNo.Name = "lb_suppNo";
            this.lb_suppNo.Size = new System.Drawing.Size(90, 21);
            this.lb_suppNo.TabIndex = 213;
@@ -787,7 +498,7 @@
            // 
            // txt_suppNo
            // 
            this.txt_suppNo.Location = new System.Drawing.Point(393, 14);
            this.txt_suppNo.Location = new System.Drawing.Point(124, 47);
            this.txt_suppNo.Name = "txt_suppNo";
            this.txt_suppNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_suppNo.Properties.Appearance.Options.UseFont = true;
@@ -798,25 +509,25 @@
            // 
            this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_suppNo.AppearanceCell.Options.UseFont = true;
            this.gv_suppNo.Caption = "供应商编码 ";
            this.gv_suppNo.Caption = "供应商编码";
            this.gv_suppNo.FieldName = "suppNo";
            this.gv_suppNo.MinWidth = 50;
            this.gv_suppNo.Name = "gv_suppNo";
            this.gv_suppNo.OptionsColumn.AllowEdit = false;
            this.gv_suppNo.Tag = "query_a.supp_no";
            this.gv_suppNo.Visible = true;
            this.gv_suppNo.VisibleIndex = 2;
            this.gv_suppNo.Width = 94;
            this.gv_suppNo.VisibleIndex = 1;
            this.gv_suppNo.Width = 69;
            // 
            // lb_id
            // 
            this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_id.Appearance.Options.UseFont = true;
            this.lb_id.Location = new System.Drawing.Point(87, 18);
            this.lb_id.Location = new System.Drawing.Point(36, 18);
            this.lb_id.Name = "lb_id";
            this.lb_id.Size = new System.Drawing.Size(23, 21);
            this.lb_id.Size = new System.Drawing.Size(74, 21);
            this.lb_id.TabIndex = 211;
            this.lb_id.Text = "ID ";
            this.lb_id.Text = "供应商ID ";
            // 
            // txt_id
            // 
@@ -831,15 +542,15 @@
            // 
            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_id.AppearanceCell.Options.UseFont = true;
            this.gv_id.Caption = "供应商ID ";
            this.gv_id.Caption = "供应商ID";
            this.gv_id.FieldName = "id";
            this.gv_id.MinWidth = 50;
            this.gv_id.Name = "gv_id";
            this.gv_id.OptionsColumn.AllowEdit = false;
            this.gv_id.Tag = "query_a.id";
            this.gv_id.Visible = true;
            this.gv_id.VisibleIndex = 1;
            this.gv_id.Width = 94;
            this.gv_id.VisibleIndex = 0;
            this.gv_id.Width = 69;
            // 
            // toolBarMenu1
            // 
@@ -872,7 +583,6 @@
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_factory,
            this.gv_id,
            this.gv_suppNo,
            this.gv_suppName,
@@ -936,18 +646,9 @@
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.txt_suppName);
            this.panel1.Controls.Add(this.labelControl11);
            this.panel1.Controls.Add(this.lbGuid);
            this.panel1.Controls.Add(this.lb_remark5);
            this.panel1.Controls.Add(this.txt_remark5);
            this.panel1.Controls.Add(this.lb_remark4);
            this.panel1.Controls.Add(this.txt_remark4);
            this.panel1.Controls.Add(this.lb_remark3);
            this.panel1.Controls.Add(this.txt_remark3);
            this.panel1.Controls.Add(this.lb_useOrg);
            this.panel1.Controls.Add(this.txt_useOrg);
            this.panel1.Controls.Add(this.lb_createOrg);
            this.panel1.Controls.Add(this.txt_createOrg);
            this.panel1.Controls.Add(this.lb_fforbidstatus);
            this.panel1.Controls.Add(this.txt_fforbidstatus);
            this.panel1.Controls.Add(this.lb_fstaffid);
@@ -956,26 +657,12 @@
            this.panel1.Controls.Add(this.txt_lxr);
            this.panel1.Controls.Add(this.lb_lotFlag);
            this.panel1.Controls.Add(this.txt_lotFlag);
            this.panel1.Controls.Add(this.lb_itemSap);
            this.panel1.Controls.Add(this.txt_itemSap);
            this.panel1.Controls.Add(this.lb_itemC);
            this.panel1.Controls.Add(this.txt_itemC);
            this.panel1.Controls.Add(this.lb_factory);
            this.panel1.Controls.Add(this.txt_factory);
            this.panel1.Controls.Add(this.lb_company);
            this.panel1.Controls.Add(this.txt_company);
            this.panel1.Controls.Add(this.lb_fscode);
            this.panel1.Controls.Add(this.txt_fscode);
            this.panel1.Controls.Add(this.lb_remark);
            this.panel1.Controls.Add(this.txt_remark);
            this.panel1.Controls.Add(this.lb_lastupdateDate);
            this.panel1.Controls.Add(this.txt_lastupdateDate);
            this.panel1.Controls.Add(this.lb_lastupdateBy);
            this.panel1.Controls.Add(this.txt_lastupdateBy);
            this.panel1.Controls.Add(this.lb_createDate);
            this.panel1.Controls.Add(this.txt_createDate);
            this.panel1.Controls.Add(this.lb_createBy);
            this.panel1.Controls.Add(this.txt_createBy);
            this.panel1.Controls.Add(this.lb_telfx);
            this.panel1.Controls.Add(this.txt_telfx);
            this.panel1.Controls.Add(this.lb_telf1);
@@ -987,7 +674,6 @@
            this.panel1.Controls.Add(this.lb_suppSname);
            this.panel1.Controls.Add(this.txt_suppSname);
            this.panel1.Controls.Add(this.lb_suppName);
            this.panel1.Controls.Add(this.txt_suppName);
            this.panel1.Controls.Add(this.lb_suppNo);
            this.panel1.Controls.Add(this.txt_suppNo);
            this.panel1.Controls.Add(this.lb_id);
@@ -995,12 +681,12 @@
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(76, 20);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(835, 426);
            this.panel1.Size = new System.Drawing.Size(835, 293);
            this.panel1.TabIndex = 1;
            // 
            // labelControl11
            // 
            this.labelControl11.Location = new System.Drawing.Point(61, 388);
            this.labelControl11.Location = new System.Drawing.Point(47, 223);
            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl11.Name = "labelControl11";
            this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -1011,11 +697,21 @@
            // lbGuid
            // 
            this.lbGuid.AutoSize = true;
            this.lbGuid.Location = new System.Drawing.Point(112, 388);
            this.lbGuid.Location = new System.Drawing.Point(98, 223);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            //
            // txt_suppName
            //
            this.txt_suppName.Location = new System.Drawing.Point(124, 121);
            this.txt_suppName.Name = "txt_suppName";
            this.txt_suppName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_suppName.Properties.Appearance.Options.UseFont = true;
            this.txt_suppName.Size = new System.Drawing.Size(152, 69);
            this.txt_suppName.TabIndex = 299;
            this.txt_suppName.Tag = "itemModel";
            // 
            // Frm_Supplier
            // 
@@ -1025,31 +721,18 @@
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_Supplier";
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark4.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark3.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_useOrg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createOrg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fstaffid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lxr.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lotFlag.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemSap.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemC.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_company.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fscode.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_telfx.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_telf1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_stras.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_land1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppSname.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
@@ -1060,6 +743,7 @@
            this.xtraTabPage2.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
            this.ResumeLayout(false);
        }
@@ -1074,21 +758,6 @@
        private System.Windows.Forms.Panel panel1;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraEditors.LabelControl labelControl11;
        //BQCreateConrolObejct
        private DevExpress.XtraEditors.LabelControl lb_remark5;
        private DevExpress.XtraEditors.TextEdit txt_remark5;
        private DevExpress.XtraEditors.LabelControl lb_remark4;
        private DevExpress.XtraEditors.TextEdit txt_remark4;
        private DevExpress.XtraEditors.LabelControl lb_remark3;
        private DevExpress.XtraEditors.TextEdit txt_remark3;
        private DevExpress.XtraEditors.LabelControl lb_useOrg;
        private DevExpress.XtraEditors.TextEdit txt_useOrg;
        private DevExpress.XtraEditors.LabelControl lb_createOrg;
        private DevExpress.XtraEditors.TextEdit txt_createOrg;
        private DevExpress.XtraEditors.LabelControl lb_fforbidstatus;
        private DevExpress.XtraEditors.TextEdit txt_fforbidstatus;
@@ -1105,18 +774,8 @@
        private DevExpress.XtraEditors.LabelControl lb_lotFlag;
        private DevExpress.XtraEditors.TextEdit txt_lotFlag;
        private DevExpress.XtraEditors.LabelControl lb_itemSap;
        private DevExpress.XtraEditors.TextEdit txt_itemSap;
        private DevExpress.XtraEditors.LabelControl lb_itemC;
        private DevExpress.XtraEditors.TextEdit txt_itemC;
        private DevExpress.XtraEditors.LabelControl lb_factory;
        private DevExpress.XtraEditors.TextEdit txt_factory;
        private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
        private DevExpress.XtraEditors.LabelControl lb_company;
        private DevExpress.XtraEditors.TextEdit txt_company;
        private DevExpress.XtraEditors.LabelControl lb_fscode;
        private DevExpress.XtraEditors.TextEdit txt_fscode;
@@ -1124,19 +783,7 @@
        private DevExpress.XtraEditors.LabelControl lb_remark;
        private DevExpress.XtraEditors.TextEdit txt_remark;
        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
        private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
        private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
        private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
        private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
        private DevExpress.XtraEditors.LabelControl lb_createDate;
        private DevExpress.XtraEditors.TextEdit txt_createDate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
        private DevExpress.XtraEditors.LabelControl lb_createBy;
        private DevExpress.XtraEditors.TextEdit txt_createBy;
        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
        private DevExpress.XtraEditors.LabelControl lb_telfx;
@@ -1158,7 +805,6 @@
        private DevExpress.XtraEditors.TextEdit txt_suppSname;
        private DevExpress.XtraEditors.LabelControl lb_suppName;
        private DevExpress.XtraEditors.TextEdit txt_suppName;
        private DevExpress.XtraEditors.LabelControl lb_suppNo;
        private DevExpress.XtraEditors.TextEdit txt_suppNo;
@@ -1168,5 +814,6 @@
        private DevExpress.XtraEditors.TextEdit txt_id;
        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
        public DevExpress.XtraGrid.Columns.GridColumn gv_suppName;
        private DevExpress.XtraEditors.MemoEdit txt_suppName;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
@@ -328,6 +328,11 @@
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据,确定删除吗?"))
                    return;
                if (string.IsNullOrEmpty(mxGuid))
                {
                    gvMx1.DeleteRow(rowhandle);
                    return;
                }
                var strJson = "";
                var lst = new List<string>();
                lst.Add(mxGuid);
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -58,6 +58,7 @@
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panMsg = new DevExpress.XtraEditors.PanelControl();
            this.btnLoad = new DevExpress.XtraEditors.SimpleButton();
            this.txtJianYan = new DevExpress.XtraEditors.TextEdit();
            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
@@ -556,6 +557,7 @@
            // 
            // panMsg
            // 
            this.panMsg.Controls.Add(this.btnLoad);
            this.panMsg.Controls.Add(this.txtJianYan);
            this.panMsg.Controls.Add(this.labelControl3);
            this.panMsg.Controls.Add(this.labelControl2);
@@ -565,32 +567,41 @@
            this.panMsg.Size = new System.Drawing.Size(1340, 68);
            this.panMsg.TabIndex = 1;
            // 
            // btnLoad
            //
            this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.refresh_32x321;
            this.btnLoad.Location = new System.Drawing.Point(810, 16);
            this.btnLoad.Name = "btnLoad";
            this.btnLoad.Size = new System.Drawing.Size(180, 34);
            this.btnLoad.TabIndex = 3;
            this.btnLoad.Text = "重新加载检验项目";
            //
            // txtJianYan
            // 
            this.txtJianYan.Location = new System.Drawing.Point(556, 12);
            this.txtJianYan.Location = new System.Drawing.Point(569, 16);
            this.txtJianYan.Name = "txtJianYan";
            this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 13F);
            this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 14F);
            this.txtJianYan.Properties.Appearance.Options.UseFont = true;
            this.txtJianYan.Size = new System.Drawing.Size(197, 34);
            this.txtJianYan.TabIndex = 2;
            // 
            // labelControl3
            // 
            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 13F);
            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 14F);
            this.labelControl3.Appearance.Options.UseFont = true;
            this.labelControl3.Location = new System.Drawing.Point(161, 19);
            this.labelControl3.Name = "labelControl3";
            this.labelControl3.Size = new System.Drawing.Size(367, 27);
            this.labelControl3.Size = new System.Drawing.Size(398, 29);
            this.labelControl3.TabIndex = 1;
            this.labelControl3.Text = "录入检验结果(OK-19,NG-1,纯数字)";
            // 
            // labelControl2
            // 
            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 13F);
            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 14F);
            this.labelControl2.Appearance.Options.UseFont = true;
            this.labelControl2.Location = new System.Drawing.Point(60, 19);
            this.labelControl2.Location = new System.Drawing.Point(35, 19);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(110, 27);
            this.labelControl2.Size = new System.Drawing.Size(120, 29);
            this.labelControl2.TabIndex = 0;
            this.labelControl2.Text = "检验项目:";
            // 
@@ -1295,7 +1306,7 @@
            // 
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = "1,1,1,1,000chk_IqcJianYanCommit";
            this.toolBarMenu1.chkParameter = "0,0,0,0,000chk_iqc_detect01_submit";
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
@@ -1840,5 +1851,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraEditors.SimpleButton btnLoad;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -1,6 +1,7 @@
using DevExpress.DataAccess.Wizard.Model;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using DevExpress.XtraLayout.Customization;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -33,7 +34,8 @@
            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            this.toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
            getPageList(1, UtilityHelper.GetPageSize());
@@ -60,6 +62,13 @@
            gvMx2.OptionsView.ShowGroupPanel = false;
            _setIno();
            txtJianYan.KeyDown += TxtJianYan_KeyDown;
            this.btnLoad.Click += BtnLoad_Click;
        }
        private void BtnLoad_Click(object sender, EventArgs e)
        {
            if (!MsgHelper.AskQuestion("确定重新加载检验项目吗?"))
                return;
        }
        private void TxtJianYan_KeyDown(object sender, KeyEventArgs e)
@@ -151,7 +160,7 @@
            _filterList = e.FilterList;
            getPageList(1, pageBar1.RowsCount);
        }
        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
        private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
@@ -160,6 +169,21 @@
            toolBarMenu1.guidKey = rowGuid;
        }
        /// <summary>
        ///     检验
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_releaseNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }
        /// <summary>
        /// 取消事件
        /// </summary>
        /// <param name="sender"></param>
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -38,6 +38,7 @@
            this.toolBarMenu1.btnZhiLiangFchkClick += ToolBarMenu1_btnZhiLiangFchkClick;
            this.toolBarMenu1.btnCaiGouChkClick += ToolBarMenu1_btnCaiGouChkClick;
            this.toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
            getPageList(1, UtilityHelper.GetPageSize());
@@ -107,6 +108,14 @@
            _filterList = e.FilterList;
            getPageList(1, pageBar1.RowsCount);
        }
        private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_releaseNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }
        private void ToolBarMenu1_btnCaiGouFchkClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
@@ -309,6 +309,11 @@
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据,确定删除吗?"))
                    return;
                if (string.IsNullOrEmpty(mxGuid))
                {
                    gvMx1.DeleteRow(rowhandle);
                    return;
                }
                var strJson = "";
                var lst = new List<string>();
                lst.Add(mxGuid);
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
@@ -122,6 +122,7 @@
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -483,14 +484,14 @@
            // 
            this.gv_materialProperti.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_materialProperti.AppearanceCell.Options.UseFont = true;
            this.gv_materialProperti.Caption = "物料属性 ";
            this.gv_materialProperti.Caption = "物料属性";
            this.gv_materialProperti.FieldName = "materialProperti";
            this.gv_materialProperti.MinWidth = 50;
            this.gv_materialProperti.Name = "gv_materialProperti";
            this.gv_materialProperti.OptionsColumn.AllowEdit = false;
            this.gv_materialProperti.Tag = "query_a.material_properti";
            this.gv_materialProperti.Visible = true;
            this.gv_materialProperti.VisibleIndex = 15;
            this.gv_materialProperti.VisibleIndex = 16;
            this.gv_materialProperti.Width = 94;
            // 
            // lb_productionWorkshop
@@ -516,14 +517,14 @@
            // 
            this.gv_productionWorkshop.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_productionWorkshop.AppearanceCell.Options.UseFont = true;
            this.gv_productionWorkshop.Caption = "生产车间 ";
            this.gv_productionWorkshop.Caption = "生产车间";
            this.gv_productionWorkshop.FieldName = "productionWorkshop";
            this.gv_productionWorkshop.MinWidth = 50;
            this.gv_productionWorkshop.Name = "gv_productionWorkshop";
            this.gv_productionWorkshop.OptionsColumn.AllowEdit = false;
            this.gv_productionWorkshop.Tag = "query_a.production_workshop";
            this.gv_productionWorkshop.Visible = true;
            this.gv_productionWorkshop.VisibleIndex = 14;
            this.gv_productionWorkshop.VisibleIndex = 15;
            this.gv_productionWorkshop.Width = 94;
            // 
            // lb_isFkc
@@ -549,14 +550,14 @@
            // 
            this.gv_isFkc.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_isFkc.AppearanceCell.Options.UseFont = true;
            this.gv_isFkc.Caption = "允许即时库存负库存 ";
            this.gv_isFkc.Caption = "允许即时库存负库存";
            this.gv_isFkc.FieldName = "isFkc";
            this.gv_isFkc.MinWidth = 50;
            this.gv_isFkc.Name = "gv_isFkc";
            this.gv_isFkc.OptionsColumn.AllowEdit = false;
            this.gv_isFkc.Tag = "query_a.is_fkc";
            this.gv_isFkc.Visible = true;
            this.gv_isFkc.VisibleIndex = 13;
            this.gv_isFkc.VisibleIndex = 14;
            this.gv_isFkc.Width = 94;
            // 
            // lb_zuid
@@ -582,14 +583,14 @@
            // 
            this.gv_zuid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_zuid.AppearanceCell.Options.UseFont = true;
            this.gv_zuid.Caption = "分组 ";
            this.gv_zuid.Caption = "分组";
            this.gv_zuid.FieldName = "zuid";
            this.gv_zuid.MinWidth = 50;
            this.gv_zuid.Name = "gv_zuid";
            this.gv_zuid.OptionsColumn.AllowEdit = false;
            this.gv_zuid.Tag = "query_a.zuid";
            this.gv_zuid.Visible = true;
            this.gv_zuid.VisibleIndex = 12;
            this.gv_zuid.VisibleIndex = 13;
            this.gv_zuid.Width = 94;
            // 
            // lb_piType
@@ -653,14 +654,14 @@
            // 
            this.gv_isNg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_isNg.AppearanceCell.Options.UseFont = true;
            this.gv_isNg.Caption = "是否不良品仓 ";
            this.gv_isNg.Caption = "是否不良品仓";
            this.gv_isNg.FieldName = "isNg";
            this.gv_isNg.MinWidth = 50;
            this.gv_isNg.Name = "gv_isNg";
            this.gv_isNg.OptionsColumn.AllowEdit = false;
            this.gv_isNg.Tag = "query_a.is_ng";
            this.gv_isNg.Visible = true;
            this.gv_isNg.VisibleIndex = 11;
            this.gv_isNg.VisibleIndex = 12;
            this.gv_isNg.Width = 94;
            // 
            // lb_isWy
@@ -686,14 +687,14 @@
            // 
            this.gv_isWy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_isWy.AppearanceCell.Options.UseFont = true;
            this.gv_isWy.Caption = "是否委外仓库 ";
            this.gv_isWy.Caption = "是否委外仓库";
            this.gv_isWy.FieldName = "isWy";
            this.gv_isWy.MinWidth = 50;
            this.gv_isWy.Name = "gv_isWy";
            this.gv_isWy.OptionsColumn.AllowEdit = false;
            this.gv_isWy.Tag = "query_a.is_wy";
            this.gv_isWy.Visible = true;
            this.gv_isWy.VisibleIndex = 10;
            this.gv_isWy.VisibleIndex = 11;
            this.gv_isWy.Width = 94;
            // 
            // lb_iconType
@@ -757,14 +758,14 @@
            // 
            this.gv_depottypecode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depottypecode.AppearanceCell.Options.UseFont = true;
            this.gv_depottypecode.Caption = "仓库类型编码 ";
            this.gv_depottypecode.Caption = "仓库类型编码";
            this.gv_depottypecode.FieldName = "depottypecode";
            this.gv_depottypecode.MinWidth = 50;
            this.gv_depottypecode.Name = "gv_depottypecode";
            this.gv_depottypecode.OptionsColumn.AllowEdit = false;
            this.gv_depottypecode.Tag = "query_a.depottypecode";
            this.gv_depottypecode.Visible = true;
            this.gv_depottypecode.VisibleIndex = 9;
            this.gv_depottypecode.VisibleIndex = 10;
            this.gv_depottypecode.Width = 94;
            // 
            // lb_type2
@@ -790,14 +791,14 @@
            // 
            this.gv_type2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_type2.AppearanceCell.Options.UseFont = true;
            this.gv_type2.Caption = "成品使用 ";
            this.gv_type2.Caption = "成品使用";
            this.gv_type2.FieldName = "type2";
            this.gv_type2.MinWidth = 50;
            this.gv_type2.Name = "gv_type2";
            this.gv_type2.OptionsColumn.AllowEdit = false;
            this.gv_type2.Tag = "query_a.type_2";
            this.gv_type2.Visible = true;
            this.gv_type2.VisibleIndex = 8;
            this.gv_type2.VisibleIndex = 9;
            this.gv_type2.Width = 94;
            // 
            // lb_type1
@@ -823,14 +824,14 @@
            // 
            this.gv_type1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_type1.AppearanceCell.Options.UseFont = true;
            this.gv_type1.Caption = "物料使用 ";
            this.gv_type1.Caption = "物料使用";
            this.gv_type1.FieldName = "type1";
            this.gv_type1.MinWidth = 50;
            this.gv_type1.Name = "gv_type1";
            this.gv_type1.OptionsColumn.AllowEdit = false;
            this.gv_type1.Tag = "query_a.type_1";
            this.gv_type1.Visible = true;
            this.gv_type1.VisibleIndex = 7;
            this.gv_type1.VisibleIndex = 8;
            this.gv_type1.Width = 94;
            // 
            // lb_factory
@@ -875,14 +876,14 @@
            // 
            this.gv_depottype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depottype.AppearanceCell.Options.UseFont = true;
            this.gv_depottype.Caption = "仓库类型 ";
            this.gv_depottype.Caption = "仓库类型";
            this.gv_depottype.FieldName = "depottype";
            this.gv_depottype.MinWidth = 50;
            this.gv_depottype.Name = "gv_depottype";
            this.gv_depottype.OptionsColumn.AllowEdit = false;
            this.gv_depottype.Tag = "query_a.depottype";
            this.gv_depottype.Visible = true;
            this.gv_depottype.VisibleIndex = 6;
            this.gv_depottype.VisibleIndex = 7;
            this.gv_depottype.Width = 94;
            // 
            // lb_lastupdateDate
@@ -908,15 +909,15 @@
            // 
            this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
            this.gv_lastupdateDate.Caption = "最后更新时间 ";
            this.gv_lastupdateDate.Caption = "最后更新时间";
            this.gv_lastupdateDate.FieldName = "lastupdateDate";
            this.gv_lastupdateDate.MinWidth = 50;
            this.gv_lastupdateDate.MinWidth = 200;
            this.gv_lastupdateDate.Name = "gv_lastupdateDate";
            this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
            this.gv_lastupdateDate.Visible = true;
            this.gv_lastupdateDate.VisibleIndex = 5;
            this.gv_lastupdateDate.Width = 94;
            this.gv_lastupdateDate.VisibleIndex = 6;
            this.gv_lastupdateDate.Width = 200;
            // 
            // lb_lastupdateBy
            // 
@@ -941,14 +942,14 @@
            // 
            this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
            this.gv_lastupdateBy.Caption = "最后更新人 ";
            this.gv_lastupdateBy.Caption = "最后更新人";
            this.gv_lastupdateBy.FieldName = "lastupdateBy";
            this.gv_lastupdateBy.MinWidth = 50;
            this.gv_lastupdateBy.Name = "gv_lastupdateBy";
            this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
            this.gv_lastupdateBy.Visible = true;
            this.gv_lastupdateBy.VisibleIndex = 4;
            this.gv_lastupdateBy.VisibleIndex = 5;
            this.gv_lastupdateBy.Width = 94;
            // 
            // lb_createDate
@@ -993,14 +994,14 @@
            // 
            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createBy.AppearanceCell.Options.UseFont = true;
            this.gv_createBy.Caption = "仓库负责人 ";
            this.gv_createBy.Caption = "仓库负责人";
            this.gv_createBy.FieldName = "createBy";
            this.gv_createBy.MinWidth = 50;
            this.gv_createBy.Name = "gv_createBy";
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.Tag = "query_a.create_by";
            this.gv_createBy.Visible = true;
            this.gv_createBy.VisibleIndex = 3;
            this.gv_createBy.VisibleIndex = 4;
            this.gv_createBy.Width = 94;
            // 
            // lb_description
@@ -1026,14 +1027,14 @@
            // 
            this.gv_description.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_description.AppearanceCell.Options.UseFont = true;
            this.gv_description.Caption = "备注 ";
            this.gv_description.Caption = "备注";
            this.gv_description.FieldName = "description";
            this.gv_description.MinWidth = 50;
            this.gv_description.Name = "gv_description";
            this.gv_description.OptionsColumn.AllowEdit = false;
            this.gv_description.Tag = "query_a.description";
            this.gv_description.Visible = true;
            this.gv_description.VisibleIndex = 2;
            this.gv_description.VisibleIndex = 3;
            this.gv_description.Width = 94;
            // 
            // lb_depotName
@@ -1059,15 +1060,15 @@
            // 
            this.gv_depotName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depotName.AppearanceCell.Options.UseFont = true;
            this.gv_depotName.Caption = "仓库名称 ";
            this.gv_depotName.Caption = "仓库名称";
            this.gv_depotName.FieldName = "depotName";
            this.gv_depotName.MinWidth = 50;
            this.gv_depotName.MinWidth = 100;
            this.gv_depotName.Name = "gv_depotName";
            this.gv_depotName.OptionsColumn.AllowEdit = false;
            this.gv_depotName.Tag = "query_a.depot_name";
            this.gv_depotName.Visible = true;
            this.gv_depotName.VisibleIndex = 1;
            this.gv_depotName.Width = 94;
            this.gv_depotName.VisibleIndex = 2;
            this.gv_depotName.Width = 100;
            // 
            // lb_depotCode
            // 
@@ -1092,15 +1093,15 @@
            // 
            this.gv_depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depotCode.AppearanceCell.Options.UseFont = true;
            this.gv_depotCode.Caption = "仓库编码 ";
            this.gv_depotCode.Caption = "仓库编码";
            this.gv_depotCode.FieldName = "depotCode";
            this.gv_depotCode.MinWidth = 50;
            this.gv_depotCode.MinWidth = 100;
            this.gv_depotCode.Name = "gv_depotCode";
            this.gv_depotCode.OptionsColumn.AllowEdit = false;
            this.gv_depotCode.Tag = "query_a.depot_code";
            this.gv_depotCode.Visible = true;
            this.gv_depotCode.VisibleIndex = 0;
            this.gv_depotCode.Width = 94;
            this.gv_depotCode.VisibleIndex = 1;
            this.gv_depotCode.Width = 100;
            // 
            // toolBarMenu1
            // 
@@ -1133,6 +1134,7 @@
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_id,
            this.gv_depotCode,
            this.gv_depotName,
            this.gv_depottype,
@@ -1155,6 +1157,16 @@
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // gv_id
            //
            this.gv_id.Caption = "gridColumn1";
            this.gv_id.FieldName = "depotId";
            this.gv_id.MinWidth = 25;
            this.gv_id.Name = "gv_id";
            this.gv_id.Visible = true;
            this.gv_id.VisibleIndex = 0;
            this.gv_id.Width = 94;
            // 
            // xtraTabControl1
            // 
@@ -1469,5 +1481,6 @@
 private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
    }
}
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -29,11 +29,11 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            this.gvMx1states = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1returnFlag = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1cgRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -415,28 +415,28 @@
            // 
            this.gvMx1ebelnLine.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1ebelnLine.AppearanceCell.Options.UseFont = true;
            this.gvMx1ebelnLine.Caption = "采购订单行号";
            this.gvMx1ebelnLine.FieldName = "ebelnLine";
            this.gvMx1ebelnLine.Caption = "ERP行ID";
            this.gvMx1ebelnLine.FieldName = "ebelnK3id";
            this.gvMx1ebelnLine.MinWidth = 100;
            this.gvMx1ebelnLine.Name = "gvMx1ebelnLine";
            this.gvMx1ebelnLine.OptionsColumn.ReadOnly = true;
            this.gvMx1ebelnLine.Tag = "query_a.ebeln_line";
            this.gvMx1ebelnLine.Visible = true;
            this.gvMx1ebelnLine.VisibleIndex = 3;
            this.gvMx1ebelnLine.VisibleIndex = 2;
            this.gvMx1ebelnLine.Width = 100;
            // 
            // gvMx1ebeln
            // 
            this.gvMx1ebeln.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
            this.gvMx1ebeln.Caption = "采购单号";
            this.gvMx1ebeln.Caption = "ERP采购单号";
            this.gvMx1ebeln.FieldName = "ebeln";
            this.gvMx1ebeln.MinWidth = 120;
            this.gvMx1ebeln.Name = "gvMx1ebeln";
            this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
            this.gvMx1ebeln.Tag = "query_a.ebeln";
            this.gvMx1ebeln.Visible = true;
            this.gvMx1ebeln.VisibleIndex = 2;
            this.gvMx1ebeln.VisibleIndex = 1;
            this.gvMx1ebeln.Width = 120;
            // 
            // gvMx1guid
@@ -477,9 +477,9 @@
            this.gvAbtGuid,
            this.gvMx1guid,
            this.gvMxDel,
            this.gridColumn3,
            this.gvMx1ebeln,
            this.gvMx1ebelnLine,
            this.gridColumn3,
            this.gvMx1returnFlag,
            this.gvMx1urgentFlag,
            this.gvMx1isdepsIn,
@@ -528,10 +528,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.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)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -539,12 +539,12 @@
            // gridColumn3
            // 
            this.gridColumn3.Caption = "采购时间";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.MinWidth = 100;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.OptionsColumn.ReadOnly = true;
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 1;
            this.gridColumn3.Width = 94;
            this.gridColumn3.VisibleIndex = 3;
            this.gridColumn3.Width = 100;
            // 
            // gv_thstatus
            // 
@@ -858,7 +858,7 @@
            // 
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = "MES_INV_ITEM_ARN,check_date,fstatus,check_user,000chk_CgdhdCommit";
            this.toolBarMenu1.chkParameter = "0,0,0,0,000chk_iqc_arn_submit";
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -22,7 +22,6 @@
    {
        private List<FilterEntity> _filterList = new List<FilterEntity>();
        private readonly string _webServiceName = "MesInvItemArnManager/";
        public Frm_MesInvItemArn()
        {
            InitializeComponent();
@@ -65,7 +64,8 @@
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择供应商,才能选择来料明细!");
                    return;
                }
                var frm = new SelectCgMx(this.txt_suppNo.GetCode());
                System.Text.StringBuilder sbWhere = new StringBuilder();
                var frm = new SelectCgMx(this.txt_suppNo.GetCode(), sbWhere.ToString());
                frm.UpdateParent += (ss, ee) =>
                {
                    var lst = new List<string>();
@@ -455,6 +455,11 @@
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据,确定删除吗?"))
                    return;
                if (string.IsNullOrEmpty(mxGuid))
                {
                    gvMx1.DeleteRow(rowhandle);
                    return;
                }
                var strJson = "";
                var lst = new List<string>();
                lst.Add(mxGuid);
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -170,6 +170,7 @@
            this.txt_checkFalg = new DevExpress.XtraEditors.CheckEdit();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.gv_erpid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -224,7 +225,7 @@
            this.gvMx1demandDocumentLineId.Name = "gvMx1demandDocumentLineId";
            this.gvMx1demandDocumentLineId.Tag = "query_a.DEMAND_DOCUMENT_LINE_ID";
            this.gvMx1demandDocumentLineId.Visible = true;
            this.gvMx1demandDocumentLineId.VisibleIndex = 36;
            this.gvMx1demandDocumentLineId.VisibleIndex = 37;
            this.gvMx1demandDocumentLineId.Width = 100;
            // 
            // gvMx1demandDocumentId
@@ -237,7 +238,7 @@
            this.gvMx1demandDocumentId.Name = "gvMx1demandDocumentId";
            this.gvMx1demandDocumentId.Tag = "query_a.DEMAND_DOCUMENT_ID";
            this.gvMx1demandDocumentId.Visible = true;
            this.gvMx1demandDocumentId.VisibleIndex = 35;
            this.gvMx1demandDocumentId.VisibleIndex = 36;
            this.gvMx1demandDocumentId.Width = 100;
            // 
            // gvMx1demandSource
@@ -250,7 +251,7 @@
            this.gvMx1demandSource.Name = "gvMx1demandSource";
            this.gvMx1demandSource.Tag = "query_a.DEMAND_SOURCE";
            this.gvMx1demandSource.Visible = true;
            this.gvMx1demandSource.VisibleIndex = 34;
            this.gvMx1demandSource.VisibleIndex = 35;
            this.gvMx1demandSource.Width = 100;
            // 
            // gvMx1changeFlag
@@ -263,7 +264,7 @@
            this.gvMx1changeFlag.Name = "gvMx1changeFlag";
            this.gvMx1changeFlag.Tag = "query_a.CHANGE_FLAG";
            this.gvMx1changeFlag.Visible = true;
            this.gvMx1changeFlag.VisibleIndex = 33;
            this.gvMx1changeFlag.VisibleIndex = 34;
            this.gvMx1changeFlag.Width = 100;
            // 
            // gvMx1planTrackingId
@@ -276,7 +277,7 @@
            this.gvMx1planTrackingId.Name = "gvMx1planTrackingId";
            this.gvMx1planTrackingId.Tag = "query_a.PLAN_TRACKING_ID";
            this.gvMx1planTrackingId.Visible = true;
            this.gvMx1planTrackingId.VisibleIndex = 32;
            this.gvMx1planTrackingId.VisibleIndex = 33;
            this.gvMx1planTrackingId.Width = 100;
            // 
            // gvMx1demandTrackingId
@@ -289,7 +290,7 @@
            this.gvMx1demandTrackingId.Name = "gvMx1demandTrackingId";
            this.gvMx1demandTrackingId.Tag = "query_a.DEMAND_TRACKING_ID";
            this.gvMx1demandTrackingId.Visible = true;
            this.gvMx1demandTrackingId.VisibleIndex = 31;
            this.gvMx1demandTrackingId.VisibleIndex = 32;
            this.gvMx1demandTrackingId.Width = 100;
            // 
            // gvMx1sourceDocumentId
@@ -302,7 +303,7 @@
            this.gvMx1sourceDocumentId.Name = "gvMx1sourceDocumentId";
            this.gvMx1sourceDocumentId.Tag = "query_a.SOURCE_DOCUMENT_ID";
            this.gvMx1sourceDocumentId.Visible = true;
            this.gvMx1sourceDocumentId.VisibleIndex = 30;
            this.gvMx1sourceDocumentId.VisibleIndex = 31;
            this.gvMx1sourceDocumentId.Width = 100;
            // 
            // gvMx1sourceDocumentType
@@ -315,7 +316,7 @@
            this.gvMx1sourceDocumentType.Name = "gvMx1sourceDocumentType";
            this.gvMx1sourceDocumentType.Tag = "query_a.SOURCE_DOCUMENT_TYPE";
            this.gvMx1sourceDocumentType.Visible = true;
            this.gvMx1sourceDocumentType.VisibleIndex = 29;
            this.gvMx1sourceDocumentType.VisibleIndex = 30;
            this.gvMx1sourceDocumentType.Width = 100;
            // 
            // gvMx1returnableStoredQty
@@ -328,7 +329,7 @@
            this.gvMx1returnableStoredQty.Name = "gvMx1returnableStoredQty";
            this.gvMx1returnableStoredQty.Tag = "query_a.RETURNABLE_STORED_QTY";
            this.gvMx1returnableStoredQty.Visible = true;
            this.gvMx1returnableStoredQty.VisibleIndex = 28;
            this.gvMx1returnableStoredQty.VisibleIndex = 29;
            this.gvMx1returnableStoredQty.Width = 100;
            // 
            // gvMx1returnableReceivedQty
@@ -341,7 +342,7 @@
            this.gvMx1returnableReceivedQty.Name = "gvMx1returnableReceivedQty";
            this.gvMx1returnableReceivedQty.Tag = "query_a.RETURNABLE_RECEIVED_QTY";
            this.gvMx1returnableReceivedQty.Visible = true;
            this.gvMx1returnableReceivedQty.VisibleIndex = 27;
            this.gvMx1returnableReceivedQty.VisibleIndex = 28;
            this.gvMx1returnableReceivedQty.Width = 100;
            // 
            // gvMx1totalReturnedQty
@@ -354,7 +355,7 @@
            this.gvMx1totalReturnedQty.Name = "gvMx1totalReturnedQty";
            this.gvMx1totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY";
            this.gvMx1totalReturnedQty.Visible = true;
            this.gvMx1totalReturnedQty.VisibleIndex = 26;
            this.gvMx1totalReturnedQty.VisibleIndex = 27;
            this.gvMx1totalReturnedQty.Width = 100;
            // 
            // gvMx1remainingStoredQty
@@ -367,7 +368,7 @@
            this.gvMx1remainingStoredQty.Name = "gvMx1remainingStoredQty";
            this.gvMx1remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY";
            this.gvMx1remainingStoredQty.Visible = true;
            this.gvMx1remainingStoredQty.VisibleIndex = 25;
            this.gvMx1remainingStoredQty.VisibleIndex = 26;
            this.gvMx1remainingStoredQty.Width = 100;
            // 
            // gvMx1totalStoredQty
@@ -380,7 +381,7 @@
            this.gvMx1totalStoredQty.Name = "gvMx1totalStoredQty";
            this.gvMx1totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY";
            this.gvMx1totalStoredQty.Visible = true;
            this.gvMx1totalStoredQty.VisibleIndex = 24;
            this.gvMx1totalStoredQty.VisibleIndex = 25;
            this.gvMx1totalStoredQty.Width = 100;
            // 
            // gvMx1remainingReceivedQty
@@ -393,7 +394,7 @@
            this.gvMx1remainingReceivedQty.Name = "gvMx1remainingReceivedQty";
            this.gvMx1remainingReceivedQty.Tag = "query_a.REMAINING_RECEIVED_QTY";
            this.gvMx1remainingReceivedQty.Visible = true;
            this.gvMx1remainingReceivedQty.VisibleIndex = 22;
            this.gvMx1remainingReceivedQty.VisibleIndex = 23;
            this.gvMx1remainingReceivedQty.Width = 100;
            // 
            // gvMx1totalReceivedQty
@@ -406,7 +407,7 @@
            this.gvMx1totalReceivedQty.Name = "gvMx1totalReceivedQty";
            this.gvMx1totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY";
            this.gvMx1totalReceivedQty.Visible = true;
            this.gvMx1totalReceivedQty.VisibleIndex = 21;
            this.gvMx1totalReceivedQty.VisibleIndex = 22;
            this.gvMx1totalReceivedQty.Width = 100;
            // 
            // gvMx1terminateTime
@@ -419,7 +420,7 @@
            this.gvMx1terminateTime.Name = "gvMx1terminateTime";
            this.gvMx1terminateTime.Tag = "query_a.TERMINATE_TIME";
            this.gvMx1terminateTime.Visible = true;
            this.gvMx1terminateTime.VisibleIndex = 20;
            this.gvMx1terminateTime.VisibleIndex = 21;
            this.gvMx1terminateTime.Width = 100;
            // 
            // gvMx1terminator
@@ -432,7 +433,7 @@
            this.gvMx1terminator.Name = "gvMx1terminator";
            this.gvMx1terminator.Tag = "query_a.TERMINATOR";
            this.gvMx1terminator.Visible = true;
            this.gvMx1terminator.VisibleIndex = 18;
            this.gvMx1terminator.VisibleIndex = 19;
            this.gvMx1terminator.Width = 100;
            // 
            // gvMx1businessTerminate
@@ -445,7 +446,7 @@
            this.gvMx1businessTerminate.Name = "gvMx1businessTerminate";
            this.gvMx1businessTerminate.Tag = "query_a.BUSINESS_TERMINATE";
            this.gvMx1businessTerminate.Visible = true;
            this.gvMx1businessTerminate.VisibleIndex = 23;
            this.gvMx1businessTerminate.VisibleIndex = 24;
            this.gvMx1businessTerminate.Width = 94;
            // 
            // gvMx1freezeTime
@@ -458,7 +459,7 @@
            this.gvMx1freezeTime.Name = "gvMx1freezeTime";
            this.gvMx1freezeTime.Tag = "query_a.FREEZE_TIME";
            this.gvMx1freezeTime.Visible = true;
            this.gvMx1freezeTime.VisibleIndex = 16;
            this.gvMx1freezeTime.VisibleIndex = 17;
            this.gvMx1freezeTime.Width = 100;
            // 
            // gvMx1freezer
@@ -471,7 +472,7 @@
            this.gvMx1freezer.Name = "gvMx1freezer";
            this.gvMx1freezer.Tag = "query_a.FREEZER";
            this.gvMx1freezer.Visible = true;
            this.gvMx1freezer.VisibleIndex = 15;
            this.gvMx1freezer.VisibleIndex = 16;
            this.gvMx1freezer.Width = 100;
            // 
            // gvMx1businessFreeze
@@ -484,7 +485,7 @@
            this.gvMx1businessFreeze.Name = "gvMx1businessFreeze";
            this.gvMx1businessFreeze.Tag = "query_a.BUSINESS_FREEZE";
            this.gvMx1businessFreeze.Visible = true;
            this.gvMx1businessFreeze.VisibleIndex = 19;
            this.gvMx1businessFreeze.VisibleIndex = 20;
            this.gvMx1businessFreeze.Width = 94;
            // 
            // gvMx1businessClose
@@ -497,7 +498,7 @@
            this.gvMx1businessClose.Name = "gvMx1businessClose";
            this.gvMx1businessClose.Tag = "query_a.BUSINESS_CLOSE";
            this.gvMx1businessClose.Visible = true;
            this.gvMx1businessClose.VisibleIndex = 14;
            this.gvMx1businessClose.VisibleIndex = 15;
            this.gvMx1businessClose.Width = 100;
            // 
            // gvMx1batchNumber
@@ -510,7 +511,7 @@
            this.gvMx1batchNumber.Name = "gvMx1batchNumber";
            this.gvMx1batchNumber.Tag = "query_a.BATCH_NUMBER";
            this.gvMx1batchNumber.Visible = true;
            this.gvMx1batchNumber.VisibleIndex = 17;
            this.gvMx1batchNumber.VisibleIndex = 18;
            this.gvMx1batchNumber.Width = 94;
            // 
            // gvMx1outsourcingOrderId
@@ -523,7 +524,7 @@
            this.gvMx1outsourcingOrderId.Name = "gvMx1outsourcingOrderId";
            this.gvMx1outsourcingOrderId.Tag = "query_a.OUTSOURCING_ORDER_ID";
            this.gvMx1outsourcingOrderId.Visible = true;
            this.gvMx1outsourcingOrderId.VisibleIndex = 13;
            this.gvMx1outsourcingOrderId.VisibleIndex = 14;
            this.gvMx1outsourcingOrderId.Width = 100;
            // 
            // gvMx1remarks
@@ -536,7 +537,7 @@
            this.gvMx1remarks.Name = "gvMx1remarks";
            this.gvMx1remarks.Tag = "query_a.REMARKS";
            this.gvMx1remarks.Visible = true;
            this.gvMx1remarks.VisibleIndex = 12;
            this.gvMx1remarks.VisibleIndex = 13;
            this.gvMx1remarks.Width = 100;
            // 
            // gvMx1isGift
@@ -549,7 +550,7 @@
            this.gvMx1isGift.Name = "gvMx1isGift";
            this.gvMx1isGift.Tag = "query_a.IS_GIFT";
            this.gvMx1isGift.Visible = true;
            this.gvMx1isGift.VisibleIndex = 11;
            this.gvMx1isGift.VisibleIndex = 12;
            this.gvMx1isGift.Width = 100;
            // 
            // gvMx1latestDeliveryDate
@@ -562,7 +563,7 @@
            this.gvMx1latestDeliveryDate.Name = "gvMx1latestDeliveryDate";
            this.gvMx1latestDeliveryDate.Tag = "query_a.LATEST_DELIVERY_DATE";
            this.gvMx1latestDeliveryDate.Visible = true;
            this.gvMx1latestDeliveryDate.VisibleIndex = 10;
            this.gvMx1latestDeliveryDate.VisibleIndex = 11;
            this.gvMx1latestDeliveryDate.Width = 200;
            // 
            // gvMx1earliestDeliveryDate
@@ -575,7 +576,7 @@
            this.gvMx1earliestDeliveryDate.Name = "gvMx1earliestDeliveryDate";
            this.gvMx1earliestDeliveryDate.Tag = "query_a.EARLIEST_DELIVERY_DATE";
            this.gvMx1earliestDeliveryDate.Visible = true;
            this.gvMx1earliestDeliveryDate.VisibleIndex = 9;
            this.gvMx1earliestDeliveryDate.VisibleIndex = 10;
            this.gvMx1earliestDeliveryDate.Width = 200;
            // 
            // gvMx1deliveryDate
@@ -588,7 +589,7 @@
            this.gvMx1deliveryDate.Name = "gvMx1deliveryDate";
            this.gvMx1deliveryDate.Tag = "query_a.DELIVERY_DATE";
            this.gvMx1deliveryDate.Visible = true;
            this.gvMx1deliveryDate.VisibleIndex = 8;
            this.gvMx1deliveryDate.VisibleIndex = 9;
            this.gvMx1deliveryDate.Width = 200;
            // 
            // gvMx1pricingQty
@@ -601,7 +602,7 @@
            this.gvMx1pricingQty.Name = "gvMx1pricingQty";
            this.gvMx1pricingQty.Tag = "query_a.PRICING_QTY";
            this.gvMx1pricingQty.Visible = true;
            this.gvMx1pricingQty.VisibleIndex = 7;
            this.gvMx1pricingQty.VisibleIndex = 8;
            this.gvMx1pricingQty.Width = 100;
            // 
            // gvMx1pricingUnit
@@ -614,7 +615,7 @@
            this.gvMx1pricingUnit.Name = "gvMx1pricingUnit";
            this.gvMx1pricingUnit.Tag = "query_a.PRICING_UNIT";
            this.gvMx1pricingUnit.Visible = true;
            this.gvMx1pricingUnit.VisibleIndex = 6;
            this.gvMx1pricingUnit.VisibleIndex = 7;
            this.gvMx1pricingUnit.Width = 100;
            // 
            // gvMx1inventoryUnit
@@ -627,7 +628,7 @@
            this.gvMx1inventoryUnit.Name = "gvMx1inventoryUnit";
            this.gvMx1inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
            this.gvMx1inventoryUnit.Visible = true;
            this.gvMx1inventoryUnit.VisibleIndex = 5;
            this.gvMx1inventoryUnit.VisibleIndex = 6;
            this.gvMx1inventoryUnit.Width = 100;
            // 
            // gvMx1purchaseQty
@@ -640,7 +641,7 @@
            this.gvMx1purchaseQty.Name = "gvMx1purchaseQty";
            this.gvMx1purchaseQty.Tag = "query_a.PURCHASE_QTY";
            this.gvMx1purchaseQty.Visible = true;
            this.gvMx1purchaseQty.VisibleIndex = 4;
            this.gvMx1purchaseQty.VisibleIndex = 5;
            this.gvMx1purchaseQty.Width = 100;
            // 
            // gvMx1purchaseUnit
@@ -653,7 +654,7 @@
            this.gvMx1purchaseUnit.Name = "gvMx1purchaseUnit";
            this.gvMx1purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
            this.gvMx1purchaseUnit.Visible = true;
            this.gvMx1purchaseUnit.VisibleIndex = 3;
            this.gvMx1purchaseUnit.VisibleIndex = 4;
            this.gvMx1purchaseUnit.Width = 100;
            // 
            // gvMx1itemId
@@ -666,7 +667,7 @@
            this.gvMx1itemId.Name = "gvMx1itemId";
            this.gvMx1itemId.Tag = "query_a.ITEM_ID";
            this.gvMx1itemId.Visible = true;
            this.gvMx1itemId.VisibleIndex = 2;
            this.gvMx1itemId.VisibleIndex = 3;
            this.gvMx1itemId.Width = 100;
            // 
            // gvMx1orderLineId
@@ -679,7 +680,7 @@
            this.gvMx1orderLineId.Name = "gvMx1orderLineId";
            this.gvMx1orderLineId.Tag = "query_a.ORDER_LINE_ID";
            this.gvMx1orderLineId.Visible = true;
            this.gvMx1orderLineId.VisibleIndex = 1;
            this.gvMx1orderLineId.VisibleIndex = 2;
            this.gvMx1orderLineId.Width = 100;
            // 
            // gvMx1salesOrderId
@@ -692,7 +693,7 @@
            this.gvMx1salesOrderId.Name = "gvMx1salesOrderId";
            this.gvMx1salesOrderId.Tag = "query_a.SALES_ORDER_ID";
            this.gvMx1salesOrderId.Visible = true;
            this.gvMx1salesOrderId.VisibleIndex = 0;
            this.gvMx1salesOrderId.VisibleIndex = 1;
            this.gvMx1salesOrderId.Width = 150;
            // 
            // gvMx1guid
@@ -727,6 +728,7 @@
            // gvMx1
            // 
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_erpid,
            this.gvMx1guid,
            this.gvMx1salesOrderId,
            this.gvMx1orderLineId,
@@ -1794,14 +1796,14 @@
            // 
            // gv_factory
            // 
            this.gv_factory.Caption = "工厂";
            this.gv_factory.FieldName = "factory";
            this.gv_factory.MinWidth = 60;
            this.gv_factory.Caption = "ERPID号";
            this.gv_factory.FieldName = "ebelnK3id";
            this.gv_factory.MinWidth = 100;
            this.gv_factory.Name = "gv_factory";
            this.gv_factory.OptionsColumn.AllowEdit = false;
            this.gv_factory.Visible = true;
            this.gv_factory.VisibleIndex = 0;
            this.gv_factory.Width = 60;
            this.gv_factory.Width = 100;
            // 
            // xtraTabControl1
            // 
@@ -1954,6 +1956,16 @@
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            //
            // gv_erpid
            //
            this.gv_erpid.Caption = "ERP中ID";
            this.gv_erpid.FieldName = "ebelnK3id";
            this.gv_erpid.MinWidth = 100;
            this.gv_erpid.Name = "gv_erpid";
            this.gv_erpid.Visible = true;
            this.gv_erpid.VisibleIndex = 0;
            this.gv_erpid.Width = 100;
            // 
            // Frm_MesRohIn
            // 
@@ -2181,5 +2193,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
        private DevExpress.XtraEditors.CheckEdit txt_checkFalg;
        private DevExpress.XtraGrid.Columns.GridColumn gv_erpid;
    }
}
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -265,10 +265,10 @@
    <Compile Include="DevFrm\QC\Frm_MesSysLookups.Designer.cs">
      <DependentUpon>Frm_MesSysLookups.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\Models\MesQaMj.cs" />
    <Compile Include="DevFrm\QC\Models\MesQaItemsDetect01.cs" />
    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail12.cs" />
    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail5.cs" />
    <Compile Include="DevFrm\QC\Models\MesQaMj.cs" />
    <Compile Include="DevFrm\QC\Models\MesQmAql1.cs" />
    <Compile Include="DevFrm\QC\Models\MesQmAql2.cs" />
    <Compile Include="DevFrm\QC\Models\MesQmAql3.cs" />
@@ -772,9 +772,6 @@
    <None Include="Resources\spellcheck_16x16.png" />
    <None Include="Resources\clearformatting_16x16.png" />
    <None Include="Resources\sortandfilter_16x16.png" />
    <Compile Include="DevFrm\QC\Models\MesQaItemsDetect01.cs" />
    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail12.cs" />
    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail5.cs" />
    <None Include="Resources\deletetablecells_32x32.png" />
    <None Include="Resources\deletetablecells_16x16.png" />
    <None Include="Resources\checkbox2_32x322.png" />
@@ -801,6 +798,7 @@
    <None Include="Resources\fill_16x16.png" />
    <None Include="Resources\bouser_16x162.png" />
    <None Include="Resources\refresh_32x32.png" />
    <None Include="Resources\refresh_32x321.png" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />
DevApp/Gs.DevApp/Gs.DevApp.csproj.user
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectView>ShowAllFiles</ProjectView>
    <PublishUrlHistory>publish\</PublishUrlHistory>
    <InstallUrlHistory />
    <SupportUrlHistory />
DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -1013,6 +1013,16 @@
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap refresh_32x321 {
            get {
                object obj = ResourceManager.GetObject("refresh_32x321", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap removegroupfooter_16x16 {
            get {
                object obj = ResourceManager.GetObject("removegroupfooter_16x16", resourceCulture);
DevApp/Gs.DevApp/Properties/Resources.resx
@@ -141,16 +141,13 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_allmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_allmarkup_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="linktoprevious_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\linktoprevious_16x16.png;System.Drawing.Bitmap,
  <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -174,13 +171,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="removegroupfooter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\removegroupfooter_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="knowledgebasearticle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\knowledgebasearticle_16x16.png;System.Drawing.Bitmap,
  <data name="convert_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\convert_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -208,8 +200,21 @@
  <data name="sendxls_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sendxls_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="forcetesting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\forcetesting_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="doubleprev_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\doubleprev_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -251,13 +256,13 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="time2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\time2_16x16.png;System.Drawing.Bitmap,
  <data name="addfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\addfooter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="3dcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3dcolumn_32x32.png;System.Drawing.Bitmap,
  <data name="time2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\time2_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -276,19 +281,11 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="sortbyinvoice_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyinvoice_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="formatnumbergeneral_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\formatnumbergeneral_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
@@ -313,8 +310,10 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="converttorange_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="formatnumbertime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\formatnumbertime_16x16.png;System.Drawing.Bitmap,
@@ -326,8 +325,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="addfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\addfooter_32x32.png;System.Drawing.Bitmap,
  <data name="linktoprevious_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\linktoprevious_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -346,6 +345,12 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="refresh_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="listmultilevel_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\listmultilevel_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -358,17 +363,25 @@
  <data name="checkbuttons_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="3dcylinder_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3dcylinder_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bouser_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bouser_16x161.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="logo_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -383,9 +396,6 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="cleartablestyle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\cleartablestyle_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -396,18 +406,13 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="exportfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\exportfile_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="3dcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3dcolumn_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -419,18 +424,15 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editrangepermission_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editrangepermission_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bouser_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bouser_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="formatnumbergeneral_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\formatnumbergeneral_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap,
@@ -442,11 +444,13 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortbyorderdate_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyorderdate_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -455,8 +459,13 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
  <data name="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\task_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editname_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editname_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -480,11 +489,6 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -493,16 +497,18 @@
  <data name="forcetesting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\forcetesting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="wraptext2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wraptext2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="convert_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\convert_16x16.png;System.Drawing.Bitmap,
  <data name="3dcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3dcolumn_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbuttons_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_16x161.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_allmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_allmarkup_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -519,8 +525,8 @@
  <data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="filledradarwithoutmarkers_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\filledradarwithoutmarkers_32x32.png;System.Drawing.Bitmap,
  <data name="serieslines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\serieslines_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -532,8 +538,10 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortbyinvoice_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyinvoice_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="removegroupfooter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\removegroupfooter_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap,
@@ -545,18 +553,16 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="serieslines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\serieslines_32x32.png;System.Drawing.Bitmap,
  <data name="knowledgebasearticle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\knowledgebasearticle_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortbyinvoice_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyinvoice_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="converttorange_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -571,13 +577,14 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="sortbyorderdate_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyorderdate_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editrangepermission_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editrangepermission_16x16.png;System.Drawing.Bitmap,
  <data name="boposition2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boposition2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -607,13 +614,13 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editname_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editname_32x32.png;System.Drawing.Bitmap,
  <data name="wraptext2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wraptext2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editrangepermission_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editrangepermission_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="publicfix_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\publicfix_32x32.png;System.Drawing.Bitmap,
@@ -633,15 +640,13 @@
  <data name="converttorange_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="doubleprev_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\doubleprev_16x16.png;System.Drawing.Bitmap,
  <data name="editrangepermission_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editrangepermission_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
@@ -651,26 +656,28 @@
  <data name="forcetesting_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\forcetesting_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="lookup&amp;reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\lookup&amp;reference_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="first_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\first_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\task_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_allmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_allmarkup_16x16.png;System.Drawing.Bitmap,
  <data name="3dcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3dcolumn_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -685,23 +692,19 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap,
  <data name="filledradarwithoutmarkers_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\filledradarwithoutmarkers_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bouser_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bouser_16x161.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="boposition2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boposition2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="3dcylinder_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3dcylinder_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="download_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\download_32x32.png;System.Drawing.Bitmap,
@@ -716,12 +719,12 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap,
  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="refresh_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
</root>
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -34,8 +34,6 @@
            this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_purchaseQty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -45,22 +43,12 @@
            this.gv_deliveryDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_earliestDeliveryDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_latestDeliveryDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_demandOrg = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_receivingOrg = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_settlementOrg = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_isGift = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_outsourcingOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_batchNumber = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_businessClose = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_businessFreeze = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_freezer = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_freezeTime = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_businessTerminate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_terminator = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_terminateTime = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_totalReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_remainingReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_totalStoredQty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -68,23 +56,14 @@
            this.gv_totalReturnedQty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_returnableReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_returnableStoredQty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_sourceDocumentType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_sourceDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_demandTrackingId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_planTrackingId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_changeFlag = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_demandSource = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_demandDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_demandDocumentLineId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_erpId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_purchaseOrderLineNumber = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -113,10 +92,10 @@
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_chk,
            this.gv_guid,
            this.gv_ebelnK3id,
            this.gv_billNo,
            this.gv_salesOrderId,
            this.gv_orderLineId,
            this.gv_itemId,
            this.gridColumn1,
            this.gv_purchaseUnit,
            this.gv_purchaseQty,
            this.gv_inventoryUnit,
@@ -125,22 +104,12 @@
            this.gv_deliveryDate,
            this.gv_earliestDeliveryDate,
            this.gv_latestDeliveryDate,
            this.gv_demandOrg,
            this.gv_receivingOrg,
            this.gv_settlementOrg,
            this.gv_isGift,
            this.gv_remarks,
            this.gv_supplierItemCode,
            this.gv_supplierItemName,
            this.gv_outsourcingOrderId,
            this.gv_batchNumber,
            this.gv_businessClose,
            this.gv_businessFreeze,
            this.gv_freezer,
            this.gv_freezeTime,
            this.gv_businessTerminate,
            this.gv_terminator,
            this.gv_terminateTime,
            this.gv_totalReceivedQty,
            this.gv_remainingReceivedQty,
            this.gv_totalStoredQty,
@@ -148,18 +117,7 @@
            this.gv_totalReturnedQty,
            this.gv_returnableReceivedQty,
            this.gv_returnableStoredQty,
            this.gv_sourceDocumentType,
            this.gv_sourceDocumentId,
            this.gv_demandTrackingId,
            this.gv_planTrackingId,
            this.gv_changeFlag,
            this.gv_demandSource,
            this.gv_demandDocumentId,
            this.gv_demandDocumentLineId,
            this.gv_ebelnK3id,
            this.gv_id,
            this.gv_erpId,
            this.gv_purchaseOrderLineNumber});
            this.gv_changeFlag});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -193,659 +151,351 @@
            // 
            this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_billNo.AppearanceCell.Options.UseFont = true;
            this.gv_billNo.Caption = "采购单号 ";
            this.gv_billNo.Caption = "采购单号";
            this.gv_billNo.FieldName = "billNo";
            this.gv_billNo.MinWidth = 100;
            this.gv_billNo.MinWidth = 110;
            this.gv_billNo.Name = "gv_billNo";
            this.gv_billNo.OptionsColumn.AllowEdit = false;
            this.gv_billNo.Tag = "query_a.BILL_NO";
            this.gv_billNo.Visible = true;
            this.gv_billNo.VisibleIndex = 1;
            this.gv_billNo.Width = 100;
            //
            // gv_salesOrderId
            //
            this.gv_salesOrderId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_salesOrderId.AppearanceCell.Options.UseFont = true;
            this.gv_salesOrderId.Caption = "销售订单号 ";
            this.gv_salesOrderId.FieldName = "salesOrderId";
            this.gv_salesOrderId.MinWidth = 100;
            this.gv_salesOrderId.Name = "gv_salesOrderId";
            this.gv_salesOrderId.OptionsColumn.AllowEdit = false;
            this.gv_salesOrderId.Tag = "query_a.SALES_ORDER_ID";
            this.gv_salesOrderId.Visible = true;
            this.gv_salesOrderId.VisibleIndex = 2;
            this.gv_salesOrderId.Width = 100;
            //
            // gv_orderLineId
            //
            this.gv_orderLineId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_orderLineId.AppearanceCell.Options.UseFont = true;
            this.gv_orderLineId.Caption = "采购订单行号 ";
            this.gv_orderLineId.FieldName = "orderLineId";
            this.gv_orderLineId.MinWidth = 100;
            this.gv_orderLineId.Name = "gv_orderLineId";
            this.gv_orderLineId.OptionsColumn.AllowEdit = false;
            this.gv_orderLineId.Tag = "query_a.ORDER_LINE_ID";
            this.gv_orderLineId.Visible = true;
            this.gv_orderLineId.VisibleIndex = 3;
            this.gv_orderLineId.Width = 100;
            this.gv_billNo.VisibleIndex = 2;
            this.gv_billNo.Width = 110;
            // 
            // gv_itemId
            // 
            this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_itemId.AppearanceCell.Options.UseFont = true;
            this.gv_itemId.Caption = "物料编码 ";
            this.gv_itemId.Caption = "物料编码";
            this.gv_itemId.FieldName = "itemId";
            this.gv_itemId.MinWidth = 100;
            this.gv_itemId.Name = "gv_itemId";
            this.gv_itemId.OptionsColumn.AllowEdit = false;
            this.gv_itemId.Tag = "query_a.ITEM_ID";
            this.gv_itemId.Visible = true;
            this.gv_itemId.VisibleIndex = 4;
            this.gv_itemId.VisibleIndex = 3;
            this.gv_itemId.Width = 100;
            // 
            // gv_purchaseUnit
            // 
            this.gv_purchaseUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
            this.gv_purchaseUnit.Caption = "采购单位 ";
            this.gv_purchaseUnit.Caption = "采购单位";
            this.gv_purchaseUnit.FieldName = "purchaseUnit";
            this.gv_purchaseUnit.MinWidth = 100;
            this.gv_purchaseUnit.Name = "gv_purchaseUnit";
            this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
            this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
            this.gv_purchaseUnit.Visible = true;
            this.gv_purchaseUnit.VisibleIndex = 5;
            this.gv_purchaseUnit.VisibleIndex = 4;
            this.gv_purchaseUnit.Width = 100;
            // 
            // gv_purchaseQty
            // 
            this.gv_purchaseQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_purchaseQty.AppearanceCell.Options.UseFont = true;
            this.gv_purchaseQty.Caption = "采购数量 ";
            this.gv_purchaseQty.Caption = "采购数量";
            this.gv_purchaseQty.FieldName = "purchaseQty";
            this.gv_purchaseQty.MinWidth = 100;
            this.gv_purchaseQty.Name = "gv_purchaseQty";
            this.gv_purchaseQty.OptionsColumn.AllowEdit = false;
            this.gv_purchaseQty.Tag = "query_a.PURCHASE_QTY";
            this.gv_purchaseQty.Visible = true;
            this.gv_purchaseQty.VisibleIndex = 6;
            this.gv_purchaseQty.VisibleIndex = 5;
            this.gv_purchaseQty.Width = 100;
            // 
            // gv_inventoryUnit
            // 
            this.gv_inventoryUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_inventoryUnit.AppearanceCell.Options.UseFont = true;
            this.gv_inventoryUnit.Caption = "库存单位 ";
            this.gv_inventoryUnit.Caption = "库存单位";
            this.gv_inventoryUnit.FieldName = "inventoryUnit";
            this.gv_inventoryUnit.MinWidth = 100;
            this.gv_inventoryUnit.Name = "gv_inventoryUnit";
            this.gv_inventoryUnit.OptionsColumn.AllowEdit = false;
            this.gv_inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
            this.gv_inventoryUnit.Visible = true;
            this.gv_inventoryUnit.VisibleIndex = 7;
            this.gv_inventoryUnit.VisibleIndex = 6;
            this.gv_inventoryUnit.Width = 100;
            // 
            // gv_pricingUnit
            // 
            this.gv_pricingUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_pricingUnit.AppearanceCell.Options.UseFont = true;
            this.gv_pricingUnit.Caption = "计价单位 ";
            this.gv_pricingUnit.Caption = "计价单位";
            this.gv_pricingUnit.FieldName = "pricingUnit";
            this.gv_pricingUnit.MinWidth = 100;
            this.gv_pricingUnit.Name = "gv_pricingUnit";
            this.gv_pricingUnit.OptionsColumn.AllowEdit = false;
            this.gv_pricingUnit.Tag = "query_a.PRICING_UNIT";
            this.gv_pricingUnit.Visible = true;
            this.gv_pricingUnit.VisibleIndex = 8;
            this.gv_pricingUnit.VisibleIndex = 7;
            this.gv_pricingUnit.Width = 100;
            // 
            // gv_pricingQty
            // 
            this.gv_pricingQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_pricingQty.AppearanceCell.Options.UseFont = true;
            this.gv_pricingQty.Caption = "计价数量 ";
            this.gv_pricingQty.Caption = "计价数量";
            this.gv_pricingQty.FieldName = "pricingQty";
            this.gv_pricingQty.MinWidth = 100;
            this.gv_pricingQty.Name = "gv_pricingQty";
            this.gv_pricingQty.OptionsColumn.AllowEdit = false;
            this.gv_pricingQty.Tag = "query_a.PRICING_QTY";
            this.gv_pricingQty.Visible = true;
            this.gv_pricingQty.VisibleIndex = 9;
            this.gv_pricingQty.VisibleIndex = 8;
            this.gv_pricingQty.Width = 100;
            // 
            // gv_deliveryDate
            // 
            this.gv_deliveryDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_deliveryDate.AppearanceCell.Options.UseFont = true;
            this.gv_deliveryDate.Caption = "交货日期 ";
            this.gv_deliveryDate.Caption = "交货日期";
            this.gv_deliveryDate.FieldName = "deliveryDate";
            this.gv_deliveryDate.MinWidth = 100;
            this.gv_deliveryDate.Name = "gv_deliveryDate";
            this.gv_deliveryDate.OptionsColumn.AllowEdit = false;
            this.gv_deliveryDate.Tag = "query_a.DELIVERY_DATE";
            this.gv_deliveryDate.Visible = true;
            this.gv_deliveryDate.VisibleIndex = 10;
            this.gv_deliveryDate.VisibleIndex = 9;
            this.gv_deliveryDate.Width = 100;
            // 
            // gv_earliestDeliveryDate
            // 
            this.gv_earliestDeliveryDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_earliestDeliveryDate.AppearanceCell.Options.UseFont = true;
            this.gv_earliestDeliveryDate.Caption = "最早交货日期 ";
            this.gv_earliestDeliveryDate.Caption = "最早交货日期";
            this.gv_earliestDeliveryDate.FieldName = "earliestDeliveryDate";
            this.gv_earliestDeliveryDate.MinWidth = 100;
            this.gv_earliestDeliveryDate.Name = "gv_earliestDeliveryDate";
            this.gv_earliestDeliveryDate.OptionsColumn.AllowEdit = false;
            this.gv_earliestDeliveryDate.Tag = "query_a.EARLIEST_DELIVERY_DATE";
            this.gv_earliestDeliveryDate.Visible = true;
            this.gv_earliestDeliveryDate.VisibleIndex = 11;
            this.gv_earliestDeliveryDate.VisibleIndex = 10;
            this.gv_earliestDeliveryDate.Width = 100;
            // 
            // gv_latestDeliveryDate
            // 
            this.gv_latestDeliveryDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_latestDeliveryDate.AppearanceCell.Options.UseFont = true;
            this.gv_latestDeliveryDate.Caption = "最晚交货日期 ";
            this.gv_latestDeliveryDate.Caption = "最晚交货日期";
            this.gv_latestDeliveryDate.FieldName = "latestDeliveryDate";
            this.gv_latestDeliveryDate.MinWidth = 100;
            this.gv_latestDeliveryDate.Name = "gv_latestDeliveryDate";
            this.gv_latestDeliveryDate.OptionsColumn.AllowEdit = false;
            this.gv_latestDeliveryDate.Tag = "query_a.LATEST_DELIVERY_DATE";
            this.gv_latestDeliveryDate.Visible = true;
            this.gv_latestDeliveryDate.VisibleIndex = 12;
            this.gv_latestDeliveryDate.VisibleIndex = 11;
            this.gv_latestDeliveryDate.Width = 100;
            //
            // gv_demandOrg
            //
            this.gv_demandOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_demandOrg.AppearanceCell.Options.UseFont = true;
            this.gv_demandOrg.Caption = "需求组织 ";
            this.gv_demandOrg.FieldName = "demandOrg";
            this.gv_demandOrg.MinWidth = 100;
            this.gv_demandOrg.Name = "gv_demandOrg";
            this.gv_demandOrg.OptionsColumn.AllowEdit = false;
            this.gv_demandOrg.Tag = "query_a.DEMAND_ORG";
            this.gv_demandOrg.Visible = true;
            this.gv_demandOrg.VisibleIndex = 13;
            this.gv_demandOrg.Width = 100;
            //
            // gv_receivingOrg
            //
            this.gv_receivingOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_receivingOrg.AppearanceCell.Options.UseFont = true;
            this.gv_receivingOrg.Caption = "收料组织 ";
            this.gv_receivingOrg.FieldName = "receivingOrg";
            this.gv_receivingOrg.MinWidth = 100;
            this.gv_receivingOrg.Name = "gv_receivingOrg";
            this.gv_receivingOrg.OptionsColumn.AllowEdit = false;
            this.gv_receivingOrg.Tag = "query_a.RECEIVING_ORG";
            this.gv_receivingOrg.Visible = true;
            this.gv_receivingOrg.VisibleIndex = 14;
            this.gv_receivingOrg.Width = 100;
            //
            // gv_settlementOrg
            //
            this.gv_settlementOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_settlementOrg.AppearanceCell.Options.UseFont = true;
            this.gv_settlementOrg.Caption = "结算组织 ";
            this.gv_settlementOrg.FieldName = "settlementOrg";
            this.gv_settlementOrg.MinWidth = 100;
            this.gv_settlementOrg.Name = "gv_settlementOrg";
            this.gv_settlementOrg.OptionsColumn.AllowEdit = false;
            this.gv_settlementOrg.Tag = "query_a.SETTLEMENT_ORG";
            this.gv_settlementOrg.Visible = true;
            this.gv_settlementOrg.VisibleIndex = 15;
            this.gv_settlementOrg.Width = 100;
            // 
            // gv_isGift
            // 
            this.gv_isGift.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_isGift.AppearanceCell.Options.UseFont = true;
            this.gv_isGift.Caption = "是否赠品 ";
            this.gv_isGift.Caption = "是否赠品";
            this.gv_isGift.FieldName = "isGift";
            this.gv_isGift.MinWidth = 50;
            this.gv_isGift.Name = "gv_isGift";
            this.gv_isGift.OptionsColumn.AllowEdit = false;
            this.gv_isGift.Tag = "query_a.IS_GIFT";
            this.gv_isGift.Visible = true;
            this.gv_isGift.VisibleIndex = 16;
            this.gv_isGift.VisibleIndex = 12;
            this.gv_isGift.Width = 94;
            // 
            // gv_remarks
            // 
            this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_remarks.AppearanceCell.Options.UseFont = true;
            this.gv_remarks.Caption = "备注 ";
            this.gv_remarks.Caption = "备注";
            this.gv_remarks.FieldName = "remarks";
            this.gv_remarks.MinWidth = 100;
            this.gv_remarks.Name = "gv_remarks";
            this.gv_remarks.OptionsColumn.AllowEdit = false;
            this.gv_remarks.Tag = "query_a.REMARKS";
            this.gv_remarks.Visible = true;
            this.gv_remarks.VisibleIndex = 17;
            this.gv_remarks.VisibleIndex = 13;
            this.gv_remarks.Width = 100;
            // 
            // gv_supplierItemCode
            // 
            this.gv_supplierItemCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
            this.gv_supplierItemCode.Caption = "供应商物料编码 ";
            this.gv_supplierItemCode.Caption = "供应商物料编码";
            this.gv_supplierItemCode.FieldName = "supplierItemCode";
            this.gv_supplierItemCode.MinWidth = 100;
            this.gv_supplierItemCode.Name = "gv_supplierItemCode";
            this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
            this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
            this.gv_supplierItemCode.Visible = true;
            this.gv_supplierItemCode.VisibleIndex = 18;
            this.gv_supplierItemCode.VisibleIndex = 14;
            this.gv_supplierItemCode.Width = 100;
            // 
            // gv_supplierItemName
            // 
            this.gv_supplierItemName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
            this.gv_supplierItemName.Caption = "供应商物料名称 ";
            this.gv_supplierItemName.Caption = "供应商物料名称";
            this.gv_supplierItemName.FieldName = "supplierItemName";
            this.gv_supplierItemName.MinWidth = 100;
            this.gv_supplierItemName.Name = "gv_supplierItemName";
            this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
            this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
            this.gv_supplierItemName.Visible = true;
            this.gv_supplierItemName.VisibleIndex = 19;
            this.gv_supplierItemName.VisibleIndex = 15;
            this.gv_supplierItemName.Width = 100;
            // 
            // gv_outsourcingOrderId
            // 
            this.gv_outsourcingOrderId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_outsourcingOrderId.AppearanceCell.Options.UseFont = true;
            this.gv_outsourcingOrderId.Caption = "委外订单号 ";
            this.gv_outsourcingOrderId.Caption = "委外订单号";
            this.gv_outsourcingOrderId.FieldName = "outsourcingOrderId";
            this.gv_outsourcingOrderId.MinWidth = 50;
            this.gv_outsourcingOrderId.Name = "gv_outsourcingOrderId";
            this.gv_outsourcingOrderId.OptionsColumn.AllowEdit = false;
            this.gv_outsourcingOrderId.Tag = "query_a.OUTSOURCING_ORDER_ID";
            this.gv_outsourcingOrderId.Visible = true;
            this.gv_outsourcingOrderId.VisibleIndex = 20;
            this.gv_outsourcingOrderId.VisibleIndex = 16;
            this.gv_outsourcingOrderId.Width = 94;
            // 
            // gv_batchNumber
            // 
            this.gv_batchNumber.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_batchNumber.AppearanceCell.Options.UseFont = true;
            this.gv_batchNumber.Caption = "批次号 ";
            this.gv_batchNumber.Caption = "批次号";
            this.gv_batchNumber.FieldName = "batchNumber";
            this.gv_batchNumber.MinWidth = 50;
            this.gv_batchNumber.Name = "gv_batchNumber";
            this.gv_batchNumber.OptionsColumn.AllowEdit = false;
            this.gv_batchNumber.Tag = "query_a.BATCH_NUMBER";
            this.gv_batchNumber.Visible = true;
            this.gv_batchNumber.VisibleIndex = 21;
            this.gv_batchNumber.VisibleIndex = 17;
            this.gv_batchNumber.Width = 94;
            //
            // gv_businessClose
            //
            this.gv_businessClose.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_businessClose.AppearanceCell.Options.UseFont = true;
            this.gv_businessClose.Caption = "业务关闭标识 ";
            this.gv_businessClose.FieldName = "businessClose";
            this.gv_businessClose.MinWidth = 50;
            this.gv_businessClose.Name = "gv_businessClose";
            this.gv_businessClose.OptionsColumn.AllowEdit = false;
            this.gv_businessClose.Tag = "query_a.BUSINESS_CLOSE";
            this.gv_businessClose.Visible = true;
            this.gv_businessClose.VisibleIndex = 22;
            this.gv_businessClose.Width = 94;
            //
            // gv_businessFreeze
            //
            this.gv_businessFreeze.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_businessFreeze.AppearanceCell.Options.UseFont = true;
            this.gv_businessFreeze.Caption = "业务冻结标识 ";
            this.gv_businessFreeze.FieldName = "businessFreeze";
            this.gv_businessFreeze.MinWidth = 50;
            this.gv_businessFreeze.Name = "gv_businessFreeze";
            this.gv_businessFreeze.OptionsColumn.AllowEdit = false;
            this.gv_businessFreeze.Tag = "query_a.BUSINESS_FREEZE";
            this.gv_businessFreeze.Visible = true;
            this.gv_businessFreeze.VisibleIndex = 23;
            this.gv_businessFreeze.Width = 94;
            //
            // gv_freezer
            //
            this.gv_freezer.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_freezer.AppearanceCell.Options.UseFont = true;
            this.gv_freezer.Caption = "冻结人 ";
            this.gv_freezer.FieldName = "freezer";
            this.gv_freezer.MinWidth = 50;
            this.gv_freezer.Name = "gv_freezer";
            this.gv_freezer.OptionsColumn.AllowEdit = false;
            this.gv_freezer.Tag = "query_a.FREEZER";
            this.gv_freezer.Visible = true;
            this.gv_freezer.VisibleIndex = 24;
            this.gv_freezer.Width = 94;
            //
            // gv_freezeTime
            //
            this.gv_freezeTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_freezeTime.AppearanceCell.Options.UseFont = true;
            this.gv_freezeTime.Caption = "冻结时间 ";
            this.gv_freezeTime.FieldName = "freezeTime";
            this.gv_freezeTime.MinWidth = 50;
            this.gv_freezeTime.Name = "gv_freezeTime";
            this.gv_freezeTime.OptionsColumn.AllowEdit = false;
            this.gv_freezeTime.Tag = "query_a.FREEZE_TIME";
            this.gv_freezeTime.Visible = true;
            this.gv_freezeTime.VisibleIndex = 25;
            this.gv_freezeTime.Width = 94;
            //
            // gv_businessTerminate
            //
            this.gv_businessTerminate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_businessTerminate.AppearanceCell.Options.UseFont = true;
            this.gv_businessTerminate.Caption = "业务终止标识 ";
            this.gv_businessTerminate.FieldName = "businessTerminate";
            this.gv_businessTerminate.MinWidth = 50;
            this.gv_businessTerminate.Name = "gv_businessTerminate";
            this.gv_businessTerminate.OptionsColumn.AllowEdit = false;
            this.gv_businessTerminate.Tag = "query_a.BUSINESS_TERMINATE";
            this.gv_businessTerminate.Visible = true;
            this.gv_businessTerminate.VisibleIndex = 26;
            this.gv_businessTerminate.Width = 94;
            //
            // gv_terminator
            //
            this.gv_terminator.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_terminator.AppearanceCell.Options.UseFont = true;
            this.gv_terminator.Caption = "终止人 ";
            this.gv_terminator.FieldName = "terminator";
            this.gv_terminator.MinWidth = 50;
            this.gv_terminator.Name = "gv_terminator";
            this.gv_terminator.OptionsColumn.AllowEdit = false;
            this.gv_terminator.Tag = "query_a.TERMINATOR";
            this.gv_terminator.Visible = true;
            this.gv_terminator.VisibleIndex = 27;
            this.gv_terminator.Width = 94;
            //
            // gv_terminateTime
            //
            this.gv_terminateTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_terminateTime.AppearanceCell.Options.UseFont = true;
            this.gv_terminateTime.Caption = "终止时间 ";
            this.gv_terminateTime.FieldName = "terminateTime";
            this.gv_terminateTime.MinWidth = 50;
            this.gv_terminateTime.Name = "gv_terminateTime";
            this.gv_terminateTime.OptionsColumn.AllowEdit = false;
            this.gv_terminateTime.Tag = "query_a.TERMINATE_TIME";
            this.gv_terminateTime.Visible = true;
            this.gv_terminateTime.VisibleIndex = 28;
            this.gv_terminateTime.Width = 94;
            // 
            // gv_totalReceivedQty
            // 
            this.gv_totalReceivedQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_totalReceivedQty.AppearanceCell.Options.UseFont = true;
            this.gv_totalReceivedQty.Caption = "总已收数量 ";
            this.gv_totalReceivedQty.Caption = "总已收数量";
            this.gv_totalReceivedQty.FieldName = "totalReceivedQty";
            this.gv_totalReceivedQty.MinWidth = 100;
            this.gv_totalReceivedQty.Name = "gv_totalReceivedQty";
            this.gv_totalReceivedQty.OptionsColumn.AllowEdit = false;
            this.gv_totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY";
            this.gv_totalReceivedQty.Visible = true;
            this.gv_totalReceivedQty.VisibleIndex = 29;
            this.gv_totalReceivedQty.VisibleIndex = 20;
            this.gv_totalReceivedQty.Width = 100;
            // 
            // gv_remainingReceivedQty
            // 
            this.gv_remainingReceivedQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_remainingReceivedQty.AppearanceCell.Options.UseFont = true;
            this.gv_remainingReceivedQty.Caption = "剩余收货数量 ";
            this.gv_remainingReceivedQty.Caption = "剩余收货数量";
            this.gv_remainingReceivedQty.FieldName = "remainingReceivedQty";
            this.gv_remainingReceivedQty.MinWidth = 100;
            this.gv_remainingReceivedQty.Name = "gv_remainingReceivedQty";
            this.gv_remainingReceivedQty.OptionsColumn.AllowEdit = false;
            this.gv_remainingReceivedQty.Tag = "query_a.REMAINING_RECEIVED_QTY";
            this.gv_remainingReceivedQty.Visible = true;
            this.gv_remainingReceivedQty.VisibleIndex = 30;
            this.gv_remainingReceivedQty.VisibleIndex = 21;
            this.gv_remainingReceivedQty.Width = 100;
            // 
            // gv_totalStoredQty
            // 
            this.gv_totalStoredQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_totalStoredQty.AppearanceCell.Options.UseFont = true;
            this.gv_totalStoredQty.Caption = "总已入库数量 ";
            this.gv_totalStoredQty.Caption = "总已入库数量";
            this.gv_totalStoredQty.FieldName = "totalStoredQty";
            this.gv_totalStoredQty.MinWidth = 100;
            this.gv_totalStoredQty.Name = "gv_totalStoredQty";
            this.gv_totalStoredQty.OptionsColumn.AllowEdit = false;
            this.gv_totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY";
            this.gv_totalStoredQty.Visible = true;
            this.gv_totalStoredQty.VisibleIndex = 31;
            this.gv_totalStoredQty.VisibleIndex = 22;
            this.gv_totalStoredQty.Width = 100;
            // 
            // gv_remainingStoredQty
            // 
            this.gv_remainingStoredQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_remainingStoredQty.AppearanceCell.Options.UseFont = true;
            this.gv_remainingStoredQty.Caption = "剩余入库数量 ";
            this.gv_remainingStoredQty.Caption = "剩余入库数量";
            this.gv_remainingStoredQty.FieldName = "remainingStoredQty";
            this.gv_remainingStoredQty.MinWidth = 100;
            this.gv_remainingStoredQty.Name = "gv_remainingStoredQty";
            this.gv_remainingStoredQty.OptionsColumn.AllowEdit = false;
            this.gv_remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY";
            this.gv_remainingStoredQty.Visible = true;
            this.gv_remainingStoredQty.VisibleIndex = 32;
            this.gv_remainingStoredQty.VisibleIndex = 23;
            this.gv_remainingStoredQty.Width = 100;
            // 
            // gv_totalReturnedQty
            // 
            this.gv_totalReturnedQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_totalReturnedQty.AppearanceCell.Options.UseFont = true;
            this.gv_totalReturnedQty.Caption = "总退货数量 ";
            this.gv_totalReturnedQty.Caption = "总退货数量";
            this.gv_totalReturnedQty.FieldName = "totalReturnedQty";
            this.gv_totalReturnedQty.MinWidth = 100;
            this.gv_totalReturnedQty.Name = "gv_totalReturnedQty";
            this.gv_totalReturnedQty.OptionsColumn.AllowEdit = false;
            this.gv_totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY";
            this.gv_totalReturnedQty.Visible = true;
            this.gv_totalReturnedQty.VisibleIndex = 33;
            this.gv_totalReturnedQty.VisibleIndex = 24;
            this.gv_totalReturnedQty.Width = 100;
            // 
            // gv_returnableReceivedQty
            // 
            this.gv_returnableReceivedQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_returnableReceivedQty.AppearanceCell.Options.UseFont = true;
            this.gv_returnableReceivedQty.Caption = "可退收货数量 ";
            this.gv_returnableReceivedQty.Caption = "可退收货数量";
            this.gv_returnableReceivedQty.FieldName = "returnableReceivedQty";
            this.gv_returnableReceivedQty.MinWidth = 100;
            this.gv_returnableReceivedQty.Name = "gv_returnableReceivedQty";
            this.gv_returnableReceivedQty.OptionsColumn.AllowEdit = false;
            this.gv_returnableReceivedQty.Tag = "query_a.RETURNABLE_RECEIVED_QTY";
            this.gv_returnableReceivedQty.Visible = true;
            this.gv_returnableReceivedQty.VisibleIndex = 34;
            this.gv_returnableReceivedQty.VisibleIndex = 25;
            this.gv_returnableReceivedQty.Width = 100;
            // 
            // gv_returnableStoredQty
            // 
            this.gv_returnableStoredQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_returnableStoredQty.AppearanceCell.Options.UseFont = true;
            this.gv_returnableStoredQty.Caption = "可退入库数量 ";
            this.gv_returnableStoredQty.Caption = "可退入库数量";
            this.gv_returnableStoredQty.FieldName = "returnableStoredQty";
            this.gv_returnableStoredQty.MinWidth = 100;
            this.gv_returnableStoredQty.Name = "gv_returnableStoredQty";
            this.gv_returnableStoredQty.OptionsColumn.AllowEdit = false;
            this.gv_returnableStoredQty.Tag = "query_a.RETURNABLE_STORED_QTY";
            this.gv_returnableStoredQty.Visible = true;
            this.gv_returnableStoredQty.VisibleIndex = 35;
            this.gv_returnableStoredQty.VisibleIndex = 26;
            this.gv_returnableStoredQty.Width = 100;
            //
            // gv_sourceDocumentType
            //
            this.gv_sourceDocumentType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_sourceDocumentType.AppearanceCell.Options.UseFont = true;
            this.gv_sourceDocumentType.Caption = "来源单据类型 ";
            this.gv_sourceDocumentType.FieldName = "sourceDocumentType";
            this.gv_sourceDocumentType.MinWidth = 100;
            this.gv_sourceDocumentType.Name = "gv_sourceDocumentType";
            this.gv_sourceDocumentType.OptionsColumn.AllowEdit = false;
            this.gv_sourceDocumentType.Tag = "query_a.SOURCE_DOCUMENT_TYPE";
            this.gv_sourceDocumentType.Visible = true;
            this.gv_sourceDocumentType.VisibleIndex = 36;
            this.gv_sourceDocumentType.Width = 100;
            //
            // gv_sourceDocumentId
            //
            this.gv_sourceDocumentId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_sourceDocumentId.AppearanceCell.Options.UseFont = true;
            this.gv_sourceDocumentId.Caption = "来源单据号 ";
            this.gv_sourceDocumentId.FieldName = "sourceDocumentId";
            this.gv_sourceDocumentId.MinWidth = 100;
            this.gv_sourceDocumentId.Name = "gv_sourceDocumentId";
            this.gv_sourceDocumentId.OptionsColumn.AllowEdit = false;
            this.gv_sourceDocumentId.Tag = "query_a.SOURCE_DOCUMENT_ID";
            this.gv_sourceDocumentId.Visible = true;
            this.gv_sourceDocumentId.VisibleIndex = 37;
            this.gv_sourceDocumentId.Width = 100;
            //
            // gv_demandTrackingId
            //
            this.gv_demandTrackingId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_demandTrackingId.AppearanceCell.Options.UseFont = true;
            this.gv_demandTrackingId.Caption = "需求跟踪号 ";
            this.gv_demandTrackingId.FieldName = "demandTrackingId";
            this.gv_demandTrackingId.MinWidth = 100;
            this.gv_demandTrackingId.Name = "gv_demandTrackingId";
            this.gv_demandTrackingId.OptionsColumn.AllowEdit = false;
            this.gv_demandTrackingId.Tag = "query_a.DEMAND_TRACKING_ID";
            this.gv_demandTrackingId.Visible = true;
            this.gv_demandTrackingId.VisibleIndex = 38;
            this.gv_demandTrackingId.Width = 100;
            //
            // gv_planTrackingId
            //
            this.gv_planTrackingId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_planTrackingId.AppearanceCell.Options.UseFont = true;
            this.gv_planTrackingId.Caption = "计划跟踪号 ";
            this.gv_planTrackingId.FieldName = "planTrackingId";
            this.gv_planTrackingId.MinWidth = 100;
            this.gv_planTrackingId.Name = "gv_planTrackingId";
            this.gv_planTrackingId.OptionsColumn.AllowEdit = false;
            this.gv_planTrackingId.Tag = "query_a.PLAN_TRACKING_ID";
            this.gv_planTrackingId.Visible = true;
            this.gv_planTrackingId.VisibleIndex = 39;
            this.gv_planTrackingId.Width = 100;
            // 
            // gv_changeFlag
            // 
            this.gv_changeFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_changeFlag.AppearanceCell.Options.UseFont = true;
            this.gv_changeFlag.Caption = "变更标识 ";
            this.gv_changeFlag.Caption = "变更标识";
            this.gv_changeFlag.FieldName = "changeFlag";
            this.gv_changeFlag.MinWidth = 100;
            this.gv_changeFlag.Name = "gv_changeFlag";
            this.gv_changeFlag.OptionsColumn.AllowEdit = false;
            this.gv_changeFlag.Tag = "query_a.CHANGE_FLAG";
            this.gv_changeFlag.Visible = true;
            this.gv_changeFlag.VisibleIndex = 40;
            this.gv_changeFlag.VisibleIndex = 31;
            this.gv_changeFlag.Width = 100;
            //
            // gv_demandSource
            //
            this.gv_demandSource.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_demandSource.AppearanceCell.Options.UseFont = true;
            this.gv_demandSource.Caption = "需求来源 ";
            this.gv_demandSource.FieldName = "demandSource";
            this.gv_demandSource.MinWidth = 100;
            this.gv_demandSource.Name = "gv_demandSource";
            this.gv_demandSource.OptionsColumn.AllowEdit = false;
            this.gv_demandSource.Tag = "query_a.DEMAND_SOURCE";
            this.gv_demandSource.Visible = true;
            this.gv_demandSource.VisibleIndex = 41;
            this.gv_demandSource.Width = 100;
            //
            // gv_demandDocumentId
            //
            this.gv_demandDocumentId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_demandDocumentId.AppearanceCell.Options.UseFont = true;
            this.gv_demandDocumentId.Caption = "需求单据号 ";
            this.gv_demandDocumentId.FieldName = "demandDocumentId";
            this.gv_demandDocumentId.MinWidth = 100;
            this.gv_demandDocumentId.Name = "gv_demandDocumentId";
            this.gv_demandDocumentId.OptionsColumn.AllowEdit = false;
            this.gv_demandDocumentId.Tag = "query_a.DEMAND_DOCUMENT_ID";
            this.gv_demandDocumentId.Visible = true;
            this.gv_demandDocumentId.VisibleIndex = 42;
            this.gv_demandDocumentId.Width = 100;
            //
            // gv_demandDocumentLineId
            //
            this.gv_demandDocumentLineId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_demandDocumentLineId.AppearanceCell.Options.UseFont = true;
            this.gv_demandDocumentLineId.Caption = "需求单据行号 ";
            this.gv_demandDocumentLineId.FieldName = "demandDocumentLineId";
            this.gv_demandDocumentLineId.MinWidth = 100;
            this.gv_demandDocumentLineId.Name = "gv_demandDocumentLineId";
            this.gv_demandDocumentLineId.OptionsColumn.AllowEdit = false;
            this.gv_demandDocumentLineId.Tag = "query_a.DEMAND_DOCUMENT_LINE_ID";
            this.gv_demandDocumentLineId.Visible = true;
            this.gv_demandDocumentLineId.VisibleIndex = 43;
            this.gv_demandDocumentLineId.Width = 100;
            // 
            // gv_ebelnK3id
            // 
            this.gv_ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
            this.gv_ebelnK3id.Caption = "采购订单行号(K3系统) ";
            this.gv_ebelnK3id.Caption = "ERP行ID号";
            this.gv_ebelnK3id.FieldName = "ebelnK3id";
            this.gv_ebelnK3id.MinWidth = 100;
            this.gv_ebelnK3id.Name = "gv_ebelnK3id";
            this.gv_ebelnK3id.OptionsColumn.AllowEdit = false;
            this.gv_ebelnK3id.Tag = "query_a.EBELN_K3ID";
            this.gv_ebelnK3id.Visible = true;
            this.gv_ebelnK3id.VisibleIndex = 44;
            this.gv_ebelnK3id.VisibleIndex = 1;
            this.gv_ebelnK3id.Width = 100;
            //
            // gv_id
            //
            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_id.AppearanceCell.Options.UseFont = true;
            this.gv_id.Caption = "主键ID ";
            this.gv_id.FieldName = "id";
            this.gv_id.MinWidth = 100;
            this.gv_id.Name = "gv_id";
            this.gv_id.OptionsColumn.AllowEdit = false;
            this.gv_id.Tag = "query_a.ID";
            this.gv_id.Visible = true;
            this.gv_id.VisibleIndex = 45;
            this.gv_id.Width = 100;
            //
            // gv_erpId
            //
            this.gv_erpId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_erpId.AppearanceCell.Options.UseFont = true;
            this.gv_erpId.Caption = "ERP系统中的ID ";
            this.gv_erpId.FieldName = "erpId";
            this.gv_erpId.MinWidth = 100;
            this.gv_erpId.Name = "gv_erpId";
            this.gv_erpId.OptionsColumn.AllowEdit = false;
            this.gv_erpId.Tag = "query_a.ERP_ID";
            this.gv_erpId.Visible = true;
            this.gv_erpId.VisibleIndex = 46;
            this.gv_erpId.Width = 100;
            //
            // gv_purchaseOrderLineNumber
            //
            this.gv_purchaseOrderLineNumber.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_purchaseOrderLineNumber.AppearanceCell.Options.UseFont = true;
            this.gv_purchaseOrderLineNumber.Caption = "采购订单行号 ";
            this.gv_purchaseOrderLineNumber.FieldName = "purchaseOrderLineNumber";
            this.gv_purchaseOrderLineNumber.MinWidth = 100;
            this.gv_purchaseOrderLineNumber.Name = "gv_purchaseOrderLineNumber";
            this.gv_purchaseOrderLineNumber.OptionsColumn.AllowEdit = false;
            this.gv_purchaseOrderLineNumber.Tag = "query_a.PURCHASE_ORDER_LINE_NUMBER";
            this.gv_purchaseOrderLineNumber.Visible = true;
            this.gv_purchaseOrderLineNumber.VisibleIndex = 47;
            this.gv_purchaseOrderLineNumber.Width = 100;
            // 
            // xtraTabControl1
            // 
@@ -899,6 +549,16 @@
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            // 
            // gridColumn1
            //
            this.gridColumn1.Caption = "物料ID";
            this.gridColumn1.FieldName = "itemId";
            this.gridColumn1.MinWidth = 80;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 4;
            this.gridColumn1.Width = 94;
            //
            // SelectCgMx
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -927,18 +587,8 @@
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseOrderLineNumber;
        private DevExpress.XtraGrid.Columns.GridColumn gv_erpId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ebelnK3id;
        private DevExpress.XtraGrid.Columns.GridColumn gv_demandDocumentLineId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_demandDocumentId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_demandSource;
        private DevExpress.XtraGrid.Columns.GridColumn gv_changeFlag;
        private DevExpress.XtraGrid.Columns.GridColumn gv_planTrackingId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_demandTrackingId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_sourceDocumentId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_sourceDocumentType;
        private DevExpress.XtraGrid.Columns.GridColumn gv_returnableStoredQty;
        private DevExpress.XtraGrid.Columns.GridColumn gv_returnableReceivedQty;
        private DevExpress.XtraGrid.Columns.GridColumn gv_totalReturnedQty;
@@ -946,22 +596,12 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_totalStoredQty;
        private DevExpress.XtraGrid.Columns.GridColumn gv_remainingReceivedQty;
        private DevExpress.XtraGrid.Columns.GridColumn gv_totalReceivedQty;
        private DevExpress.XtraGrid.Columns.GridColumn gv_terminateTime;
        private DevExpress.XtraGrid.Columns.GridColumn gv_terminator;
        private DevExpress.XtraGrid.Columns.GridColumn gv_businessTerminate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_freezeTime;
        private DevExpress.XtraGrid.Columns.GridColumn gv_freezer;
        private DevExpress.XtraGrid.Columns.GridColumn gv_businessFreeze;
        private DevExpress.XtraGrid.Columns.GridColumn gv_businessClose;
        private DevExpress.XtraGrid.Columns.GridColumn gv_batchNumber;
        private DevExpress.XtraGrid.Columns.GridColumn gv_outsourcingOrderId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
        private DevExpress.XtraGrid.Columns.GridColumn gv_isGift;
        private DevExpress.XtraGrid.Columns.GridColumn gv_settlementOrg;
        private DevExpress.XtraGrid.Columns.GridColumn gv_receivingOrg;
        private DevExpress.XtraGrid.Columns.GridColumn gv_demandOrg;
        private DevExpress.XtraGrid.Columns.GridColumn gv_latestDeliveryDate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_earliestDeliveryDate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_deliveryDate;
@@ -971,12 +611,11 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseQty;
        private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrderId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
        private DevExpress.XtraGrid.Columns.GridColumn gv_chk;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.SimpleButton btnIn;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
    }
}
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -15,14 +15,17 @@
            new List<FilterEntity>();
        private readonly string _webServiceName = "MesRohInDataManager/";
        private string suppCode = "";
        private string strWhere = "";
        /// <summary>
        /// 供应商编号
        /// </summary>
        /// <param name="supp_no"></param>
        public SelectCgMx(string supp_no)
        public SelectCgMx(string _suppCode, string _strWhere)
        {
            InitializeComponent();
            this.suppCode = _suppCode;
            this.strWhere = _strWhere;
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            getPageList(1, UtilityHelper.GetPageSize());
            gridView1.IndicatorWidth = 50;
@@ -72,6 +75,7 @@
        private void getPageList(int curPage, int pageSize)
        {
            var _sbSqlWhere = new StringBuilder();
            _sbSqlWhere.Append(" ");
            foreach (var itm in _filterList)
                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
                                   itm.fileValue + "'");
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -230,7 +230,7 @@
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了1条数据,确定反检验吗?"))
            if (!MsgHelper.AskQuestion("你选择了1条数据,确定撤回检验吗?"))
                return;
            _ckService(0.ToString());
        }
@@ -583,20 +583,20 @@
                        }
                    ///具有联动关系的按钮(提交检验),
                    if (item.Caption == "提交检验")
                    {
                        var ld1 = dt.AsEnumerable().Any(
                            row => row.Field<string>("name") == "提交检验"
                        );
                        if (ld1)
                        {
                            btnJianYan.Visibility = btnFjianYan.Visibility =
                                btnLoad.Visibility = BarItemVisibility.Always;
                            btnJianYan.Visibility = BarItemVisibility.Always;
                            _enabledList.Add(item.Name);
                            continue;
                        }
                    }
                    //if (item.Caption == "提交检验")
                    //{
                    //    var ld1 = dt.AsEnumerable().Any(
                    //        row => row.Field<string>("name") == "提交检验"
                    //    );
                    //    if (ld1)
                    //    {
                    //        btnJianYan.Visibility = btnFjianYan.Visibility =
                    //            btnLoad.Visibility = BarItemVisibility.Always;
                    //        btnJianYan.Visibility = BarItemVisibility.Always;
                    //        _enabledList.Add(item.Name);
                    //        continue;
                    //    }
                    //}
                    //按钮是否在权限表中
                    var exists = dt.AsEnumerable().Any(row =>
@@ -812,7 +812,7 @@
        public string xlsInService { get; set; }
        /// <summary>
        ///     审核参数,表名,字段名,如:MES_HOLIDAY,check_date,check_status,check_by,存储过程名
        ///     审核参数,表名,字段名,如:MES_HOLIDAY(表名),check_date(时间),check_status(状态),check_by(审核人),存储过程名
        /// </summary>
        public string chkParameter { get; set; }