From c62c421dbbc5cbf9841a6a07f86a500c2b70b5e2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 07 九月 2025 10:58:49 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 46 +---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 2
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 7
DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs | 16 +
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.Designer.cs | 44 ++--
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.cs | 3
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 107 +++++++----
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs | 175 ++++++++++---------
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 124 ++++++------
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 4
10 files changed, 286 insertions(+), 242 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index 2d10167..0607b40 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -31,27 +31,27 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemQt));
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -906,41 +906,41 @@
this.layoutControlItem25});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition10.Height = 100D;
- rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition11.Height = 100D;
- rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition12.Height = 100D;
- rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition13.Height = 100D;
- rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition14.Height = 100D;
- rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition8,
- rowDefinition9,
- rowDefinition10,
- rowDefinition11,
- rowDefinition12,
- rowDefinition13,
- rowDefinition14});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7});
this.Root.Size = new System.Drawing.Size(1105, 237);
this.Root.TextVisible = false;
//
@@ -1466,7 +1466,7 @@
//
this.gvMx1qd009.AppearanceCell.Options.UseFont = true;
this.gvMx1qd009.Caption = "鍗曚綅 ";
- this.gvMx1qd009.FieldName = "qd009";
+ this.gvMx1qd009.FieldName = "qd009dw";
this.gvMx1qd009.MinWidth = 25;
this.gvMx1qd009.Name = "gvMx1qd009";
this.gvMx1qd009.Tag = "query_a.qd009";
@@ -1503,10 +1503,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1537,10 +1537,10 @@
// rptCk
//
this.rptCk.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptCk.Name = "rptCk";
this.rptCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptCk_ButtonClick);
//
@@ -1558,7 +1558,7 @@
this.gridColumn18.AppearanceCell.Options.UseForeColor = true;
this.gridColumn18.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
this.gridColumn18.AppearanceHeader.Options.UseForeColor = true;
- this.gridColumn18.Caption = "Mes/Erp鍙婃椂搴撳瓨";
+ this.gridColumn18.Caption = "Mes/Erp搴撳瓨";
this.gridColumn18.FieldName = "kcQty";
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index e5f19fa..8328e66 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -131,7 +131,7 @@
_row["qd002"] = dym.itemNo;
_row["qd003"] = dym.itemName;
_row["qd004"] = dym.itemModel;
- _row["qd009"] = dym.dwName;
+ _row["qd009dw"] = dym.dwName;
_row["itemId"] = dym.itemId;
_row["qd007"] = dym.sl;
_row["qd010"] = dym.bz;
@@ -761,7 +761,7 @@
gvMx1.SetFocusedRowCellValue("qd002", SelectedDataRow["itemNo"]);
gvMx1.SetFocusedRowCellValue("qd003", SelectedDataRow["itemName"]);
gvMx1.SetFocusedRowCellValue("qd004", SelectedDataRow["itemModel"]);
- gvMx1.SetFocusedRowCellValue("qd009", SelectedDataRow["dwName"]);
+ gvMx1.SetFocusedRowCellValue("qd009dw", SelectedDataRow["dwName"]);
gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"]);
gvMx1.SetFocusedRowCellValue("depotName", SelectedDataRow["depotName"]);
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
index 767c4b7..f57891a 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -80,6 +80,8 @@
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -220,7 +222,6 @@
this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -465,7 +466,8 @@
this.gridColumn13,
this.gridColumn17,
this.gridColumn7,
- this.gridColumn6});
+ this.gridColumn6,
+ this.gridColumn11});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -607,7 +609,7 @@
// gv_fcovertQty
//
this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
- this.gv_fcovertQty.Caption = "宸ュ崟鏁伴噺";
+ this.gv_fcovertQty.Caption = "宸ュ崟鎬绘暟";
this.gv_fcovertQty.FieldName = "daaQty";
this.gv_fcovertQty.MinWidth = 30;
this.gv_fcovertQty.Name = "gv_fcovertQty";
@@ -628,7 +630,7 @@
this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
this.gv_fbatchQty.Visible = true;
- this.gv_fbatchQty.VisibleIndex = 11;
+ this.gv_fbatchQty.VisibleIndex = 12;
this.gv_fbatchQty.Width = 80;
//
// gv_remarks
@@ -641,7 +643,7 @@
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 12;
+ this.gv_remarks.VisibleIndex = 13;
this.gv_remarks.Width = 100;
//
// gv_fcheckBy
@@ -654,7 +656,7 @@
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.VisibleIndex = 13;
+ this.gv_fcheckBy.VisibleIndex = 14;
this.gv_fcheckBy.Width = 118;
//
// gv_fcheckDate
@@ -667,7 +669,7 @@
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 14;
+ this.gv_fcheckDate.VisibleIndex = 15;
this.gv_fcheckDate.Width = 182;
//
// gv_createBy
@@ -679,8 +681,6 @@
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 = 15;
this.gv_createBy.Width = 67;
//
// gridColumn15
@@ -689,8 +689,6 @@
this.gridColumn15.FieldName = "createDate";
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
- this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 16;
this.gridColumn15.Width = 94;
//
// gv_lastupdateBy
@@ -703,7 +701,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 17;
+ this.gv_lastupdateBy.VisibleIndex = 16;
this.gv_lastupdateBy.Width = 60;
//
// gv_lastupdateDate
@@ -716,7 +714,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 18;
+ this.gv_lastupdateDate.VisibleIndex = 17;
this.gv_lastupdateDate.Width = 120;
//
// gridColumn18
@@ -726,7 +724,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 19;
+ this.gridColumn18.VisibleIndex = 18;
this.gridColumn18.Width = 94;
//
// gridColumn19
@@ -736,7 +734,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 20;
+ this.gridColumn19.VisibleIndex = 19;
this.gridColumn19.Width = 94;
//
// gridColumn30
@@ -770,6 +768,26 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "鐢熶骇缁勭粐";
+ this.gridColumn6.FieldName = "fSubsidiary";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 20;
+ this.gridColumn6.Width = 94;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "閫佹鏁伴噺";
+ this.gridColumn11.FieldName = "sjQty";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 11;
+ this.gridColumn11.Width = 94;
//
// pageBar1
//
@@ -808,7 +826,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1342, 688);
- this.splitMx1.SplitterPosition = 242;
+ this.splitMx1.SplitterPosition = 249;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -862,7 +880,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(789, 440, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1342, 242);
+ this.layoutMx1.Size = new System.Drawing.Size(1342, 249);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -871,7 +889,7 @@
this.txt_fzrId.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fzrId.Appearance.Options.UseForeColor = true;
this.txt_fzrId.IsReadly = false;
- this.txt_fzrId.Location = new System.Drawing.Point(1074, 152);
+ this.txt_fzrId.Location = new System.Drawing.Point(1074, 154);
this.txt_fzrId.Name = "txt_fzrId";
this.txt_fzrId.Size = new System.Drawing.Size(256, 24);
this.txt_fzrId.TabIndex = 839;
@@ -879,7 +897,7 @@
// txt_zrType
//
this.txt_zrType.EditValue = "-璇烽�夋嫨-";
- this.txt_zrType.Location = new System.Drawing.Point(1074, 124);
+ this.txt_zrType.Location = new System.Drawing.Point(1074, 125);
this.txt_zrType.Name = "txt_zrType";
this.txt_zrType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -937,7 +955,7 @@
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(84, 208);
+ this.txt_remarks.Location = new System.Drawing.Point(84, 212);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
this.txt_remarks.Size = new System.Drawing.Size(254, 24);
@@ -977,7 +995,7 @@
//
// txt_lotNo1
//
- this.txt_lotNo1.Location = new System.Drawing.Point(414, 124);
+ this.txt_lotNo1.Location = new System.Drawing.Point(414, 125);
this.txt_lotNo1.Name = "txt_lotNo1";
this.txt_lotNo1.Properties.Appearance.Options.UseFont = true;
this.txt_lotNo1.Size = new System.Drawing.Size(254, 24);
@@ -987,7 +1005,7 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(84, 124);
+ this.txt_itemNo.Location = new System.Drawing.Point(84, 125);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
@@ -997,7 +1015,7 @@
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(84, 180);
+ this.txt_itemModel.Location = new System.Drawing.Point(84, 183);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
@@ -1026,7 +1044,7 @@
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(744, 152);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(744, 154);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
this.txt_fsubmitBy.Size = new System.Drawing.Size(254, 24);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
@@ -1035,7 +1053,7 @@
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(744, 124);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(744, 125);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
this.txt_fsubmitDate.Size = new System.Drawing.Size(254, 24);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
@@ -1044,7 +1062,7 @@
//
// txt_fsubmit
//
- this.txt_fsubmit.Location = new System.Drawing.Point(672, 180);
+ this.txt_fsubmit.Location = new System.Drawing.Point(672, 183);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
this.txt_fsubmit.Size = new System.Drawing.Size(326, 24);
@@ -1054,7 +1072,7 @@
//
// txt_fmanageNo
//
- this.txt_fmanageNo.Location = new System.Drawing.Point(414, 180);
+ this.txt_fmanageNo.Location = new System.Drawing.Point(414, 183);
this.txt_fmanageNo.Name = "txt_fmanageNo";
this.txt_fmanageNo.Size = new System.Drawing.Size(254, 24);
this.txt_fmanageNo.StyleController = this.layoutMx1;
@@ -1114,7 +1132,7 @@
//
// txt_epTag
//
- this.txt_epTag.Location = new System.Drawing.Point(414, 152);
+ this.txt_epTag.Location = new System.Drawing.Point(414, 154);
this.txt_epTag.Name = "txt_epTag";
this.txt_epTag.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1142,7 +1160,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(84, 152);
+ this.txt_itemName.Location = new System.Drawing.Point(84, 154);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Size = new System.Drawing.Size(254, 24);
this.txt_itemName.StyleController = this.layoutMx1;
@@ -1208,7 +1226,7 @@
//
// txt_fmrmode
//
- this.txt_fmrmode.Location = new System.Drawing.Point(1074, 180);
+ this.txt_fmrmode.Location = new System.Drawing.Point(1074, 183);
this.txt_fmrmode.Name = "txt_fmrmode";
this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1376,7 +1394,7 @@
rowDefinition6,
rowDefinition7,
rowDefinition8});
- this.Root.Size = new System.Drawing.Size(1342, 244);
+ this.Root.Size = new System.Drawing.Size(1342, 249);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1418,40 +1436,40 @@
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem24.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem24.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem24.Text = "瀹㈡埛缂栫爜";
this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_lotNo1;
- this.layoutControlItem3.Location = new System.Drawing.Point(330, 112);
+ this.layoutControlItem3.Location = new System.Drawing.Point(330, 113);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem3.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem3.Text = "閫佹鎵瑰彿";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// txt_epTagtxt
//
this.txt_epTagtxt.Control = this.txt_epTag;
- this.txt_epTagtxt.Location = new System.Drawing.Point(330, 140);
+ this.txt_epTagtxt.Location = new System.Drawing.Point(330, 142);
this.txt_epTagtxt.Name = "txt_epTagtxt";
this.txt_epTagtxt.OptionsTableLayoutItem.ColumnIndex = 1;
this.txt_epTagtxt.OptionsTableLayoutItem.RowIndex = 5;
- this.txt_epTagtxt.Size = new System.Drawing.Size(330, 28);
+ this.txt_epTagtxt.Size = new System.Drawing.Size(330, 29);
this.txt_epTagtxt.Text = "鐜繚鏍囪瘑";
this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_fmanageNo;
- this.layoutControlItem18.Location = new System.Drawing.Point(330, 168);
+ this.layoutControlItem18.Location = new System.Drawing.Point(330, 171);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem18.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem18.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem18.Text = "娴佺▼缂栧彿";
this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1462,29 +1480,29 @@
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(332, 29);
this.layoutControlItem13.Text = "澶勭疆缁撴灉";
this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_zrType;
- this.layoutControlItem7.Location = new System.Drawing.Point(990, 112);
+ this.layoutControlItem7.Location = new System.Drawing.Point(990, 113);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem7.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(332, 29);
this.layoutControlItem7.Text = "鍒ゅ畾璐ｄ换";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.txt_fzrId;
- this.layoutControlItem35.Location = new System.Drawing.Point(990, 140);
+ this.layoutControlItem35.Location = new System.Drawing.Point(990, 142);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem35.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem35.Size = new System.Drawing.Size(332, 29);
this.layoutControlItem35.Text = "璐ｄ换浜�";
this.layoutControlItem35.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1503,11 +1521,11 @@
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_fmrmode;
- this.layoutControlItem25.Location = new System.Drawing.Point(990, 168);
+ this.layoutControlItem25.Location = new System.Drawing.Point(990, 171);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem25.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(332, 29);
this.layoutControlItem25.Text = "杩斿伐宸ュ簭";
this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1546,7 +1564,7 @@
this.txt_lineName111.Location = new System.Drawing.Point(0, 84);
this.txt_lineName111.Name = "txt_lineName111";
this.txt_lineName111.OptionsTableLayoutItem.RowIndex = 3;
- this.txt_lineName111.Size = new System.Drawing.Size(330, 28);
+ this.txt_lineName111.Size = new System.Drawing.Size(330, 29);
this.txt_lineName111.Text = "鐢熶骇绾垮埆";
this.txt_lineName111.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1554,20 +1572,20 @@
//
this.layoutControlItem5.Control = this.txt_itemNo;
this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 112);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 113);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem5.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem5.Text = "浜у搧缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_itemName;
- this.layoutControlItem34.Location = new System.Drawing.Point(0, 140);
+ this.layoutControlItem34.Location = new System.Drawing.Point(0, 142);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem34.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem34.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem34.Text = "浜у搧鍚嶇О";
this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1575,20 +1593,20 @@
//
this.layoutControlItem6.Control = this.txt_itemModel;
this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 168);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 171);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem6.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 196);
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 200);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem12.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem12.Text = "澶囨敞璇存槑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1631,40 +1649,40 @@
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem2.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fsubmitDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(660, 112);
+ this.layoutControlItem16.Location = new System.Drawing.Point(660, 113);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem16.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fsubmitBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(660, 140);
+ this.layoutControlItem15.Location = new System.Drawing.Point(660, 142);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem15.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fsubmit;
- this.layoutControlItem14.Location = new System.Drawing.Point(660, 168);
+ this.layoutControlItem14.Location = new System.Drawing.Point(660, 171);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem14.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1675,7 +1693,7 @@
this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
- this.xtraTabControl2.Size = new System.Drawing.Size(1342, 434);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1342, 427);
this.xtraTabControl2.TabIndex = 3;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1687,7 +1705,7 @@
this.tabMxPage1.Controls.Add(this.splitMx2);
this.tabMxPage1.Controls.Add(this.panMsg);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1340, 402);
+ this.tabMxPage1.Size = new System.Drawing.Size(1340, 395);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
//
// splitMx2
@@ -1706,7 +1724,7 @@
//
this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
this.splitMx2.Panel2.Text = "Panel2";
- this.splitMx2.Size = new System.Drawing.Size(1340, 355);
+ this.splitMx2.Size = new System.Drawing.Size(1340, 348);
this.splitMx2.SplitterPosition = 287;
this.splitMx2.TabIndex = 3;
//
@@ -2025,7 +2043,7 @@
//
this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
this.splitYangLi.Panel2.Text = "Panel2";
- this.splitYangLi.Size = new System.Drawing.Size(1340, 56);
+ this.splitYangLi.Size = new System.Drawing.Size(1340, 49);
this.splitYangLi.SplitterPosition = 676;
this.splitYangLi.TabIndex = 4;
//
@@ -2035,7 +2053,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(676, 56);
+ this.groupControl1.Size = new System.Drawing.Size(676, 49);
this.groupControl1.TabIndex = 3;
this.groupControl1.Text = "妫�娴嬬粨鏋�";
//
@@ -2045,7 +2063,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(672, 26);
+ this.gcMx2.Size = new System.Drawing.Size(672, 19);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2130,7 +2148,7 @@
this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl2.Location = new System.Drawing.Point(0, 0);
this.groupControl2.Name = "groupControl2";
- this.groupControl2.Size = new System.Drawing.Size(652, 56);
+ this.groupControl2.Size = new System.Drawing.Size(652, 49);
this.groupControl2.TabIndex = 4;
this.groupControl2.Text = "鏍锋湰缁撴灉";
//
@@ -2140,7 +2158,7 @@
this.gcMx3.Location = new System.Drawing.Point(2, 28);
this.gcMx3.MainView = this.gvMx3;
this.gcMx3.Name = "gcMx3";
- this.gcMx3.Size = new System.Drawing.Size(648, 26);
+ this.gcMx3.Size = new System.Drawing.Size(648, 19);
this.gcMx3.TabIndex = 0;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -2359,7 +2377,7 @@
//
this.tabMxPage2.Controls.Add(this.ucChouJianList1);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1340, 402);
+ this.tabMxPage2.Size = new System.Drawing.Size(1340, 395);
this.tabMxPage2.Text = "浜у搧鏉＄爜鏄庣粏";
//
// ucChouJianList1
@@ -2368,14 +2386,14 @@
this.ucChouJianList1.Location = new System.Drawing.Point(0, 0);
this.ucChouJianList1.Name = "ucChouJianList1";
this.ucChouJianList1.pGuid = null;
- this.ucChouJianList1.Size = new System.Drawing.Size(1340, 402);
+ this.ucChouJianList1.Size = new System.Drawing.Size(1340, 395);
this.ucChouJianList1.TabIndex = 0;
//
// tabMxPage3
//
this.tabMxPage3.Controls.Add(this.ucUpFileList1);
this.tabMxPage3.Name = "tabMxPage3";
- this.tabMxPage3.Size = new System.Drawing.Size(1340, 402);
+ this.tabMxPage3.Size = new System.Drawing.Size(1340, 395);
this.tabMxPage3.Text = "闄勪欢淇℃伅";
//
// ucUpFileList1
@@ -2385,7 +2403,7 @@
this.ucUpFileList1.Name = "ucUpFileList1";
this.ucUpFileList1.parentGroup = null;
this.ucUpFileList1.pGuid = null;
- this.ucUpFileList1.Size = new System.Drawing.Size(1340, 402);
+ this.ucUpFileList1.Size = new System.Drawing.Size(1340, 395);
this.ucUpFileList1.TabIndex = 0;
//
// repositoryItemComboBox2
@@ -2420,16 +2438,6 @@
// gridView4
//
this.gridView4.Name = "gridView4";
- //
- // gridColumn6
- //
- this.gridColumn6.Caption = "鐢熶骇缁勭粐";
- this.gridColumn6.FieldName = "fSubsidiary";
- this.gridColumn6.MinWidth = 25;
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 21;
- this.gridColumn6.Width = 94;
//
// Frm_FqcDetect01
//
@@ -2749,5 +2757,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.Designer.cs
index dfe18e0..9f66596 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.Designer.cs
@@ -28,11 +28,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -42,9 +42,9 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -58,7 +58,7 @@
this.gcMain.Name = "gcMain";
this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMain.Size = new System.Drawing.Size(581, 489);
+ this.gcMain.Size = new System.Drawing.Size(743, 489);
this.gcMain.TabIndex = 3;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -148,6 +148,16 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Width = 94;
//
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "宸ュ崟鐘舵��";
+ this.gridColumn8.FieldName = "daa018";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 5;
+ this.gridColumn8.Width = 94;
+ //
// gv_Btn
//
this.gv_Btn.Caption = "閫夋嫨";
@@ -162,36 +172,26 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
- //
- // gridColumn8
- //
- this.gridColumn8.Caption = "宸ュ崟鐘舵��";
- this.gridColumn8.FieldName = "daa018";
- this.gridColumn8.MinWidth = 25;
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 5;
- this.gridColumn8.Width = 94;
//
// SelectFqcDaa
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(581, 489);
+ this.ClientSize = new System.Drawing.Size(743, 489);
this.Controls.Add(this.gcMain);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "SelectFqcDaa";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "閫夋嫨宸ュ崟锛屽彧鏄剧ず锛圡:鐢熶骇涓級鐨勫伐鍗�";
+ this.Text = "閫夋嫨宸ュ崟锛屽彧鏄剧ず锛圡:鐢熶骇涓�,Q:娓呭熬,W:瀹屽伐,S:鏆傚仠锛夌殑宸ュ崟";
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.cs b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.cs
index c1a38f2..a2bce97 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.cs
@@ -1,4 +1,5 @@
锘�
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
@@ -29,7 +30,7 @@
currentPage = curPage,
everyPageSize = 999999,
sortName = "",
- keyWhere = "",
+ keyWhere = LoginInfoModel.CurrentUser.LoginUserGuid,
};
var json = JsonConvert.SerializeObject(_obj);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
index 6fb41f4..1c50280 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
@@ -52,6 +52,7 @@
this.cms1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.tabCloseCurrent = new System.Windows.Forms.ToolStripMenuItem();
this.tabCloseAll = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolForm = new System.Windows.Forms.ToolStripStatusLabel();
this.fluentDesignFormContainer1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tab)).BeginInit();
this.strp1.SuspendLayout();
@@ -90,7 +91,8 @@
this.toolZhiChi,
this.toolTime,
this.toolVersion,
- this.toolFont});
+ this.toolFont,
+ this.toolForm});
this.strp1.Location = new System.Drawing.Point(0, 701);
this.strp1.Name = "strp1";
this.strp1.Size = new System.Drawing.Size(1022, 26);
@@ -127,10 +129,10 @@
//
// toolFont
//
- this.toolFont.Image = global::Gs.DevApp.Properties.Resources.article_16x16;
+ this.toolFont.Image = global::Gs.DevApp.Properties.Resources.fontsizeincrease_16x161;
this.toolFont.Name = "toolFont";
this.toolFont.Size = new System.Drawing.Size(89, 20);
- this.toolFont.Text = "鐗堥潰淇℃伅";
+ this.toolFont.Text = "瀛椾綋淇℃伅";
//
// fluentDesignFormControl1
//
@@ -269,6 +271,13 @@
this.tabCloseAll.Size = new System.Drawing.Size(157, 26);
this.tabCloseAll.Text = "鍏抽棴鍏跺畠椤�";
//
+ // toolForm
+ //
+ this.toolForm.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
+ this.toolForm.Name = "toolForm";
+ this.toolForm.Size = new System.Drawing.Size(97, 20);
+ this.toolForm.Text = "toolForm";
+ //
// FrmMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -320,5 +329,6 @@
private DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit repositoryItemCheckedComboBoxEdit1;
private System.Windows.Forms.ToolStripStatusLabel toolVersion;
private System.Windows.Forms.ToolStripStatusLabel toolFont;
+ private System.Windows.Forms.ToolStripStatusLabel toolForm;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index bd2360f..5603fcc 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -4,6 +4,7 @@
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.TextEditController;
using DevExpress.XtraLayout;
+using DevExpress.XtraRichEdit.Model;
using DevExpress.XtraTab;
using DevExpress.XtraTab.ViewInfo;
using Gs.DevApp.DevFrm.User;
@@ -100,12 +101,17 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
};
-
#region 鍔犱笂搴曢儴鎻愰啋
+ tab.SelectedPageChanged += (s, e) => {
+ string _strForm = e.Page.Tag != null ? e.Page.Tag.ToString() : "鏈煡";
+ toolForm.Text = ("绐椾綋:" + _strForm);
+ };
string _webApiUrl = ConfigurationManager.AppSettings["WebApiUrl"];
string _autoUpdate = (ConfigurationManager.AppSettings["IsAutoUpdater"]);
string _version = ConfigurationManager.AppSettings["Version"];
toolVersion.Text = "褰撳墠鐗堟湰:" + _version + ",鏈嶅姟Api:" + _webApiUrl;
+ string _strFont = Gs.DevApp.Properties.Settings.Default.fontSizeName;
+ toolFont.Text = (",瀛椾綋:" + _strFont);
#endregion
}
/// <summary>
@@ -225,6 +231,7 @@
_grp.Style = ElementStyle.Group;
_grp.Text = _dy["name"].ToString();
_grp.Tag = _dy["formPath"].ToString(); //瀛樿矾寰勶紝绫诲悕
+ _grp.AccessibleDescription = _dy["layoutVersion"].ToString();//鐗堥潰
_grp.Click += _grp_Click;
if (gdx == 0)
_grp.Expanded = true;
@@ -242,6 +249,7 @@
_itm.Text = _dy2["name"].ToString();
wdf.SetCaption("鍔犺浇杩涘害:" + _dy2["name"].ToString());
_itm.Tag = _dy2["formPath"].ToString(); //瀛樿矾寰勶紝绫诲悕
+ _itm.AccessibleDescription = _dy2["layoutVersion"].ToString();//鐗堥潰
_itm.Click += _grp_Click;
_grp.Elements.Add(_itm);
if (idx == 0 && tab.TabPages.Count <= 0)
@@ -250,8 +258,11 @@
var tabText = _itm.Text; //褰撳墠閫夐」鍗￠〉Text鏍囬
var newFormName = _itm.Tag.ToString(); //瀛樿矾寰勶紝绫诲悕
var imgIcon = _itm.Image;
+ var layoutVersion = _itm.AccessibleDescription;
AddTabpage(tab, tabPageName, tabText,
- newFormName, imgIcon);
+ newFormName, imgIcon,"", layoutVersion);
+ //绗�0涓紝涓嶄細瑙﹀彂浜嬩欢锛屾墜鍔ㄨ缃�
+ toolForm.Text = ("绐椾綋:" + newFormName+ ",鐗堥潰:" + layoutVersion);
}
idx++;
}
@@ -268,7 +279,6 @@
}
catch (Exception ex)
{
-
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -286,7 +296,8 @@
var tabText = _acd.Text;
var newFormName = _acd.Tag.ToString();
var imgIcon = _acd.Image;
- AddTabpage(tab, tabPageName, tabText, newFormName, imgIcon);
+ string _strLayout = _acd.AccessibleDescription;
+ AddTabpage(tab, tabPageName, tabText, newFormName, imgIcon, "", _strLayout);
}
/// <summary>
@@ -311,7 +322,7 @@
/// <param name="imgIcon">褰撳墠閫夐」鍗′腑鐨勬柊绐椾綋璺緞锛岀被鍚�</param>
/// <param name="InitializeVal">鍒濆鍊硷紝鐢ㄤ簬瀛愮獥浣撲腑璋冪敤鐖剁獥浣撶殑鍊�</param>
public void AddTabpage(XtraTabControl tabControl, string tabPageName,
- string tabText, string newFormName, Image imgIcon, string InitializeVal = "")
+ string tabText, string newFormName, Image imgIcon, string InitializeVal = "", string strLayout = "")
{
if (IsTabpageExsit(tabControl, tabPageName)) return;
var newPage = new XtraTabPage();
@@ -320,6 +331,7 @@
newPage.Tooltip = newPage.Name;
newPage.Appearance.Header.Font = tab.Appearance.Font;
newPage.ImageOptions.Image = imgIcon;
+ newPage.Tag = newFormName + ",鐗堥潰:" + strLayout;
var fm = AddNewForm(newFormName, InitializeVal);
if (fm != null)
{
@@ -405,30 +417,6 @@
newForm.Dock = DockStyle.Fill;
newForm.Visible = true;
shiXian(newForm, formName, InitializeVal);
- #region 鍔犱笂搴曢儴鎻愰啋
- string _strFont = Gs.DevApp.Properties.Settings.Default.fontSizeName;
- string _ver = "";
- var _obj = new
- {
- formPath = formName,
- };
- try
- {
- string strJson = UtilityHelper.HttpPost("", "Fm/GetModelByVersion", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- _ver = _rtn.rtnData;
- }
- else
- _ver = _rtn.rtnMsg;
- }
- catch (Exception ex)
- {
- _ver = ex.Message;
- }
- toolFont.Text = (",瀛椾綋:" + _strFont + ",绐椾綋:" + formName + ",鐗堥潰:" + _ver);
- #endregion
return newForm;
}
catch (Exception)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 932351e..11ef6a8 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -151,7 +151,6 @@
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -166,7 +165,6 @@
this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -227,6 +225,10 @@
this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.txt_iqcRemark = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -299,7 +301,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
@@ -314,7 +315,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -355,6 +355,10 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iqcRemark.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
this.SuspendLayout();
//
// repositoryItemComboBox1
@@ -877,6 +881,7 @@
this.layoutMx1.Controls.Add(this.txt_fngHandle);
this.layoutMx1.Controls.Add(this.txt_xblb);
this.layoutMx1.Controls.Add(this.txt_xbsl);
+ this.layoutMx1.Controls.Add(this.txt_iqcRemark);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem17,
@@ -885,7 +890,7 @@
this.layoutControlItem23});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(569, 547, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(488, 620, 812, 500);
this.layoutMx1.Root = this.Root;
this.layoutMx1.Size = new System.Drawing.Size(1435, 270);
this.layoutMx1.TabIndex = 0;
@@ -1135,7 +1140,7 @@
// btnYcReport
//
this.btnYcReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttopdf_16x16;
- this.btnYcReport.Location = new System.Drawing.Point(719, 167);
+ this.btnYcReport.Location = new System.Drawing.Point(719, 198);
this.btnYcReport.Name = "btnYcReport";
this.btnYcReport.Size = new System.Drawing.Size(116, 27);
this.btnYcReport.StyleController = this.layoutMx1;
@@ -1163,10 +1168,10 @@
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(84, 136);
+ this.txt_remarks.Location = new System.Drawing.Point(791, 167);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(631, 24);
+ this.txt_remarks.Size = new System.Drawing.Size(632, 24);
this.txt_remarks.StyleController = this.layoutMx1;
this.txt_remarks.TabIndex = 797;
this.txt_remarks.Tag = "readonly";
@@ -1432,7 +1437,6 @@
this.layoutControlItem15,
this.layoutControlItem16,
this.layoutControlItem14,
- this.layoutControlItem12,
this.layoutControlItem10,
this.layoutControlItem13,
this.layoutControlItem22,
@@ -1447,6 +1451,8 @@
this.layoutControlItem26,
this.layoutControlItem29,
this.layoutControlItem30,
+ this.layoutControlItem12,
+ this.layoutControlItem39,
this.layoutControlItem27});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
@@ -1562,17 +1568,6 @@
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 124);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem12.Size = new System.Drawing.Size(707, 31);
- this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
@@ -1730,21 +1725,6 @@
this.layoutControlItem30.Text = "绉伴噸";
this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem30.TextVisible = false;
- //
- // layoutControlItem27
- //
- this.layoutControlItem27.Control = this.btnYcReport;
- this.layoutControlItem27.Location = new System.Drawing.Point(707, 155);
- this.layoutControlItem27.MaxSize = new System.Drawing.Size(120, 31);
- this.layoutControlItem27.MinSize = new System.Drawing.Size(120, 31);
- this.layoutControlItem27.Name = "layoutControlItem27";
- this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem27.Size = new System.Drawing.Size(354, 31);
- this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem27.TextVisible = false;
//
// xtraTabControl2
//
@@ -2443,6 +2423,51 @@
//
this.gridView4.Name = "gridView4";
//
+ // txt_iqcRemark
+ //
+ this.txt_iqcRemark.Location = new System.Drawing.Point(84, 136);
+ this.txt_iqcRemark.Name = "txt_iqcRemark";
+ this.txt_iqcRemark.Size = new System.Drawing.Size(277, 24);
+ this.txt_iqcRemark.StyleController = this.layoutMx1;
+ this.txt_iqcRemark.TabIndex = 819;
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_remarks;
+ this.layoutControlItem12.Location = new System.Drawing.Point(707, 155);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem12.Size = new System.Drawing.Size(708, 31);
+ this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem39
+ //
+ this.layoutControlItem39.Control = this.txt_iqcRemark;
+ this.layoutControlItem39.Location = new System.Drawing.Point(0, 124);
+ this.layoutControlItem39.Name = "layoutControlItem39";
+ this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem39.Size = new System.Drawing.Size(353, 31);
+ this.layoutControlItem39.Text = "妫�楠屽娉�";
+ this.layoutControlItem39.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem27
+ //
+ this.layoutControlItem27.Control = this.btnYcReport;
+ this.layoutControlItem27.Location = new System.Drawing.Point(707, 186);
+ this.layoutControlItem27.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem27.MinSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem27.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem27.TextVisible = false;
+ //
// Frm_MesQaItemsDetect01
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2525,7 +2550,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
@@ -2540,7 +2564,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2581,6 +2604,10 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iqcRemark.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
this.ResumeLayout(false);
}
@@ -2715,7 +2742,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraEditors.TextEdit txt_cgdNo;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
@@ -2751,10 +2777,13 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
private DevExpress.XtraEditors.TextEdit txtWCurrent;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
private DevExpress.XtraEditors.TextEdit txt_weight5;
private DevExpress.XtraEditors.SimpleButton btnClean;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
+ private DevExpress.XtraEditors.TextEdit txt_iqcRemark;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 9b68dc3..80bd659 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -554,12 +554,12 @@
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
fngDesc = txt_fngDesc.TextTxt.Trim(),
+ iqcRemark= txt_iqcRemark.Text.Trim(),
};
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-
if (_rtn.rtnCode > 0)
{
ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 203fcb5..b62ed97 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -3,6 +3,8 @@
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout;
+using DevExpress.XtraWaitForm;
+using Gs.DevApp.DevFrm;
using Gs.DevApp.DevFrm.QC;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
@@ -69,6 +71,10 @@
if (!string.IsNullOrEmpty(item.Caption) && item.Caption != "淇濆瓨" && item.Caption != "鍒锋柊" && item.Caption != "甯姪" && item.Caption != "淇濆瓨鐗堥潰" && item.Caption != "鍙栨秷")
lst.Add(item.Caption);
actions = lst;
+
+
+
+
}
@@ -1280,5 +1286,6 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3