Merge remote-tracking branch 'origin/master'

啊鑫

2024-11-02 cf8c3cb608bceb47bc4ea83fb7a9bfe22cb80d2e

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs

@@ -79,14 +79,13 @@
            this.lb_memo = new DevExpress.XtraEditors.LabelControl();
            this.txt_memo = new DevExpress.XtraEditors.TextEdit();
            this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_guid = 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();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -436,8 +435,8 @@
            // 
            this.gv_isenabled.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_isenabled.AppearanceCell.Options.UseFont = true;
            this.gv_isenabled.Caption = "是否可用 ";
            this.gv_isenabled.FieldName = "isEnabled";
            this.gv_isenabled.Caption = "是否可用";
            this.gv_isenabled.FieldName = "isenabled";
            this.gv_isenabled.MinWidth = 50;
            this.gv_isenabled.Name = "gv_isenabled";
            this.gv_isenabled.OptionsColumn.AllowEdit = false;
@@ -469,14 +468,14 @@
            // 
            this.gv_fversion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_fversion.AppearanceCell.Options.UseFont = true;
            this.gv_fversion.Caption = "版本 ";
            this.gv_fversion.Caption = "版本";
            this.gv_fversion.FieldName = "fVersion";
            this.gv_fversion.MinWidth = 50;
            this.gv_fversion.Name = "gv_fversion";
            this.gv_fversion.OptionsColumn.AllowEdit = false;
            this.gv_fversion.Tag = "query_a.FVERSION";
            this.gv_fversion.Visible = true;
            this.gv_fversion.VisibleIndex = 11;
            this.gv_fversion.VisibleIndex = 8;
            this.gv_fversion.Width = 94;
            // 
            // lb_ftwoCheckdate
@@ -523,14 +522,14 @@
            // 
            this.gv_ftwoCheckor.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_ftwoCheckor.AppearanceCell.Options.UseFont = true;
            this.gv_ftwoCheckor.Caption = "批准人 ";
            this.gv_ftwoCheckor.Caption = "批准人";
            this.gv_ftwoCheckor.FieldName = "fTwoCheckor";
            this.gv_ftwoCheckor.MinWidth = 50;
            this.gv_ftwoCheckor.Name = "gv_ftwoCheckor";
            this.gv_ftwoCheckor.OptionsColumn.AllowEdit = false;
            this.gv_ftwoCheckor.Tag = "query_a.FTWO_CHECKOR";
            this.gv_ftwoCheckor.Visible = true;
            this.gv_ftwoCheckor.VisibleIndex = 10;
            this.gv_ftwoCheckor.VisibleIndex = 11;
            this.gv_ftwoCheckor.Width = 94;
            // 
            // lb_ftwoChecked
@@ -547,8 +546,8 @@
            // 
            this.gv_ftwoChecked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_ftwoChecked.AppearanceCell.Options.UseFont = true;
            this.gv_ftwoChecked.Caption = "批准标记 ";
            this.gv_ftwoChecked.FieldName = "fTwoChecked";
            this.gv_ftwoChecked.Caption = "批准标记";
            this.gv_ftwoChecked.FieldName = "ftwoChecked";
            this.gv_ftwoChecked.MinWidth = 50;
            this.gv_ftwoChecked.Name = "gv_ftwoChecked";
            this.gv_ftwoChecked.OptionsColumn.AllowEdit = false;
@@ -581,14 +580,14 @@
            // 
            this.gv_foneCheckdate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_foneCheckdate.AppearanceCell.Options.UseFont = true;
            this.gv_foneCheckdate.Caption = "审批日期 ";
            this.gv_foneCheckdate.Caption = "审核时间";
            this.gv_foneCheckdate.FieldName = "fOneCheckDate";
            this.gv_foneCheckdate.MinWidth = 50;
            this.gv_foneCheckdate.Name = "gv_foneCheckdate";
            this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
            this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
            this.gv_foneCheckdate.Visible = true;
            this.gv_foneCheckdate.VisibleIndex = 9;
            this.gv_foneCheckdate.VisibleIndex = 10;
            this.gv_foneCheckdate.Width = 94;
            // 
            // lb_foneCheckor
@@ -615,14 +614,14 @@
            // 
            this.gv_foneCheckor.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_foneCheckor.AppearanceCell.Options.UseFont = true;
            this.gv_foneCheckor.Caption = "审批人 ";
            this.gv_foneCheckor.Caption = "审核人";
            this.gv_foneCheckor.FieldName = "fOneCheckor";
            this.gv_foneCheckor.MinWidth = 50;
            this.gv_foneCheckor.Name = "gv_foneCheckor";
            this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
            this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR";
            this.gv_foneCheckor.Visible = true;
            this.gv_foneCheckor.VisibleIndex = 8;
            this.gv_foneCheckor.VisibleIndex = 9;
            this.gv_foneCheckor.Width = 94;
            // 
            // lb_foneChecked
@@ -639,8 +638,8 @@
            // 
            this.gv_foneChecked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_foneChecked.AppearanceCell.Options.UseFont = true;
            this.gv_foneChecked.Caption = "审批标记 ";
            this.gv_foneChecked.FieldName = "fOneChecked";
            this.gv_foneChecked.Caption = "审核标记";
            this.gv_foneChecked.FieldName = "foneChecked";
            this.gv_foneChecked.MinWidth = 50;
            this.gv_foneChecked.Name = "gv_foneChecked";
            this.gv_foneChecked.OptionsColumn.AllowEdit = false;
@@ -660,7 +659,7 @@
            this.gv_name1.OptionsColumn.AllowEdit = false;
            this.gv_name1.Tag = "query_a.NAME1";
            this.gv_name1.Visible = true;
            this.gv_name1.VisibleIndex = 13;
            this.gv_name1.VisibleIndex = 6;
            this.gv_name1.Width = 94;
            // 
            // lb_itemNo
@@ -677,7 +676,7 @@
            // 
            this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_itemNo.AppearanceCell.Options.UseFont = true;
            this.gv_itemNo.Caption = "物料产品编码 ";
            this.gv_itemNo.Caption = "物料产品编码";
            this.gv_itemNo.FieldName = "itemNo";
            this.gv_itemNo.MinWidth = 150;
            this.gv_itemNo.Name = "gv_itemNo";
@@ -710,31 +709,19 @@
            // 
            this.gv_memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_memo.AppearanceCell.Options.UseFont = true;
            this.gv_memo.Caption = "备注 ";
            this.gv_memo.Caption = "备注";
            this.gv_memo.FieldName = "memo";
            this.gv_memo.MinWidth = 50;
            this.gv_memo.Name = "gv_memo";
            this.gv_memo.OptionsColumn.AllowEdit = false;
            this.gv_memo.Tag = "query_a.MEMO";
            this.gv_memo.Visible = true;
            this.gv_memo.VisibleIndex = 12;
            this.gv_memo.VisibleIndex = 13;
            this.gv_memo.Width = 94;
            // 
            // gv_guid
            // 
            this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.Caption = "guid ";
            this.gv_guid.FieldName = "guid";
            this.gv_guid.MinWidth = 50;
            this.gv_guid.Name = "gv_guid";
            this.gv_guid.OptionsColumn.AllowEdit = false;
            this.gv_guid.Tag = "query_a.guid";
            this.gv_guid.Width = 94;
            // 
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = null;
            this.toolBarMenu1.chkParameter = "MES_QM_CHECKITEM,FONE_CHECKDATE,FONE_CHECKED,FONE_CHECKOR,chk_mes_CHECKITEM";
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
@@ -763,21 +750,20 @@
            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_guid,
            this.gv_isenabled,
            this.gv_foneChecked,
            this.gv_ftwoChecked,
            this.gv_itemNo,
            this.gridColumn3,
            this.gridColumn2,
            this.gridColumn4,
            this.gridColumn1,
            this.gv_name1,
            this.gv_fversion,
            this.gv_foneCheckor,
            this.gv_foneCheckdate,
            this.gv_ftwoCheckor,
            this.gv_fversion,
            this.gv_memo,
            this.gv_name1});
            this.gridColumn1,
            this.gridColumn4,
            this.gv_memo});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -807,17 +793,6 @@
            this.gridColumn2.VisibleIndex = 5;
            this.gridColumn2.Width = 94;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "制作时间";
            this.gridColumn4.FieldName = "createDate";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.OptionsColumn.AllowEdit = false;
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 6;
            this.gridColumn4.Width = 94;
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "制作人";
@@ -826,8 +801,19 @@
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.AllowEdit = false;
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 7;
            this.gridColumn1.VisibleIndex = 12;
            this.gridColumn1.Width = 94;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "制作时间";
            this.gridColumn4.FieldName = "createDate";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.OptionsColumn.AllowEdit = false;
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 7;
            this.gridColumn4.Width = 94;
            // 
            // xtraTabControl1
            // 
@@ -1142,7 +1128,6 @@
private DevExpress.XtraEditors.LabelControl lb_memo;
private DevExpress.XtraEditors.TextEdit txt_memo;
 private DevExpress.XtraGrid.Columns.GridColumn gv_memo;
 private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;