From 25901fce975c288864cc2bcff7f4156463fbf2f8 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 04 十一月 2024 18:35:17 +0800
Subject: [PATCH] iqc
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 40 +
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 141 -----
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 21
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 26 +
DevApp/Gs.DevApp/Resources/trackingchanges_previous_32x32.png | 0
DevApp/Gs.DevApp/Gs.DevApp.csproj | 4
DevApp/Gs.DevApp/Properties/Resources.resx | 100 ++-
DevApp/Gs.DevApp/Resources/updatetableofcontents_32x32.png | 0
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 1156 +++++----------------------------------------
DevApp/Gs.DevApp/Resources/updatetableofcontents_16x16.png | 0
DevApp/Gs.DevApp/Resources/trackingchanges_previous_16x16.png | 0
11 files changed, 294 insertions(+), 1,194 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index 1c93f01..e3095ca 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -34,15 +34,13 @@
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1ftextType = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fstand = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fupAllow = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fdownAllow = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fspecRequ = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1checkQyt = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -51,34 +49,16 @@
this.gvMx1fngQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fngRate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fenterQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1company = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1factory = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fcheckItemDesc = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1procNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1workshopCenterCode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1funit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1givenModify = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fcheckTool = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.panMsg = new DevExpress.XtraEditors.PanelControl();
- this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
- this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.lb_remarks = new DevExpress.XtraEditors.LabelControl();
this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
- this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_qualityAudit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_iqcDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_states = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_msg = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -86,59 +66,27 @@
this.lb_lifnr = new DevExpress.XtraEditors.LabelControl();
this.txt_lifnr = new DevExpress.XtraEditors.TextEdit();
this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_dhb001 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_dhb002 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_dha018 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_workNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lotNo2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_lotNo1 = new DevExpress.XtraEditors.LabelControl();
this.txt_lotNo1 = new DevExpress.XtraEditors.TextEdit();
- this.gv_lotNo1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_modify1Date1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_modify1By1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_modify1Flag1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_maxCheckQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fsecondResu = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_company = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fversion = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fmanageNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fngHandle = new DevExpress.XtraEditors.LabelControl();
this.txt_fngHandle = new DevExpress.XtraEditors.TextEdit();
this.gv_fngHandle = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fgearStand = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fexemption = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_outDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_itemUnit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_ftype = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fcheckAccord = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fsubmit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fcancel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fthirdRep = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fcheckRepno = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_modify1Date = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_modify1By = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_modify1Flag = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fhandle = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fmove = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_checkQty = new DevExpress.XtraEditors.LabelControl();
this.txt_checkQty = new DevExpress.XtraEditors.TextEdit();
this.gv_checkQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_freview = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fcheckResu = new DevExpress.XtraEditors.LabelControl();
this.txt_fcheckResu = new DevExpress.XtraEditors.TextEdit();
this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fngDesc = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_freceQty = new DevExpress.XtraEditors.LabelControl();
this.txt_freceQty = new DevExpress.XtraEditors.TextEdit();
@@ -156,7 +104,6 @@
this.lb_releaseNo = new DevExpress.XtraEditors.LabelControl();
this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit();
this.gv_releaseNo = 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();
@@ -199,9 +146,6 @@
this.groupControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.panMsg)).BeginInit();
- this.panMsg.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).BeginInit();
@@ -235,7 +179,6 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.splitContainerControl1);
- this.tabMxPage1.Controls.Add(this.panMsg);
this.tabMxPage1.Name = "tabMxPage1";
this.tabMxPage1.Size = new System.Drawing.Size(1340, 448);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
@@ -244,7 +187,7 @@
//
this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainerControl1.Horizontal = false;
- this.splitContainerControl1.Location = new System.Drawing.Point(0, 68);
+ this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
this.splitContainerControl1.Name = "splitContainerControl1";
//
// splitContainerControl1.Panel1
@@ -256,7 +199,7 @@
//
this.splitContainerControl1.Panel2.Controls.Add(this.groupControl1);
this.splitContainerControl1.Panel2.Text = "Panel2";
- this.splitContainerControl1.Size = new System.Drawing.Size(1340, 380);
+ this.splitContainerControl1.Size = new System.Drawing.Size(1340, 448);
this.splitContainerControl1.SplitterPosition = 160;
this.splitContainerControl1.TabIndex = 3;
//
@@ -275,15 +218,13 @@
//
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
- this.gvMx1id,
- this.gvMx1ftextType,
+ this.gvMx1fcheckItem,
this.gvMx1fstand,
this.gvMx1fupAllow,
this.gvMx1fdownAllow,
this.gvMx1sampleSizeNo,
this.gvMx1fcheckLevel,
this.gvMx1facLevel,
- this.gvMx1fcheckItem,
this.gvMx1fspecRequ,
this.gvMx1checkQyt,
this.gvMx1fcheckResu,
@@ -291,19 +232,7 @@
this.gvMx1freQty,
this.gvMx1fngQty,
this.gvMx1fngRate,
- this.gvMx1fenterQty,
- this.gvMx1releaseNo,
- this.gvMx1company,
- this.gvMx1factory,
- this.gvMx1fcheckItemDesc,
- this.gvMx1procNo,
- this.gvMx1workshopCenterCode,
- this.gvMx1funit,
- this.gvMx1givenModify,
- this.gvMx1fcheckTool,
- this.gvMx1lastupdateBy,
- this.gvMx1lastupdateDate,
- this.gvMx1remarks});
+ this.gvMx1fenterQty});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -315,391 +244,207 @@
//
this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
- this.gvMx1guid.Caption = "guid ";
+ this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎";
this.gvMx1guid.FieldName = "guid";
this.gvMx1guid.MinWidth = 50;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Visible = true;
- this.gvMx1guid.VisibleIndex = 0;
this.gvMx1guid.Width = 94;
//
- // gvMx1id
+ // gvMx1fcheckItem
//
- this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1id.AppearanceCell.Options.UseFont = true;
- this.gvMx1id.Caption = "id ";
- this.gvMx1id.FieldName = "id";
- this.gvMx1id.MinWidth = 50;
- this.gvMx1id.Name = "gvMx1id";
- this.gvMx1id.Tag = "query_a.id";
- this.gvMx1id.Visible = true;
- this.gvMx1id.VisibleIndex = 1;
- this.gvMx1id.Width = 94;
- //
- // gvMx1ftextType
- //
- this.gvMx1ftextType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1ftextType.AppearanceCell.Options.UseFont = true;
- this.gvMx1ftextType.Caption = "鏍囧噯鍊肩被鍨� ";
- this.gvMx1ftextType.FieldName = "ftextType";
- this.gvMx1ftextType.MinWidth = 50;
- this.gvMx1ftextType.Name = "gvMx1ftextType";
- this.gvMx1ftextType.Tag = "query_a.ftext_type";
- this.gvMx1ftextType.Visible = true;
- this.gvMx1ftextType.VisibleIndex = 2;
- this.gvMx1ftextType.Width = 94;
+ this.gvMx1fcheckItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
+ this.gvMx1fcheckItem.FieldName = "fcheckItem";
+ this.gvMx1fcheckItem.MinWidth = 50;
+ this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
+ this.gvMx1fcheckItem.Tag = "query_a.fcheck_item";
+ this.gvMx1fcheckItem.Visible = true;
+ this.gvMx1fcheckItem.VisibleIndex = 1;
+ this.gvMx1fcheckItem.Width = 94;
//
// gvMx1fstand
//
this.gvMx1fstand.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
- this.gvMx1fstand.Caption = "鏍囧噯鍊� ";
+ this.gvMx1fstand.Caption = "鏍囧噯鍊�";
this.gvMx1fstand.FieldName = "fstand";
this.gvMx1fstand.MinWidth = 50;
this.gvMx1fstand.Name = "gvMx1fstand";
this.gvMx1fstand.Tag = "query_a.fstand";
this.gvMx1fstand.Visible = true;
- this.gvMx1fstand.VisibleIndex = 3;
+ this.gvMx1fstand.VisibleIndex = 0;
this.gvMx1fstand.Width = 94;
//
// gvMx1fupAllow
//
this.gvMx1fupAllow.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
- this.gvMx1fupAllow.Caption = "涓婂叕宸� ";
+ this.gvMx1fupAllow.Caption = "涓婇檺";
this.gvMx1fupAllow.FieldName = "fupAllow";
this.gvMx1fupAllow.MinWidth = 50;
this.gvMx1fupAllow.Name = "gvMx1fupAllow";
this.gvMx1fupAllow.Tag = "query_a.fup_allow";
this.gvMx1fupAllow.Visible = true;
- this.gvMx1fupAllow.VisibleIndex = 4;
+ this.gvMx1fupAllow.VisibleIndex = 2;
this.gvMx1fupAllow.Width = 94;
//
// gvMx1fdownAllow
//
this.gvMx1fdownAllow.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
- this.gvMx1fdownAllow.Caption = "涓嬪叕宸� ";
+ this.gvMx1fdownAllow.Caption = "涓嬮檺";
this.gvMx1fdownAllow.FieldName = "fdownAllow";
this.gvMx1fdownAllow.MinWidth = 50;
this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
this.gvMx1fdownAllow.Tag = "query_a.fdown_allow";
this.gvMx1fdownAllow.Visible = true;
- this.gvMx1fdownAllow.VisibleIndex = 5;
+ this.gvMx1fdownAllow.VisibleIndex = 3;
this.gvMx1fdownAllow.Width = 94;
//
// gvMx1sampleSizeNo
//
this.gvMx1sampleSizeNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1sampleSizeNo.Caption = "妫�楠屾按鍑� ";
+ this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣鍑嗙紪鐮�";
this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
this.gvMx1sampleSizeNo.MinWidth = 50;
this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
this.gvMx1sampleSizeNo.Visible = true;
- this.gvMx1sampleSizeNo.VisibleIndex = 6;
+ this.gvMx1sampleSizeNo.VisibleIndex = 4;
this.gvMx1sampleSizeNo.Width = 94;
//
// gvMx1fcheckLevel
//
this.gvMx1fcheckLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
- this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞� ";
+ this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
this.gvMx1fcheckLevel.MinWidth = 50;
this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
this.gvMx1fcheckLevel.Visible = true;
- this.gvMx1fcheckLevel.VisibleIndex = 7;
+ this.gvMx1fcheckLevel.VisibleIndex = 5;
this.gvMx1fcheckLevel.Width = 94;
//
// gvMx1facLevel
//
this.gvMx1facLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
- this.gvMx1facLevel.Caption = "鎷掓敹姘村钩 ";
+ this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
this.gvMx1facLevel.FieldName = "facLevel";
this.gvMx1facLevel.MinWidth = 50;
this.gvMx1facLevel.Name = "gvMx1facLevel";
this.gvMx1facLevel.Tag = "query_a.fac_level";
this.gvMx1facLevel.Visible = true;
- this.gvMx1facLevel.VisibleIndex = 8;
+ this.gvMx1facLevel.VisibleIndex = 6;
this.gvMx1facLevel.Width = 94;
- //
- // gvMx1fcheckItem
- //
- this.gvMx1fcheckItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
- this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩� ";
- this.gvMx1fcheckItem.FieldName = "fcheckItem";
- this.gvMx1fcheckItem.MinWidth = 50;
- this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
- this.gvMx1fcheckItem.Tag = "query_a.fcheck_item";
- this.gvMx1fcheckItem.Visible = true;
- this.gvMx1fcheckItem.VisibleIndex = 9;
- this.gvMx1fcheckItem.Width = 94;
//
// gvMx1fspecRequ
//
this.gvMx1fspecRequ.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
- this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰 ";
+ this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
this.gvMx1fspecRequ.FieldName = "fspecRequ";
this.gvMx1fspecRequ.MinWidth = 50;
this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
this.gvMx1fspecRequ.Visible = true;
- this.gvMx1fspecRequ.VisibleIndex = 10;
+ this.gvMx1fspecRequ.VisibleIndex = 7;
this.gvMx1fspecRequ.Width = 94;
//
// gvMx1checkQyt
//
this.gvMx1checkQyt.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
- this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺 ";
+ this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
this.gvMx1checkQyt.FieldName = "checkQyt";
this.gvMx1checkQyt.MinWidth = 50;
this.gvMx1checkQyt.Name = "gvMx1checkQyt";
this.gvMx1checkQyt.Tag = "query_a.check_qyt";
this.gvMx1checkQyt.Visible = true;
- this.gvMx1checkQyt.VisibleIndex = 11;
+ this.gvMx1checkQyt.VisibleIndex = 8;
this.gvMx1checkQyt.Width = 94;
//
// gvMx1fcheckResu
//
this.gvMx1fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fcheckResu.AppearanceCell.Options.UseFont = true;
- this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋� ";
+ this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gvMx1fcheckResu.FieldName = "fcheckResu";
this.gvMx1fcheckResu.MinWidth = 50;
this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
this.gvMx1fcheckResu.Visible = true;
- this.gvMx1fcheckResu.VisibleIndex = 12;
+ this.gvMx1fcheckResu.VisibleIndex = 9;
this.gvMx1fcheckResu.Width = 94;
//
// gvMx1facQty
//
this.gvMx1facQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1facQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1facQty.Caption = "AC鏁伴噺 ";
+ this.gvMx1facQty.Caption = "AC鏁伴噺";
this.gvMx1facQty.FieldName = "facQty";
this.gvMx1facQty.MinWidth = 50;
this.gvMx1facQty.Name = "gvMx1facQty";
this.gvMx1facQty.Tag = "query_a.fac_qty";
this.gvMx1facQty.Visible = true;
- this.gvMx1facQty.VisibleIndex = 13;
+ this.gvMx1facQty.VisibleIndex = 10;
this.gvMx1facQty.Width = 94;
//
// gvMx1freQty
//
this.gvMx1freQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1freQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1freQty.Caption = "RE鏁伴噺 ";
+ this.gvMx1freQty.Caption = "RE鏁伴噺";
this.gvMx1freQty.FieldName = "freQty";
this.gvMx1freQty.MinWidth = 50;
this.gvMx1freQty.Name = "gvMx1freQty";
this.gvMx1freQty.Tag = "query_a.fre_qty";
this.gvMx1freQty.Visible = true;
- this.gvMx1freQty.VisibleIndex = 14;
+ this.gvMx1freQty.VisibleIndex = 11;
this.gvMx1freQty.Width = 94;
//
// gvMx1fngQty
//
this.gvMx1fngQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fngQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟 ";
+ this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟";
this.gvMx1fngQty.FieldName = "fngQty";
this.gvMx1fngQty.MinWidth = 50;
this.gvMx1fngQty.Name = "gvMx1fngQty";
this.gvMx1fngQty.Tag = "query_a.fng_qty";
this.gvMx1fngQty.Visible = true;
- this.gvMx1fngQty.VisibleIndex = 15;
+ this.gvMx1fngQty.VisibleIndex = 12;
this.gvMx1fngQty.Width = 94;
//
// gvMx1fngRate
//
this.gvMx1fngRate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
- this.gvMx1fngRate.Caption = "涓嶈壇鐜� ";
+ this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
this.gvMx1fngRate.FieldName = "fngRate";
this.gvMx1fngRate.MinWidth = 50;
this.gvMx1fngRate.Name = "gvMx1fngRate";
this.gvMx1fngRate.Tag = "query_a.fng_rate";
this.gvMx1fngRate.Visible = true;
- this.gvMx1fngRate.VisibleIndex = 16;
+ this.gvMx1fngRate.VisibleIndex = 13;
this.gvMx1fngRate.Width = 94;
//
// gvMx1fenterQty
//
this.gvMx1fenterQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲� ";
+ this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�";
this.gvMx1fenterQty.FieldName = "fenterQty";
this.gvMx1fenterQty.MinWidth = 50;
this.gvMx1fenterQty.Name = "gvMx1fenterQty";
this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
this.gvMx1fenterQty.Visible = true;
- this.gvMx1fenterQty.VisibleIndex = 17;
+ this.gvMx1fenterQty.VisibleIndex = 14;
this.gvMx1fenterQty.Width = 94;
- //
- // gvMx1releaseNo
- //
- this.gvMx1releaseNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1releaseNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1releaseNo.Caption = "release_no ";
- this.gvMx1releaseNo.FieldName = "releaseNo";
- this.gvMx1releaseNo.MinWidth = 50;
- this.gvMx1releaseNo.Name = "gvMx1releaseNo";
- this.gvMx1releaseNo.Tag = "query_a.release_no";
- this.gvMx1releaseNo.Visible = true;
- this.gvMx1releaseNo.VisibleIndex = 18;
- this.gvMx1releaseNo.Width = 94;
- //
- // gvMx1company
- //
- this.gvMx1company.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1company.AppearanceCell.Options.UseFont = true;
- this.gvMx1company.Caption = "company ";
- this.gvMx1company.FieldName = "company";
- this.gvMx1company.MinWidth = 50;
- this.gvMx1company.Name = "gvMx1company";
- this.gvMx1company.Tag = "query_a.company";
- this.gvMx1company.Visible = true;
- this.gvMx1company.VisibleIndex = 19;
- this.gvMx1company.Width = 94;
- //
- // gvMx1factory
- //
- this.gvMx1factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1factory.AppearanceCell.Options.UseFont = true;
- this.gvMx1factory.Caption = "factory ";
- this.gvMx1factory.FieldName = "factory";
- this.gvMx1factory.MinWidth = 50;
- this.gvMx1factory.Name = "gvMx1factory";
- this.gvMx1factory.Tag = "query_a.factory";
- this.gvMx1factory.Visible = true;
- this.gvMx1factory.VisibleIndex = 20;
- this.gvMx1factory.Width = 94;
- //
- // gvMx1fcheckItemDesc
- //
- this.gvMx1fcheckItemDesc.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
- this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩� ";
- this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
- this.gvMx1fcheckItemDesc.MinWidth = 50;
- this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc";
- this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc";
- this.gvMx1fcheckItemDesc.Visible = true;
- this.gvMx1fcheckItemDesc.VisibleIndex = 21;
- this.gvMx1fcheckItemDesc.Width = 94;
- //
- // gvMx1procNo
- //
- this.gvMx1procNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1procNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1procNo.Caption = "宸ュ簭鍙� ";
- this.gvMx1procNo.FieldName = "procNo";
- this.gvMx1procNo.MinWidth = 50;
- this.gvMx1procNo.Name = "gvMx1procNo";
- this.gvMx1procNo.Tag = "query_a.proc_no";
- this.gvMx1procNo.Visible = true;
- this.gvMx1procNo.VisibleIndex = 22;
- this.gvMx1procNo.Width = 94;
- //
- // gvMx1workshopCenterCode
- //
- this.gvMx1workshopCenterCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1workshopCenterCode.AppearanceCell.Options.UseFont = true;
- this.gvMx1workshopCenterCode.Caption = "宸ヤ綔涓績缂栫爜 ";
- this.gvMx1workshopCenterCode.FieldName = "workshopCenterCode";
- this.gvMx1workshopCenterCode.MinWidth = 50;
- this.gvMx1workshopCenterCode.Name = "gvMx1workshopCenterCode";
- this.gvMx1workshopCenterCode.Tag = "query_a.workshop_center_code";
- this.gvMx1workshopCenterCode.Visible = true;
- this.gvMx1workshopCenterCode.VisibleIndex = 23;
- this.gvMx1workshopCenterCode.Width = 94;
- //
- // gvMx1funit
- //
- this.gvMx1funit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1funit.AppearanceCell.Options.UseFont = true;
- this.gvMx1funit.Caption = "鍗曚綅 ";
- this.gvMx1funit.FieldName = "funit";
- this.gvMx1funit.MinWidth = 50;
- this.gvMx1funit.Name = "gvMx1funit";
- this.gvMx1funit.Tag = "query_a.funit";
- this.gvMx1funit.Visible = true;
- this.gvMx1funit.VisibleIndex = 24;
- this.gvMx1funit.Width = 94;
- //
- // gvMx1givenModify
- //
- this.gvMx1givenModify.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1givenModify.AppearanceCell.Options.UseFont = true;
- this.gvMx1givenModify.Caption = "鐗瑰畾淇敼 ";
- this.gvMx1givenModify.FieldName = "givenModify";
- this.gvMx1givenModify.MinWidth = 50;
- this.gvMx1givenModify.Name = "gvMx1givenModify";
- this.gvMx1givenModify.Tag = "query_a.given_modify";
- this.gvMx1givenModify.Visible = true;
- this.gvMx1givenModify.VisibleIndex = 25;
- this.gvMx1givenModify.Width = 94;
- //
- // gvMx1fcheckTool
- //
- this.gvMx1fcheckTool.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
- this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏� ";
- this.gvMx1fcheckTool.FieldName = "fcheckTool";
- this.gvMx1fcheckTool.MinWidth = 50;
- this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
- this.gvMx1fcheckTool.Tag = "query_a.fcheck_tool";
- this.gvMx1fcheckTool.Visible = true;
- this.gvMx1fcheckTool.VisibleIndex = 26;
- this.gvMx1fcheckTool.Width = 94;
- //
- // gvMx1lastupdateBy
- //
- this.gvMx1lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1lastupdateBy.AppearanceCell.Options.UseFont = true;
- this.gvMx1lastupdateBy.Caption = "鏇存柊浜� ";
- this.gvMx1lastupdateBy.FieldName = "lastupdateBy";
- this.gvMx1lastupdateBy.MinWidth = 50;
- this.gvMx1lastupdateBy.Name = "gvMx1lastupdateBy";
- this.gvMx1lastupdateBy.Tag = "query_a.lastupdate_by";
- this.gvMx1lastupdateBy.Visible = true;
- this.gvMx1lastupdateBy.VisibleIndex = 27;
- this.gvMx1lastupdateBy.Width = 94;
- //
- // gvMx1lastupdateDate
- //
- this.gvMx1lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1lastupdateDate.AppearanceCell.Options.UseFont = true;
- this.gvMx1lastupdateDate.Caption = "鏇存柊鏃堕棿 ";
- this.gvMx1lastupdateDate.FieldName = "lastupdateDate";
- this.gvMx1lastupdateDate.MinWidth = 50;
- this.gvMx1lastupdateDate.Name = "gvMx1lastupdateDate";
- this.gvMx1lastupdateDate.Tag = "query_a.lastupdate_date";
- this.gvMx1lastupdateDate.Visible = true;
- this.gvMx1lastupdateDate.VisibleIndex = 28;
- this.gvMx1lastupdateDate.Width = 94;
- //
- // gvMx1remarks
- //
- this.gvMx1remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1remarks.AppearanceCell.Options.UseFont = true;
- this.gvMx1remarks.Caption = "涓嶅悎鏍兼弿杩� ";
- this.gvMx1remarks.FieldName = "remarks";
- this.gvMx1remarks.MinWidth = 50;
- this.gvMx1remarks.Name = "gvMx1remarks";
- this.gvMx1remarks.Tag = "query_a.remarks";
- this.gvMx1remarks.Visible = true;
- this.gvMx1remarks.VisibleIndex = 29;
- this.gvMx1remarks.Width = 94;
//
// groupControl1
//
@@ -707,7 +452,7 @@
this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl1.Location = new System.Drawing.Point(0, 0);
this.groupControl1.Name = "groupControl1";
- this.groupControl1.Size = new System.Drawing.Size(1340, 208);
+ this.groupControl1.Size = new System.Drawing.Size(1340, 276);
this.groupControl1.TabIndex = 3;
this.groupControl1.Text = "鎶芥牱缁撴灉";
//
@@ -717,7 +462,7 @@
this.gcMx2.Location = new System.Drawing.Point(2, 28);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1336, 178);
+ this.gcMx2.Size = new System.Drawing.Size(1336, 246);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -725,68 +470,44 @@
// gvMx2
//
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn3,
this.gridColumn2,
this.gridColumn1});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
//
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "椤圭洰";
+ this.gridColumn3.FieldName = "fcheckItem";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.OptionsColumn.ReadOnly = true;
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 0;
+ this.gridColumn3.Width = 94;
+ //
// gridColumn2
//
this.gridColumn2.Caption = "鎶芥缁撴灉";
+ this.gridColumn2.FieldName = "fcheckResu";
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.OptionsColumn.ReadOnly = true;
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 0;
+ this.gridColumn2.VisibleIndex = 1;
this.gridColumn2.Width = 94;
//
// gridColumn1
//
this.gridColumn1.Caption = "鍒ゅ畾鏍囧織";
+ this.gridColumn1.FieldName = "fstand";
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 1;
+ this.gridColumn1.VisibleIndex = 2;
this.gridColumn1.Width = 94;
- //
- // panMsg
- //
- this.panMsg.Controls.Add(this.textEdit1);
- this.panMsg.Controls.Add(this.labelControl3);
- this.panMsg.Controls.Add(this.labelControl2);
- this.panMsg.Dock = System.Windows.Forms.DockStyle.Top;
- this.panMsg.Location = new System.Drawing.Point(0, 0);
- this.panMsg.Name = "panMsg";
- this.panMsg.Size = new System.Drawing.Size(1340, 68);
- this.panMsg.TabIndex = 1;
- //
- // textEdit1
- //
- this.textEdit1.Location = new System.Drawing.Point(556, 12);
- this.textEdit1.Name = "textEdit1";
- this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 13F);
- this.textEdit1.Properties.Appearance.Options.UseFont = true;
- this.textEdit1.Size = new System.Drawing.Size(197, 34);
- this.textEdit1.TabIndex = 2;
- //
- // labelControl3
- //
- this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 13F);
- 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.TabIndex = 1;
- this.labelControl3.Text = "褰曞叆妫�楠岀粨鏋滐紙OK-19,NG-1,绾暟瀛楋級";
- //
- // labelControl2
- //
- this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 13F);
- this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(60, 19);
- this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(110, 27);
- this.labelControl2.TabIndex = 0;
- this.labelControl2.Text = "妫�楠岄」鐩細";
//
// lb_remarks
//
@@ -807,75 +528,33 @@
this.txt_remarks.Size = new System.Drawing.Size(150, 28);
this.txt_remarks.TabIndex = 786;
//
- // 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.FieldName = "remarks";
- this.gv_remarks.MinWidth = 50;
- 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 = 62;
- this.gv_remarks.Width = 94;
- //
// gv_itemId
//
this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_itemId.AppearanceCell.Options.UseFont = true;
- this.gv_itemId.Caption = "鐗╂枡ID ";
+ this.gv_itemId.Caption = "鐗╂枡ID";
this.gv_itemId.FieldName = "itemId";
this.gv_itemId.MinWidth = 50;
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 = 61;
+ this.gv_itemId.VisibleIndex = 14;
this.gv_itemId.Width = 94;
//
// gv_qualityAudit
//
this.gv_qualityAudit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_qualityAudit.AppearanceCell.Options.UseFont = true;
- this.gv_qualityAudit.Caption = "璐ㄩ噺瀹℃牳鏍囪瘑 ";
+ this.gv_qualityAudit.Caption = "璐ㄩ噺瀹℃牳鏍囪瘑";
this.gv_qualityAudit.FieldName = "qualityAudit";
this.gv_qualityAudit.MinWidth = 50;
this.gv_qualityAudit.Name = "gv_qualityAudit";
this.gv_qualityAudit.OptionsColumn.AllowEdit = false;
this.gv_qualityAudit.Tag = "query_a.quality_audit";
this.gv_qualityAudit.Visible = true;
- this.gv_qualityAudit.VisibleIndex = 60;
+ this.gv_qualityAudit.VisibleIndex = 2;
this.gv_qualityAudit.Width = 94;
- //
- // gv_lineK3id
- //
- this.gv_lineK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lineK3id.AppearanceCell.Options.UseFont = true;
- this.gv_lineK3id.Caption = "閲囪喘璁㈠崟琛孖D ";
- this.gv_lineK3id.FieldName = "lineK3id";
- this.gv_lineK3id.MinWidth = 50;
- this.gv_lineK3id.Name = "gv_lineK3id";
- this.gv_lineK3id.OptionsColumn.AllowEdit = false;
- this.gv_lineK3id.Tag = "query_a.line_k3id";
- this.gv_lineK3id.Visible = true;
- this.gv_lineK3id.VisibleIndex = 59;
- this.gv_lineK3id.Width = 94;
- //
- // gv_ebelnK3id
- //
- this.gv_ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
- this.gv_ebelnK3id.Caption = "閲囪喘璁㈠崟ID ";
- this.gv_ebelnK3id.FieldName = "ebelnK3id";
- this.gv_ebelnK3id.MinWidth = 50;
- 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 = 58;
- this.gv_ebelnK3id.Width = 94;
//
// gv_iqcDate
//
@@ -888,49 +567,49 @@
this.gv_iqcDate.OptionsColumn.AllowEdit = false;
this.gv_iqcDate.Tag = "query_a.iqc_date";
this.gv_iqcDate.Visible = true;
- this.gv_iqcDate.VisibleIndex = 57;
+ this.gv_iqcDate.VisibleIndex = 26;
this.gv_iqcDate.Width = 94;
//
// gv_states
//
this.gv_states.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_states.AppearanceCell.Options.UseFont = true;
- this.gv_states.Caption = "鐘舵�� ";
+ this.gv_states.Caption = "鐘舵��";
this.gv_states.FieldName = "states";
this.gv_states.MinWidth = 50;
this.gv_states.Name = "gv_states";
this.gv_states.OptionsColumn.AllowEdit = false;
this.gv_states.Tag = "query_a.states";
this.gv_states.Visible = true;
- this.gv_states.VisibleIndex = 56;
+ this.gv_states.VisibleIndex = 4;
this.gv_states.Width = 94;
//
// gv_msg
//
this.gv_msg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_msg.AppearanceCell.Options.UseFont = true;
- this.gv_msg.Caption = "erp杩斿洖淇℃伅 ";
+ this.gv_msg.Caption = "erp杩斿洖淇℃伅";
this.gv_msg.FieldName = "msg";
- this.gv_msg.MinWidth = 50;
+ this.gv_msg.MinWidth = 110;
this.gv_msg.Name = "gv_msg";
this.gv_msg.OptionsColumn.AllowEdit = false;
this.gv_msg.Tag = "query_a.msg";
this.gv_msg.Visible = true;
- this.gv_msg.VisibleIndex = 55;
- this.gv_msg.Width = 94;
+ this.gv_msg.VisibleIndex = 6;
+ this.gv_msg.Width = 110;
//
// gv_fmrmode
//
this.gv_fmrmode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fmrmode.AppearanceCell.Options.UseFont = true;
- this.gv_fmrmode.Caption = "閫�鏂欐柟寮� ";
+ this.gv_fmrmode.Caption = "閫�鏂欐柟寮�";
this.gv_fmrmode.FieldName = "fmrmode";
this.gv_fmrmode.MinWidth = 50;
this.gv_fmrmode.Name = "gv_fmrmode";
this.gv_fmrmode.OptionsColumn.AllowEdit = false;
this.gv_fmrmode.Tag = "query_a.fmrmode";
this.gv_fmrmode.Visible = true;
- this.gv_fmrmode.VisibleIndex = 54;
+ this.gv_fmrmode.VisibleIndex = 8;
this.gv_fmrmode.Width = 94;
//
// lb_lifnr
@@ -963,92 +642,22 @@
this.gv_lifnr.OptionsColumn.AllowEdit = false;
this.gv_lifnr.Tag = "query_a.lifnr";
this.gv_lifnr.Visible = true;
- this.gv_lifnr.VisibleIndex = 53;
+ this.gv_lifnr.VisibleIndex = 20;
this.gv_lifnr.Width = 94;
- //
- // gv_dhb001
- //
- this.gv_dhb001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_dhb001.AppearanceCell.Options.UseFont = true;
- this.gv_dhb001.Caption = "鍒拌揣鍗曞彿 ";
- this.gv_dhb001.FieldName = "dhb001";
- this.gv_dhb001.MinWidth = 50;
- this.gv_dhb001.Name = "gv_dhb001";
- this.gv_dhb001.OptionsColumn.AllowEdit = false;
- this.gv_dhb001.Tag = "query_a.dhb001";
- this.gv_dhb001.Visible = true;
- this.gv_dhb001.VisibleIndex = 52;
- this.gv_dhb001.Width = 94;
- //
- // gv_dhb002
- //
- this.gv_dhb002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_dhb002.AppearanceCell.Options.UseFont = true;
- this.gv_dhb002.Caption = "琛屽彿 ";
- this.gv_dhb002.FieldName = "dhb002";
- this.gv_dhb002.MinWidth = 50;
- this.gv_dhb002.Name = "gv_dhb002";
- this.gv_dhb002.OptionsColumn.AllowEdit = false;
- this.gv_dhb002.Tag = "query_a.dhb002";
- this.gv_dhb002.Visible = true;
- this.gv_dhb002.VisibleIndex = 51;
- this.gv_dhb002.Width = 94;
- //
- // gv_dha018
- //
- this.gv_dha018.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_dha018.AppearanceCell.Options.UseFont = true;
- this.gv_dha018.Caption = "鍒拌揣鏃堕棿 ";
- this.gv_dha018.FieldName = "dha018";
- this.gv_dha018.MinWidth = 50;
- this.gv_dha018.Name = "gv_dha018";
- this.gv_dha018.OptionsColumn.AllowEdit = false;
- this.gv_dha018.Tag = "query_a.dha018";
- this.gv_dha018.Visible = true;
- this.gv_dha018.VisibleIndex = 50;
- this.gv_dha018.Width = 94;
- //
- // gv_workNo
- //
- this.gv_workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_workNo.AppearanceCell.Options.UseFont = true;
- this.gv_workNo.Caption = "浠诲姟鍗曞彿 ";
- this.gv_workNo.FieldName = "workNo";
- this.gv_workNo.MinWidth = 50;
- this.gv_workNo.Name = "gv_workNo";
- this.gv_workNo.OptionsColumn.AllowEdit = false;
- this.gv_workNo.Tag = "query_a.work_no";
- this.gv_workNo.Visible = true;
- this.gv_workNo.VisibleIndex = 49;
- this.gv_workNo.Width = 94;
//
// gv_boardStyle
//
this.gv_boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_boardStyle.AppearanceCell.Options.UseFont = true;
- this.gv_boardStyle.Caption = "浜у搧鍨嬪彿 ";
+ this.gv_boardStyle.Caption = "鐗╂枡瑙勬牸";
this.gv_boardStyle.FieldName = "boardStyle";
this.gv_boardStyle.MinWidth = 50;
this.gv_boardStyle.Name = "gv_boardStyle";
this.gv_boardStyle.OptionsColumn.AllowEdit = false;
this.gv_boardStyle.Tag = "query_a.board_style";
this.gv_boardStyle.Visible = true;
- this.gv_boardStyle.VisibleIndex = 48;
+ this.gv_boardStyle.VisibleIndex = 17;
this.gv_boardStyle.Width = 94;
- //
- // gv_lotNo2
- //
- this.gv_lotNo2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lotNo2.AppearanceCell.Options.UseFont = true;
- this.gv_lotNo2.Caption = "閲囪喘鍗曞彿 ";
- this.gv_lotNo2.FieldName = "lotNo2";
- this.gv_lotNo2.MinWidth = 50;
- this.gv_lotNo2.Name = "gv_lotNo2";
- this.gv_lotNo2.OptionsColumn.AllowEdit = false;
- this.gv_lotNo2.Tag = "query_a.lot_no2";
- this.gv_lotNo2.Visible = true;
- this.gv_lotNo2.VisibleIndex = 47;
- this.gv_lotNo2.Width = 94;
//
// lb_lotNo1
//
@@ -1069,145 +678,33 @@
this.txt_lotNo1.Size = new System.Drawing.Size(150, 28);
this.txt_lotNo1.TabIndex = 546;
//
- // gv_lotNo1
- //
- this.gv_lotNo1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lotNo1.AppearanceCell.Options.UseFont = true;
- this.gv_lotNo1.Caption = "灏忔壒娆″彿 ";
- this.gv_lotNo1.FieldName = "lotNo1";
- this.gv_lotNo1.MinWidth = 50;
- this.gv_lotNo1.Name = "gv_lotNo1";
- this.gv_lotNo1.OptionsColumn.AllowEdit = false;
- this.gv_lotNo1.Tag = "query_a.lot_no1";
- this.gv_lotNo1.Visible = true;
- this.gv_lotNo1.VisibleIndex = 46;
- this.gv_lotNo1.Width = 94;
- //
- // gv_modify1Date1
- //
- this.gv_modify1Date1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_modify1Date1.AppearanceCell.Options.UseFont = true;
- this.gv_modify1Date1.Caption = "鐗瑰畾淇敼瀹℃牳鏃堕棿 ";
- this.gv_modify1Date1.FieldName = "modify1Date1";
- this.gv_modify1Date1.MinWidth = 50;
- this.gv_modify1Date1.Name = "gv_modify1Date1";
- this.gv_modify1Date1.OptionsColumn.AllowEdit = false;
- this.gv_modify1Date1.Tag = "query_a.modify1_date1";
- this.gv_modify1Date1.Visible = true;
- this.gv_modify1Date1.VisibleIndex = 45;
- this.gv_modify1Date1.Width = 94;
- //
- // gv_modify1By1
- //
- this.gv_modify1By1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_modify1By1.AppearanceCell.Options.UseFont = true;
- this.gv_modify1By1.Caption = "鐗瑰畾淇敼瀹℃牳浜� ";
- this.gv_modify1By1.FieldName = "modify1By1";
- this.gv_modify1By1.MinWidth = 50;
- this.gv_modify1By1.Name = "gv_modify1By1";
- this.gv_modify1By1.OptionsColumn.AllowEdit = false;
- this.gv_modify1By1.Tag = "query_a.modify1_by1";
- this.gv_modify1By1.Visible = true;
- this.gv_modify1By1.VisibleIndex = 44;
- this.gv_modify1By1.Width = 94;
- //
- // gv_modify1Flag1
- //
- this.gv_modify1Flag1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_modify1Flag1.AppearanceCell.Options.UseFont = true;
- this.gv_modify1Flag1.Caption = "鐗瑰畾淇敼鏄惁瀹℃牳 ";
- this.gv_modify1Flag1.FieldName = "modify1Flag1";
- this.gv_modify1Flag1.MinWidth = 50;
- this.gv_modify1Flag1.Name = "gv_modify1Flag1";
- this.gv_modify1Flag1.OptionsColumn.AllowEdit = false;
- this.gv_modify1Flag1.Tag = "query_a.modify1_flag1";
- this.gv_modify1Flag1.Visible = true;
- this.gv_modify1Flag1.VisibleIndex = 43;
- this.gv_modify1Flag1.Width = 94;
- //
- // gv_maxCheckQty
- //
- this.gv_maxCheckQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_maxCheckQty.AppearanceCell.Options.UseFont = true;
- this.gv_maxCheckQty.Caption = "鏈�澶ф娊妫�鏁� ";
- this.gv_maxCheckQty.FieldName = "maxCheckQty";
- this.gv_maxCheckQty.MinWidth = 50;
- this.gv_maxCheckQty.Name = "gv_maxCheckQty";
- this.gv_maxCheckQty.OptionsColumn.AllowEdit = false;
- this.gv_maxCheckQty.Tag = "query_a.max_check_qty";
- this.gv_maxCheckQty.Visible = true;
- this.gv_maxCheckQty.VisibleIndex = 42;
- this.gv_maxCheckQty.Width = 94;
- //
- // gv_fsecondResu
- //
- this.gv_fsecondResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fsecondResu.AppearanceCell.Options.UseFont = true;
- this.gv_fsecondResu.Caption = "fsecond_resu ";
- this.gv_fsecondResu.FieldName = "fsecondResu";
- this.gv_fsecondResu.MinWidth = 50;
- this.gv_fsecondResu.Name = "gv_fsecondResu";
- this.gv_fsecondResu.OptionsColumn.AllowEdit = false;
- this.gv_fsecondResu.Tag = "query_a.fsecond_resu";
- this.gv_fsecondResu.Visible = true;
- this.gv_fsecondResu.VisibleIndex = 41;
- this.gv_fsecondResu.Width = 94;
- //
- // gv_company
- //
- this.gv_company.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_company.AppearanceCell.Options.UseFont = true;
- this.gv_company.Caption = "company ";
- this.gv_company.FieldName = "company";
- this.gv_company.MinWidth = 50;
- this.gv_company.Name = "gv_company";
- this.gv_company.OptionsColumn.AllowEdit = false;
- this.gv_company.Tag = "query_a.company";
- this.gv_company.Visible = true;
- this.gv_company.VisibleIndex = 40;
- this.gv_company.Width = 94;
- //
// gv_fversion
//
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 = 39;
+ this.gv_fversion.VisibleIndex = 24;
this.gv_fversion.Width = 94;
//
// gv_fcovertQty
//
this.gv_fcovertQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
- this.gv_fcovertQty.Caption = "杞崲鏁伴噺 ";
+ this.gv_fcovertQty.Caption = "杞崲鏁伴噺";
this.gv_fcovertQty.FieldName = "fcovertQty";
this.gv_fcovertQty.MinWidth = 50;
this.gv_fcovertQty.Name = "gv_fcovertQty";
this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
this.gv_fcovertQty.Visible = true;
- this.gv_fcovertQty.VisibleIndex = 38;
+ this.gv_fcovertQty.VisibleIndex = 23;
this.gv_fcovertQty.Width = 94;
- //
- // gv_fmanageNo
- //
- this.gv_fmanageNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fmanageNo.AppearanceCell.Options.UseFont = true;
- this.gv_fmanageNo.Caption = "绠＄悊缂栧彿 ";
- this.gv_fmanageNo.FieldName = "fmanageNo";
- this.gv_fmanageNo.MinWidth = 50;
- this.gv_fmanageNo.Name = "gv_fmanageNo";
- this.gv_fmanageNo.OptionsColumn.AllowEdit = false;
- this.gv_fmanageNo.Tag = "query_a.fmanage_no";
- this.gv_fmanageNo.Visible = true;
- this.gv_fmanageNo.VisibleIndex = 37;
- this.gv_fmanageNo.Width = 94;
//
// lb_fngHandle
//
@@ -1232,308 +729,112 @@
//
this.gv_fngHandle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fngHandle.AppearanceCell.Options.UseFont = true;
- this.gv_fngHandle.Caption = "涓嶈壇澶勭悊鏂规硶 ";
+ this.gv_fngHandle.Caption = "澶勭悊鏂瑰紡";
this.gv_fngHandle.FieldName = "fngHandle";
this.gv_fngHandle.MinWidth = 50;
this.gv_fngHandle.Name = "gv_fngHandle";
this.gv_fngHandle.OptionsColumn.AllowEdit = false;
this.gv_fngHandle.Tag = "query_a.fng_handle";
this.gv_fngHandle.Visible = true;
- this.gv_fngHandle.VisibleIndex = 36;
+ this.gv_fngHandle.VisibleIndex = 7;
this.gv_fngHandle.Width = 94;
- //
- // gv_fgearStand
- //
- this.gv_fgearStand.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fgearStand.AppearanceCell.Options.UseFont = true;
- this.gv_fgearStand.Caption = "妗ｄ綅鏍囧噯 ";
- this.gv_fgearStand.FieldName = "fgearStand";
- this.gv_fgearStand.MinWidth = 50;
- this.gv_fgearStand.Name = "gv_fgearStand";
- this.gv_fgearStand.OptionsColumn.AllowEdit = false;
- this.gv_fgearStand.Tag = "query_a.fgear_stand";
- this.gv_fgearStand.Visible = true;
- this.gv_fgearStand.VisibleIndex = 35;
- this.gv_fgearStand.Width = 94;
- //
- // gv_fexemption
- //
- this.gv_fexemption.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fexemption.AppearanceCell.Options.UseFont = true;
- this.gv_fexemption.Caption = "鏄惁鍏嶆 ";
- this.gv_fexemption.FieldName = "fexemption";
- this.gv_fexemption.MinWidth = 50;
- this.gv_fexemption.Name = "gv_fexemption";
- this.gv_fexemption.OptionsColumn.AllowEdit = false;
- this.gv_fexemption.Tag = "query_a.fexemption";
- this.gv_fexemption.Visible = true;
- this.gv_fexemption.VisibleIndex = 34;
- this.gv_fexemption.Width = 94;
- //
- // gv_outDate
- //
- this.gv_outDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_outDate.AppearanceCell.Options.UseFont = true;
- this.gv_outDate.Caption = "鍑鸿揣鏃ユ湡 ";
- this.gv_outDate.FieldName = "outDate";
- this.gv_outDate.MinWidth = 50;
- this.gv_outDate.Name = "gv_outDate";
- this.gv_outDate.OptionsColumn.AllowEdit = false;
- this.gv_outDate.Tag = "query_a.out_date";
- this.gv_outDate.Visible = true;
- this.gv_outDate.VisibleIndex = 33;
- this.gv_outDate.Width = 94;
- //
- // gv_itemUnit
- //
- this.gv_itemUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_itemUnit.AppearanceCell.Options.UseFont = true;
- this.gv_itemUnit.Caption = "鍗曚綅 ";
- this.gv_itemUnit.FieldName = "itemUnit";
- this.gv_itemUnit.MinWidth = 50;
- this.gv_itemUnit.Name = "gv_itemUnit";
- this.gv_itemUnit.OptionsColumn.AllowEdit = false;
- this.gv_itemUnit.Tag = "query_a.item_unit";
- this.gv_itemUnit.Visible = true;
- this.gv_itemUnit.VisibleIndex = 32;
- this.gv_itemUnit.Width = 94;
//
// gv_ftype
//
this.gv_ftype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_ftype.AppearanceCell.Options.UseFont = true;
- this.gv_ftype.Caption = "绫诲瀷(0 鏉ユ枡 1 鍦ㄥ簱) ";
+ this.gv_ftype.Caption = "妫�楠岀被鍨�";
this.gv_ftype.FieldName = "ftype";
this.gv_ftype.MinWidth = 50;
this.gv_ftype.Name = "gv_ftype";
this.gv_ftype.OptionsColumn.AllowEdit = false;
this.gv_ftype.Tag = "query_a.ftype";
this.gv_ftype.Visible = true;
- this.gv_ftype.VisibleIndex = 31;
+ this.gv_ftype.VisibleIndex = 0;
this.gv_ftype.Width = 94;
- //
- // gv_fcheckAccord
- //
- this.gv_fcheckAccord.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckAccord.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckAccord.Caption = "妫�楠屼緷鎹� ";
- this.gv_fcheckAccord.FieldName = "fcheckAccord";
- this.gv_fcheckAccord.MinWidth = 50;
- this.gv_fcheckAccord.Name = "gv_fcheckAccord";
- this.gv_fcheckAccord.OptionsColumn.AllowEdit = false;
- this.gv_fcheckAccord.Tag = "query_a.fcheck_accord";
- this.gv_fcheckAccord.Visible = true;
- this.gv_fcheckAccord.VisibleIndex = 30;
- this.gv_fcheckAccord.Width = 94;
//
// gv_fsubmit
//
this.gv_fsubmit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fsubmit.AppearanceCell.Options.UseFont = true;
- this.gv_fsubmit.Caption = "鎻愪氦鏍囪瘑 ";
+ this.gv_fsubmit.Caption = "鎻愪氦鏍囪瘑";
this.gv_fsubmit.FieldName = "fsubmit";
this.gv_fsubmit.MinWidth = 50;
this.gv_fsubmit.Name = "gv_fsubmit";
this.gv_fsubmit.OptionsColumn.AllowEdit = false;
this.gv_fsubmit.Tag = "query_a.fsubmit";
this.gv_fsubmit.Visible = true;
- this.gv_fsubmit.VisibleIndex = 29;
+ this.gv_fsubmit.VisibleIndex = 1;
this.gv_fsubmit.Width = 94;
- //
- // gv_fcancel
- //
- this.gv_fcancel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcancel.AppearanceCell.Options.UseFont = true;
- this.gv_fcancel.Caption = "鏄惁浣滃簾 ";
- this.gv_fcancel.FieldName = "fcancel";
- this.gv_fcancel.MinWidth = 50;
- this.gv_fcancel.Name = "gv_fcancel";
- this.gv_fcancel.OptionsColumn.AllowEdit = false;
- this.gv_fcancel.Tag = "query_a.fcancel";
- this.gv_fcancel.Visible = true;
- this.gv_fcancel.VisibleIndex = 28;
- this.gv_fcancel.Width = 94;
- //
- // gv_fthirdRep
- //
- this.gv_fthirdRep.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fthirdRep.AppearanceCell.Options.UseFont = true;
- this.gv_fthirdRep.Caption = "绗笁鏂规姤鍛� ";
- this.gv_fthirdRep.FieldName = "fthirdRep";
- this.gv_fthirdRep.MinWidth = 50;
- this.gv_fthirdRep.Name = "gv_fthirdRep";
- this.gv_fthirdRep.OptionsColumn.AllowEdit = false;
- this.gv_fthirdRep.Tag = "query_a.fthird_rep";
- this.gv_fthirdRep.Visible = true;
- this.gv_fthirdRep.VisibleIndex = 27;
- this.gv_fthirdRep.Width = 94;
- //
- // gv_fcheckRepno
- //
- this.gv_fcheckRepno.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckRepno.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckRepno.Caption = "XRF娴嬭瘯鎶ュ憡缂栧彿 ";
- this.gv_fcheckRepno.FieldName = "fcheckRepno";
- this.gv_fcheckRepno.MinWidth = 50;
- this.gv_fcheckRepno.Name = "gv_fcheckRepno";
- this.gv_fcheckRepno.OptionsColumn.AllowEdit = false;
- this.gv_fcheckRepno.Tag = "query_a.fcheck_repno";
- this.gv_fcheckRepno.Visible = true;
- this.gv_fcheckRepno.VisibleIndex = 26;
- this.gv_fcheckRepno.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 = "factory ";
- 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 = 25;
- this.gv_factory.Width = 94;
//
// gv_modify1Date
//
this.gv_modify1Date.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_modify1Date.AppearanceCell.Options.UseFont = true;
- this.gv_modify1Date.Caption = "modify1_date ";
+ this.gv_modify1Date.Caption = "瀹℃牳鏃堕棿";
this.gv_modify1Date.FieldName = "modify1Date";
this.gv_modify1Date.MinWidth = 50;
this.gv_modify1Date.Name = "gv_modify1Date";
this.gv_modify1Date.OptionsColumn.AllowEdit = false;
this.gv_modify1Date.Tag = "query_a.modify1_date";
this.gv_modify1Date.Visible = true;
- this.gv_modify1Date.VisibleIndex = 24;
+ this.gv_modify1Date.VisibleIndex = 25;
this.gv_modify1Date.Width = 94;
//
// gv_modify1By
//
this.gv_modify1By.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_modify1By.AppearanceCell.Options.UseFont = true;
- this.gv_modify1By.Caption = "modify1_by ";
+ this.gv_modify1By.Caption = "瀹℃牳浜�";
this.gv_modify1By.FieldName = "modify1By";
this.gv_modify1By.MinWidth = 50;
this.gv_modify1By.Name = "gv_modify1By";
this.gv_modify1By.OptionsColumn.AllowEdit = false;
this.gv_modify1By.Tag = "query_a.modify1_by";
this.gv_modify1By.Visible = true;
- this.gv_modify1By.VisibleIndex = 23;
+ this.gv_modify1By.VisibleIndex = 21;
this.gv_modify1By.Width = 94;
//
// gv_modify1Flag
//
this.gv_modify1Flag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_modify1Flag.AppearanceCell.Options.UseFont = true;
- this.gv_modify1Flag.Caption = "鏄惁瀹℃牳 ";
+ this.gv_modify1Flag.Caption = "閲囪喘瀹℃牳鏍囪瘑";
this.gv_modify1Flag.FieldName = "modify1Flag";
this.gv_modify1Flag.MinWidth = 50;
this.gv_modify1Flag.Name = "gv_modify1Flag";
this.gv_modify1Flag.OptionsColumn.AllowEdit = false;
this.gv_modify1Flag.Tag = "query_a.modify1_flag";
this.gv_modify1Flag.Visible = true;
- this.gv_modify1Flag.VisibleIndex = 22;
+ this.gv_modify1Flag.VisibleIndex = 3;
this.gv_modify1Flag.Width = 94;
- //
- // gv_lastupdateDate
- //
- 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.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 50;
- 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 = 21;
- this.gv_lastupdateDate.Width = 94;
- //
- // gv_lastupdateBy
- //
- 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.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 = 20;
- this.gv_lastupdateBy.Width = 94;
- //
- // 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.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 = 19;
- this.gv_createDate.Width = 94;
- //
- // 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.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 = 18;
- this.gv_createBy.Width = 94;
//
// gv_fhandle
//
this.gv_fhandle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fhandle.AppearanceCell.Options.UseFont = true;
- this.gv_fhandle.Caption = "鏄惁澶勭悊 ";
+ this.gv_fhandle.Caption = "鏄惁澶勭悊";
this.gv_fhandle.FieldName = "fhandle";
this.gv_fhandle.MinWidth = 50;
this.gv_fhandle.Name = "gv_fhandle";
this.gv_fhandle.OptionsColumn.AllowEdit = false;
this.gv_fhandle.Tag = "query_a.fhandle";
this.gv_fhandle.Visible = true;
- this.gv_fhandle.VisibleIndex = 17;
+ this.gv_fhandle.VisibleIndex = 22;
this.gv_fhandle.Width = 94;
- //
- // gv_fmove
- //
- this.gv_fmove.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fmove.AppearanceCell.Options.UseFont = true;
- this.gv_fmove.Caption = "鏄惁鎺ㄩ�� ";
- this.gv_fmove.FieldName = "fmove";
- this.gv_fmove.MinWidth = 50;
- this.gv_fmove.Name = "gv_fmove";
- this.gv_fmove.OptionsColumn.AllowEdit = false;
- this.gv_fmove.Tag = "query_a.fmove";
- this.gv_fmove.Visible = true;
- this.gv_fmove.VisibleIndex = 16;
- this.gv_fmove.Width = 94;
//
// gv_lotNo
//
this.gv_lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_lotNo.AppearanceCell.Options.UseFont = true;
- this.gv_lotNo.Caption = "鎵规鍙� --鍒拌揣鍗曞彿 ";
+ this.gv_lotNo.Caption = "鎵规鍙�";
this.gv_lotNo.FieldName = "lotNo";
this.gv_lotNo.MinWidth = 50;
this.gv_lotNo.Name = "gv_lotNo";
this.gv_lotNo.OptionsColumn.AllowEdit = false;
this.gv_lotNo.Tag = "query_a.lot_no";
this.gv_lotNo.Visible = true;
- this.gv_lotNo.VisibleIndex = 15;
+ this.gv_lotNo.VisibleIndex = 12;
this.gv_lotNo.Width = 94;
//
// lb_checkQty
@@ -1566,64 +867,8 @@
this.gv_checkQty.OptionsColumn.AllowEdit = false;
this.gv_checkQty.Tag = "query_a.check_qty";
this.gv_checkQty.Visible = true;
- this.gv_checkQty.VisibleIndex = 14;
+ this.gv_checkQty.VisibleIndex = 18;
this.gv_checkQty.Width = 94;
- //
- // gv_facLevel
- //
- this.gv_facLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_facLevel.AppearanceCell.Options.UseFont = true;
- this.gv_facLevel.Caption = "鎷掓敹姘村钩 ";
- this.gv_facLevel.FieldName = "facLevel";
- this.gv_facLevel.MinWidth = 50;
- this.gv_facLevel.Name = "gv_facLevel";
- this.gv_facLevel.OptionsColumn.AllowEdit = false;
- this.gv_facLevel.Tag = "query_a.fac_level";
- this.gv_facLevel.Visible = true;
- this.gv_facLevel.VisibleIndex = 13;
- this.gv_facLevel.Width = 94;
- //
- // gv_fcheckLevel
- //
- this.gv_fcheckLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckLevel.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckLevel.Caption = "妫�楠屾按骞� ";
- this.gv_fcheckLevel.FieldName = "fcheckLevel";
- this.gv_fcheckLevel.MinWidth = 50;
- this.gv_fcheckLevel.Name = "gv_fcheckLevel";
- this.gv_fcheckLevel.OptionsColumn.AllowEdit = false;
- this.gv_fcheckLevel.Tag = "query_a.fcheck_level";
- this.gv_fcheckLevel.Visible = true;
- this.gv_fcheckLevel.VisibleIndex = 12;
- this.gv_fcheckLevel.Width = 94;
- //
- // gv_sampleSizeNo
- //
- this.gv_sampleSizeNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_sampleSizeNo.AppearanceCell.Options.UseFont = true;
- this.gv_sampleSizeNo.Caption = "妫�楠屾按鍑� ";
- this.gv_sampleSizeNo.FieldName = "sampleSizeNo";
- this.gv_sampleSizeNo.MinWidth = 50;
- this.gv_sampleSizeNo.Name = "gv_sampleSizeNo";
- this.gv_sampleSizeNo.OptionsColumn.AllowEdit = false;
- this.gv_sampleSizeNo.Tag = "query_a.sample_size_no";
- this.gv_sampleSizeNo.Visible = true;
- this.gv_sampleSizeNo.VisibleIndex = 11;
- this.gv_sampleSizeNo.Width = 94;
- //
- // gv_freview
- //
- this.gv_freview.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_freview.AppearanceCell.Options.UseFont = true;
- this.gv_freview.Caption = "freview ";
- this.gv_freview.FieldName = "freview";
- this.gv_freview.MinWidth = 50;
- this.gv_freview.Name = "gv_freview";
- this.gv_freview.OptionsColumn.AllowEdit = false;
- this.gv_freview.Tag = "query_a.freview";
- this.gv_freview.Visible = true;
- this.gv_freview.VisibleIndex = 10;
- this.gv_freview.Width = 94;
//
// lb_fcheckResu
//
@@ -1648,7 +893,7 @@
//
this.gv_fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckResu.Caption = "妫�楠岀粨鏋� ";
+ this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gv_fcheckResu.FieldName = "fcheckResu";
this.gv_fcheckResu.MinWidth = 50;
this.gv_fcheckResu.Name = "gv_fcheckResu";
@@ -1657,20 +902,6 @@
this.gv_fcheckResu.Visible = true;
this.gv_fcheckResu.VisibleIndex = 9;
this.gv_fcheckResu.Width = 94;
- //
- // gv_fngDesc
- //
- this.gv_fngDesc.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fngDesc.AppearanceCell.Options.UseFont = true;
- this.gv_fngDesc.Caption = "fng_desc ";
- this.gv_fngDesc.FieldName = "fngDesc";
- this.gv_fngDesc.MinWidth = 50;
- this.gv_fngDesc.Name = "gv_fngDesc";
- this.gv_fngDesc.OptionsColumn.AllowEdit = false;
- this.gv_fngDesc.Tag = "query_a.fng_desc";
- this.gv_fngDesc.Visible = true;
- this.gv_fngDesc.VisibleIndex = 8;
- this.gv_fngDesc.Width = 94;
//
// gv_suppNo
//
@@ -1683,7 +914,7 @@
this.gv_suppNo.OptionsColumn.AllowEdit = false;
this.gv_suppNo.Tag = "query_a.supp_no";
this.gv_suppNo.Visible = true;
- this.gv_suppNo.VisibleIndex = 7;
+ this.gv_suppNo.VisibleIndex = 19;
this.gv_suppNo.Width = 94;
//
// lb_freceQty
@@ -1716,7 +947,7 @@
this.gv_freceQty.OptionsColumn.AllowEdit = false;
this.gv_freceQty.Tag = "query_a.frece_qty";
this.gv_freceQty.Visible = true;
- this.gv_freceQty.VisibleIndex = 6;
+ this.gv_freceQty.VisibleIndex = 10;
this.gv_freceQty.Width = 94;
//
// lb_fbatchQty
@@ -1742,28 +973,28 @@
//
this.gv_fbatchQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
- this.gv_fbatchQty.Caption = "鏉ユ枡鏁伴噺 ";
+ this.gv_fbatchQty.Caption = "鎵规鏁伴噺";
this.gv_fbatchQty.FieldName = "fbatchQty";
this.gv_fbatchQty.MinWidth = 50;
this.gv_fbatchQty.Name = "gv_fbatchQty";
this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
this.gv_fbatchQty.Visible = true;
- this.gv_fbatchQty.VisibleIndex = 5;
+ this.gv_fbatchQty.VisibleIndex = 16;
this.gv_fbatchQty.Width = 94;
//
// gv_itemNo
//
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 = 50;
this.gv_itemNo.Name = "gv_itemNo";
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 4;
+ this.gv_itemNo.VisibleIndex = 15;
this.gv_itemNo.Width = 94;
//
// lb_fcheckBy
@@ -1789,14 +1020,14 @@
//
this.gv_fcheckBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckBy.Caption = "妫�楠屼汉鍛� ";
+ this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
this.gv_fcheckBy.FieldName = "fcheckBy";
this.gv_fcheckBy.MinWidth = 50;
this.gv_fcheckBy.Name = "gv_fcheckBy";
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.VisibleIndex = 3;
+ this.gv_fcheckBy.VisibleIndex = 13;
this.gv_fcheckBy.Width = 94;
//
// lb_fcheckDate
@@ -1829,7 +1060,7 @@
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 2;
+ this.gv_fcheckDate.VisibleIndex = 5;
this.gv_fcheckDate.Width = 94;
//
// lb_releaseNo
@@ -1855,33 +1086,19 @@
//
this.gv_releaseNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_releaseNo.AppearanceCell.Options.UseFont = true;
- this.gv_releaseNo.Caption = "妫�楠屽崟鍙� ";
+ this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
this.gv_releaseNo.FieldName = "releaseNo";
this.gv_releaseNo.MinWidth = 50;
this.gv_releaseNo.Name = "gv_releaseNo";
this.gv_releaseNo.OptionsColumn.AllowEdit = false;
this.gv_releaseNo.Tag = "query_a.release_no";
this.gv_releaseNo.Visible = true;
- this.gv_releaseNo.VisibleIndex = 1;
+ this.gv_releaseNo.VisibleIndex = 11;
this.gv_releaseNo.Width = 94;
- //
- // 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 = 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 = 0;
- this.gv_id.Width = 94;
//
// toolBarMenu1
//
- this.toolBarMenu1.chkParameter = "1,1,1,1,000chk_IqcJianYanCheck";
+ this.toolBarMenu1.chkParameter = "1,1,1,1,000chk_iqc_detect01_check";
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -1910,69 +1127,33 @@
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_releaseNo,
- this.gv_fcheckDate,
- this.gv_fcheckBy,
- this.gv_itemNo,
- this.gv_fbatchQty,
- this.gv_freceQty,
- this.gv_suppNo,
- this.gv_fngDesc,
- this.gv_fcheckResu,
- this.gv_freview,
- this.gv_sampleSizeNo,
- this.gv_fcheckLevel,
- this.gv_facLevel,
- this.gv_checkQty,
- this.gv_lotNo,
- this.gv_fmove,
- this.gv_fhandle,
- this.gv_createBy,
- this.gv_createDate,
- this.gv_lastupdateBy,
- this.gv_lastupdateDate,
- this.gv_modify1Flag,
- this.gv_modify1By,
- this.gv_modify1Date,
- this.gv_factory,
- this.gv_fcheckRepno,
- this.gv_fthirdRep,
- this.gv_fcancel,
- this.gv_fsubmit,
- this.gv_fcheckAccord,
this.gv_ftype,
- this.gv_itemUnit,
- this.gv_outDate,
- this.gv_fexemption,
- this.gv_fgearStand,
+ this.gv_fsubmit,
+ this.gv_qualityAudit,
+ this.gv_modify1Flag,
+ this.gv_states,
+ this.gv_msg,
this.gv_fngHandle,
- this.gv_fmanageNo,
+ this.gv_fmrmode,
+ this.gv_fcheckResu,
+ this.gv_releaseNo,
+ this.gv_lotNo,
+ this.gv_fcheckBy,
+ this.gv_fcheckDate,
+ this.gv_itemId,
+ this.gv_itemNo,
+ this.gv_boardStyle,
+ this.gv_fbatchQty,
+ this.gv_suppNo,
+ this.gv_lifnr,
+ this.gv_modify1By,
+ this.gv_freceQty,
+ this.gv_modify1Date,
+ this.gv_checkQty,
+ this.gv_fhandle,
this.gv_fcovertQty,
this.gv_fversion,
- this.gv_company,
- this.gv_fsecondResu,
- this.gv_maxCheckQty,
- this.gv_modify1Flag1,
- this.gv_modify1By1,
- this.gv_modify1Date1,
- this.gv_lotNo1,
- this.gv_lotNo2,
- this.gv_boardStyle,
- this.gv_workNo,
- this.gv_dha018,
- this.gv_dhb002,
- this.gv_dhb001,
- this.gv_lifnr,
- this.gv_fmrmode,
- this.gv_msg,
- this.gv_states,
- this.gv_iqcDate,
- this.gv_ebelnK3id,
- this.gv_lineK3id,
- this.gv_qualityAudit,
- this.gv_itemId,
- this.gv_remarks});
+ this.gv_iqcDate});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -2286,10 +1467,6 @@
this.groupControl1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.panMsg)).EndInit();
- this.panMsg.ResumeLayout(false);
- this.panMsg.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).EndInit();
@@ -2338,11 +1515,8 @@
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraEditors.LabelControl lb_remarks;
private DevExpress.XtraEditors.TextEdit txt_remarks;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
private DevExpress.XtraGrid.Columns.GridColumn gv_qualityAudit;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lineK3id;
- private DevExpress.XtraGrid.Columns.GridColumn gv_ebelnK3id;
private DevExpress.XtraGrid.Columns.GridColumn gv_iqcDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_states;
private DevExpress.XtraGrid.Columns.GridColumn gv_msg;
@@ -2351,63 +1525,31 @@
private DevExpress.XtraEditors.LabelControl lb_lifnr;
private DevExpress.XtraEditors.TextEdit txt_lifnr;
private DevExpress.XtraGrid.Columns.GridColumn gv_lifnr;
- private DevExpress.XtraGrid.Columns.GridColumn gv_dhb001;
- private DevExpress.XtraGrid.Columns.GridColumn gv_dhb002;
- private DevExpress.XtraGrid.Columns.GridColumn gv_dha018;
- private DevExpress.XtraGrid.Columns.GridColumn gv_workNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_boardStyle;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo2;
private DevExpress.XtraEditors.LabelControl lb_lotNo1;
private DevExpress.XtraEditors.TextEdit txt_lotNo1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_modify1Date1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_modify1By1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_modify1Flag1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_maxCheckQty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fsecondResu;
- private DevExpress.XtraGrid.Columns.GridColumn gv_company;
private DevExpress.XtraGrid.Columns.GridColumn gv_fversion;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcovertQty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fmanageNo;
private DevExpress.XtraEditors.LabelControl lb_fngHandle;
private DevExpress.XtraEditors.TextEdit txt_fngHandle;
private DevExpress.XtraGrid.Columns.GridColumn gv_fngHandle;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fgearStand;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fexemption;
- private DevExpress.XtraGrid.Columns.GridColumn gv_outDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_itemUnit;
private DevExpress.XtraGrid.Columns.GridColumn gv_ftype;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckAccord;
private DevExpress.XtraGrid.Columns.GridColumn gv_fsubmit;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fcancel;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fthirdRep;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckRepno;
- private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
private DevExpress.XtraGrid.Columns.GridColumn gv_modify1Date;
private DevExpress.XtraGrid.Columns.GridColumn gv_modify1By;
private DevExpress.XtraGrid.Columns.GridColumn gv_modify1Flag;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_fhandle;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fmove;
private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo;
private DevExpress.XtraEditors.LabelControl lb_checkQty;
private DevExpress.XtraEditors.TextEdit txt_checkQty;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkQty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_facLevel;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckLevel;
- private DevExpress.XtraGrid.Columns.GridColumn gv_sampleSizeNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_freview;
private DevExpress.XtraEditors.LabelControl lb_fcheckResu;
private DevExpress.XtraEditors.TextEdit txt_fcheckResu;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckResu;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fngDesc;
private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
private DevExpress.XtraEditors.LabelControl lb_freceQty;
@@ -2430,7 +1572,6 @@
private DevExpress.XtraEditors.LabelControl lb_releaseNo;
private DevExpress.XtraEditors.TextEdit txt_releaseNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_releaseNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_id;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
private DevExpress.XtraEditors.PanelControl panelControl1;
private DevExpress.XtraEditors.SimpleButton btnUp;
@@ -2443,10 +1584,6 @@
private DevExpress.XtraEditors.LabelControl lb_tname;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
private DevExpress.XtraEditors.LabelControl labelControl1;
- private DevExpress.XtraEditors.PanelControl panMsg;
- private DevExpress.XtraEditors.LabelControl labelControl3;
- private DevExpress.XtraEditors.LabelControl labelControl2;
- private DevExpress.XtraEditors.TextEdit textEdit1;
private DevExpress.XtraEditors.LabelControl lb_fsubmit;
private DevExpress.XtraEditors.TextEdit txt_fsubmit;
private DevExpress.XtraEditors.LabelControl lb_modify1Flag;
@@ -2457,8 +1594,6 @@
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1id;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ftextType;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstand;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fupAllow;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
@@ -2474,22 +1609,11 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fngQty;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fngRate;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fenterQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1releaseNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1company;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1factory;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItemDesc;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1procNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1workshopCenterCode;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1funit;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1givenModify;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckTool;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateBy;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1remarks;
private DevExpress.XtraEditors.GroupControl groupControl1;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index 2a053a6..3b95868 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -1,9 +1,4 @@
-锘縰sing DevExpress.Pdf.Native.BouncyCastle.Asn1.Pkcs;
-using DevExpress.Utils.VisualEffects;
-using DevExpress.XtraGrid.Views.Base.ViewInfo;
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -27,12 +22,7 @@
public Frm_MesQaItemsDetect01Check()
{
InitializeComponent();
- this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
- this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
- this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
- this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.btnZhiLiangChkClick += ToolBarMenu1_btnZhiLiangChkClick;
this.toolBarMenu1.btnZhiLiangFchkClick += ToolBarMenu1_btnZhiLiangFchkClick;
@@ -153,52 +143,6 @@
}
/// <summary>
- /// 鍙栨秷浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- }
-
- /// <summary>
- /// 鍒犻櫎浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
- {
- string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1);
- if (string.IsNullOrEmpty(rowGuid))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
- return;
- List<dynamic> lst = new List<dynamic>();
- lst.Add(rowGuid);
- var _obj = lst;
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
- }
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
- /// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
/// <param name="sender"></param>
@@ -208,73 +152,7 @@
UtilityHelper.JumpToTab(xtraTabControl1, 0);
getPageList(1, UtilityHelper.GetPageSize());
}
- /// <summary>
- /// 淇敼浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
- {
- string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1);
- if (string.IsNullOrEmpty(rowGuid))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- getModel(rowGuid, true, 1);
- }
- /// <summary>
- /// 鏂板浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 1);
- lbGuid.Text = "";
- List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gridViews.Add(gvMx1);
- gridViews.Add(gvMx2);
- UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
- }
- /// <summary>
- /// 淇濆瓨浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
- {
- toolBarMenu1.isSetBtn = false;
- //if (string.IsNullOrEmpty(txt_account.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
- // txt_account.Focus();
- return;
- }
- var _obj = new
- {
- guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- };
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- if (_rtn.rtnCode > 0)
- {
- lbGuid.Text = _rtn.rtnData;
- toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
- }
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
+
/// <summary>
///
/// </summary>
@@ -343,7 +221,7 @@
UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
- foreach (var a in _job["rtnData"]["list"])
+ foreach (var a in _job["rtnData"]["list5"])
{
array.Add(a);
}
@@ -451,14 +329,18 @@
/// <param name="e"></param>
private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
{
- var rowGuid = "";
var myDataRow = gvMx1.GetDataRow(e.FocusedRowHandle);
if (myDataRow == null) return;
- rowGuid = myDataRow["id"].ToString();
- var json = JsonConvert.SerializeObject(rowGuid);
+ var _obj = new
+ {
+ parentGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ guid = UtilityHelper.ToGuid(myDataRow["guid"].ToString()), //涓诲缓
+ checkQyt = myDataRow["checkQyt"].ToString(),
+ chkItem = myDataRow["fcheckItem"].ToString()
+ };
try
{
- var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetCheckResultList", json);
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetCheckResultList12", JsonConvert.SerializeObject(_obj));
var dd = UtilityHelper.ReturnToList(strReturn);
var dt = dd.rtnData;
gcMx2.BindingContext = new BindingContext();
@@ -471,6 +353,5 @@
}
}
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index ea8e53d..8a27c39 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -799,6 +799,10 @@
<None Include="Resources\bouser_16x162.png" />
<None Include="Resources\refresh_32x32.png" />
<None Include="Resources\refresh_32x321.png" />
+ <None Include="Resources\trackingchanges_previous_32x32.png" />
+ <None Include="Resources\trackingchanges_previous_16x16.png" />
+ <None Include="Resources\updatetableofcontents_32x32.png" />
+ <None Include="Resources\updatetableofcontents_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index b668e04..2d3e4ca 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -1303,6 +1303,26 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap trackingchanges_previous_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("trackingchanges_previous_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap trackingchanges_previous_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("trackingchanges_previous_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap trackingchanges_showmarkup_16x16 {
get {
object obj = ResourceManager.GetObject("trackingchanges_showmarkup_16x16", resourceCulture);
@@ -1343,6 +1363,26 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap updatetableofcontents_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("updatetableofcontents_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap updatetableofcontents_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("updatetableofcontents_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap user_16x16 {
get {
object obj = ResourceManager.GetObject("user_16x16", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 4168813..57a3ec1 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -171,6 +171,9 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\trackingchanges_previous_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,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -200,18 +203,16 @@
<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 name="insertdatafield_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\insertdatafield_32x32.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 name="trackingchanges_previous_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\trackingchanges_previous_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,
@@ -284,6 +285,11 @@
<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="user_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\user_16x16.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>
@@ -294,6 +300,11 @@
</data>
<data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_next_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="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap,
@@ -307,11 +318,6 @@
</data>
<data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
- 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>
@@ -374,6 +380,9 @@
<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="updatetableofcontents_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\updatetableofcontents_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,
@@ -419,10 +428,8 @@
<data name="deletetablecells_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\deletetablecells_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="user_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\user_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <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="bouser_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bouser_16x16.png;System.Drawing.Bitmap,
@@ -444,6 +451,11 @@
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,
+ 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,
@@ -456,11 +468,6 @@
</data>
<data name="3dcylinder_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\3dcylinder_16x16.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>
@@ -486,6 +493,11 @@
</data>
<data name="saveall_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\saveall_32x32.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>
@@ -558,6 +570,11 @@
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>
<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>
@@ -577,14 +594,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 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="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,
+ <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>
@@ -640,8 +656,8 @@
<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="editrangepermission_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\editrangepermission_16x16.png;System.Drawing.Bitmap,
+ <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>
@@ -656,23 +672,21 @@
<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&reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\lookup&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>
<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,
+ <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>
@@ -684,8 +698,8 @@
<data name="viewmergeddata_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\viewmergeddata_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="insertdatafield_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\insertdatafield_32x32.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="legendnone2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\legendnone2_32x32.png;System.Drawing.Bitmap,
@@ -706,10 +720,8 @@
<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,
- 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>
<data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -724,7 +736,7 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <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 name="updatetableofcontents_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\updatetableofcontents_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/trackingchanges_previous_16x16.png b/DevApp/Gs.DevApp/Resources/trackingchanges_previous_16x16.png
new file mode 100644
index 0000000..08cd629
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/trackingchanges_previous_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/trackingchanges_previous_32x32.png b/DevApp/Gs.DevApp/Resources/trackingchanges_previous_32x32.png
new file mode 100644
index 0000000..1d64196
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/trackingchanges_previous_32x32.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/updatetableofcontents_16x16.png b/DevApp/Gs.DevApp/Resources/updatetableofcontents_16x16.png
new file mode 100644
index 0000000..c39b5d7
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/updatetableofcontents_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/updatetableofcontents_32x32.png b/DevApp/Gs.DevApp/Resources/updatetableofcontents_32x32.png
new file mode 100644
index 0000000..0ad62d1
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/updatetableofcontents_32x32.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 254e66b..1dded60 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -56,6 +56,7 @@
this.btnPiZhun = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnZhiLiangChk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnZhiLiangFchk = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnBoHui = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnCaiGouChk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnCaiGouFchk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnLog = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -107,9 +108,10 @@
this.btnZhiLiangChk,
this.btnZhiLiangFchk,
this.btnCaiGouChk,
- this.btnCaiGouFchk});
+ this.btnCaiGouFchk,
+ this.btnBoHui});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 37;
+ this.barManager1.MaxItemId = 38;
//
// bar2
//
@@ -140,6 +142,7 @@
new DevExpress.XtraBars.LinkPersistInfo(this.btnPiZhun),
new DevExpress.XtraBars.LinkPersistInfo(this.btnZhiLiangChk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnZhiLiangFchk),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnBoHui),
new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiGouChk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiGouFchk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnLog)});
@@ -372,6 +375,15 @@
this.btnZhiLiangFchk.Name = "btnZhiLiangFchk";
this.btnZhiLiangFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // btnBoHui
+ //
+ this.btnBoHui.Caption = "椹冲洖閲嶆";
+ this.btnBoHui.Id = 37;
+ this.btnBoHui.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.updatetableofcontents_16x16;
+ this.btnBoHui.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.updatetableofcontents_32x32;
+ this.btnBoHui.Name = "btnBoHui";
+ this.btnBoHui.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
// btnCaiGouChk
//
this.btnCaiGouChk.Caption = "閲囪喘瀹℃牳";
@@ -411,7 +423,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 69);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 74);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -432,7 +444,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 69);
+ this.Size = new System.Drawing.Size(1543, 74);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -471,5 +483,6 @@
private DevExpress.XtraBars.BarLargeButtonItem btnZhiLiangFchk;
private DevExpress.XtraBars.BarLargeButtonItem btnCaiGouChk;
private DevExpress.XtraBars.BarLargeButtonItem btnCaiGouFchk;
+ private DevExpress.XtraBars.BarLargeButtonItem btnBoHui;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 6b76a26..8c9b7e0 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -43,6 +43,7 @@
btnZhiLiangFchk.ItemClick += BtnZhiLiangFchk_ItemClick;
btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick;
btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick;
+ btnBoHui.ItemClick += BtnBoHui_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -50,6 +51,8 @@
lst.Add(item.Caption);
actions = lst;
}
+
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
@@ -59,7 +62,26 @@
base.OnCreateControl();
if (Parent != null) getNamespace();
}
+ private void BtnBoHui_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnBoHuiClick != null)
+ btnBoHuiClick(this, e);
+ if (string.IsNullOrEmpty(guidKey))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (string.IsNullOrEmpty(chkParameter))
+ {
+ MsgHelper.ShowError("娌℃湁鎸囧畾椹冲洖鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ return;
+ }
+
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾椹冲洖閲嶆鍚楋紵"))
+ return;
+ _ckService("5");
+ }
private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouFchkClick != null)
@@ -779,6 +801,10 @@
/// </summary>
public event EventHandler btnZhiLiangFchkClick;
+ /// <summary>
+ /// 椹冲洖
+ /// </summary>
+ public event EventHandler btnBoHuiClick;
#endregion
--
Gitblit v1.9.3