From e06c6fad5e892a4ea2a15d1181c5705c6dc560f7 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 09 四月 2025 10:51:03 +0800
Subject: [PATCH] fqc
---
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs | 284 ++++++++++++++-----------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs | 2
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs | 271 ++++++++++++++++--------
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 97 ++++++++
4 files changed, 437 insertions(+), 217 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
index f69ab32..14b0d1d 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -42,11 +42,12 @@
DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
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 rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -173,6 +174,10 @@
this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptDefectLevel = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptDefectDetails = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.splitYangLi = new DevExpress.XtraEditors.SplitContainerControl();
this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
@@ -210,6 +215,8 @@
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_zrType = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -302,6 +309,8 @@
this.splitMx2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDefectLevel)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDefectDetails)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitYangLi)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel1)).BeginInit();
this.splitYangLi.Panel1.SuspendLayout();
@@ -331,6 +340,8 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
this.SuspendLayout();
//
// repositoryItemComboBox1
@@ -852,6 +863,7 @@
this.layoutMx1.Controls.Add(this.txt_fzrIdTxt);
this.layoutMx1.Controls.Add(this.txt_mrmodeTxt);
this.layoutMx1.Controls.Add(this.txt_freceQty);
+ this.layoutMx1.Controls.Add(this.txt_zrType);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem17,
@@ -866,7 +878,7 @@
//
// txt_itemId
//
- this.txt_itemId.Location = new System.Drawing.Point(84, 109);
+ this.txt_itemId.Location = new System.Drawing.Point(84, 99);
this.txt_itemId.Name = "txt_itemId";
this.txt_itemId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton()});
@@ -878,7 +890,7 @@
// txt_lineId
//
this.txt_lineId.IsReadly = false;
- this.txt_lineId.Location = new System.Drawing.Point(84, 76);
+ this.txt_lineId.Location = new System.Drawing.Point(84, 70);
this.txt_lineId.Name = "txt_lineId";
this.txt_lineId.Size = new System.Drawing.Size(254, 24);
this.txt_lineId.TabIndex = 821;
@@ -886,9 +898,9 @@
// txt_msg
//
this.txt_msg.BtnTxt = "杩濊绫诲埆";
- this.txt_msg.Location = new System.Drawing.Point(672, 208);
+ this.txt_msg.Location = new System.Drawing.Point(672, 186);
this.txt_msg.Name = "txt_msg";
- this.txt_msg.Size = new System.Drawing.Size(326, 62);
+ this.txt_msg.Size = new System.Drawing.Size(326, 54);
this.txt_msg.TabIndex = 814;
this.txt_msg.TextTxt = "";
this.txt_msg.WhereTxt = null;
@@ -896,7 +908,7 @@
// txt_suppId
//
this.txt_suppId.IsReadly = false;
- this.txt_suppId.Location = new System.Drawing.Point(414, 109);
+ this.txt_suppId.Location = new System.Drawing.Point(414, 99);
this.txt_suppId.Name = "txt_suppId";
this.txt_suppId.Size = new System.Drawing.Size(254, 24);
this.txt_suppId.TabIndex = 811;
@@ -912,7 +924,7 @@
//
// txt_fngHandle
//
- this.txt_fngHandle.Location = new System.Drawing.Point(1074, 142);
+ this.txt_fngHandle.Location = new System.Drawing.Point(1074, 128);
this.txt_fngHandle.Name = "txt_fngHandle";
this.txt_fngHandle.Size = new System.Drawing.Size(256, 24);
this.txt_fngHandle.StyleController = this.layoutMx1;
@@ -921,7 +933,7 @@
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(84, 241);
+ this.txt_remarks.Location = new System.Drawing.Point(84, 215);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
this.txt_remarks.Size = new System.Drawing.Size(584, 24);
@@ -930,7 +942,7 @@
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(744, 142);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(744, 128);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
this.txt_fcheckResu.StyleController = this.layoutMx1;
@@ -939,7 +951,7 @@
//
// txt_releaseNo
//
- this.txt_releaseNo.Location = new System.Drawing.Point(84, 43);
+ this.txt_releaseNo.Location = new System.Drawing.Point(84, 41);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
this.txt_releaseNo.Size = new System.Drawing.Size(254, 24);
@@ -949,7 +961,7 @@
//
// txt_fcheckDate
//
- this.txt_fcheckDate.Location = new System.Drawing.Point(744, 175);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(744, 157);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24);
@@ -959,7 +971,7 @@
//
// txt_lotNo1
//
- this.txt_lotNo1.Location = new System.Drawing.Point(414, 142);
+ this.txt_lotNo1.Location = new System.Drawing.Point(414, 128);
this.txt_lotNo1.Name = "txt_lotNo1";
this.txt_lotNo1.Properties.Appearance.Options.UseFont = true;
this.txt_lotNo1.Size = new System.Drawing.Size(254, 24);
@@ -969,7 +981,7 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(84, 142);
+ this.txt_itemNo.Location = new System.Drawing.Point(84, 128);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
@@ -979,7 +991,7 @@
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(84, 208);
+ this.txt_itemModel.Location = new System.Drawing.Point(84, 186);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
@@ -988,7 +1000,7 @@
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(744, 76);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(744, 70);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24);
@@ -998,7 +1010,7 @@
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(414, 43);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(414, 41);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24);
@@ -1008,7 +1020,7 @@
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 43);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 41);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
@@ -1026,7 +1038,7 @@
//
// txt_fsubmit
//
- this.txt_fsubmit.Location = new System.Drawing.Point(1002, 76);
+ this.txt_fsubmit.Location = new System.Drawing.Point(1002, 70);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
@@ -1036,7 +1048,7 @@
//
// txt_fmanageNo
//
- this.txt_fmanageNo.Location = new System.Drawing.Point(414, 208);
+ this.txt_fmanageNo.Location = new System.Drawing.Point(414, 186);
this.txt_fmanageNo.Name = "txt_fmanageNo";
this.txt_fmanageNo.Size = new System.Drawing.Size(254, 24);
this.txt_fmanageNo.StyleController = this.layoutMx1;
@@ -1054,7 +1066,7 @@
//
// txt_lifnr
//
- this.txt_lifnr.Location = new System.Drawing.Point(414, 76);
+ this.txt_lifnr.Location = new System.Drawing.Point(414, 70);
this.txt_lifnr.Name = "txt_lifnr";
this.txt_lifnr.Size = new System.Drawing.Size(254, 24);
this.txt_lifnr.StyleController = this.layoutMx1;
@@ -1086,7 +1098,7 @@
//
// txt_workNo
//
- this.txt_workNo.Location = new System.Drawing.Point(1074, 208);
+ this.txt_workNo.Location = new System.Drawing.Point(1074, 186);
this.txt_workNo.Name = "txt_workNo";
this.txt_workNo.Size = new System.Drawing.Size(256, 24);
this.txt_workNo.StyleController = this.layoutMx1;
@@ -1095,7 +1107,7 @@
//
// txt_states
//
- this.txt_states.Location = new System.Drawing.Point(744, 109);
+ this.txt_states.Location = new System.Drawing.Point(744, 99);
this.txt_states.Name = "txt_states";
this.txt_states.Size = new System.Drawing.Size(254, 24);
this.txt_states.StyleController = this.layoutMx1;
@@ -1104,7 +1116,7 @@
//
// txt_epTag
//
- this.txt_epTag.Location = new System.Drawing.Point(414, 175);
+ this.txt_epTag.Location = new System.Drawing.Point(414, 157);
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)});
@@ -1123,7 +1135,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(744, 43);
+ this.txt_createDate.Location = new System.Drawing.Point(744, 41);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Size = new System.Drawing.Size(254, 24);
this.txt_createDate.StyleController = this.layoutMx1;
@@ -1132,7 +1144,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(84, 175);
+ this.txt_itemName.Location = new System.Drawing.Point(84, 157);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Size = new System.Drawing.Size(254, 24);
this.txt_itemName.StyleController = this.layoutMx1;
@@ -1141,7 +1153,7 @@
//
// txt_fzrIdTxt
//
- this.txt_fzrIdTxt.Location = new System.Drawing.Point(1074, 175);
+ this.txt_fzrIdTxt.Location = new System.Drawing.Point(1074, 157);
this.txt_fzrIdTxt.Name = "txt_fzrIdTxt";
this.txt_fzrIdTxt.Size = new System.Drawing.Size(256, 24);
this.txt_fzrIdTxt.StyleController = this.layoutMx1;
@@ -1150,7 +1162,7 @@
//
// txt_mrmodeTxt
//
- this.txt_mrmodeTxt.Location = new System.Drawing.Point(1074, 241);
+ this.txt_mrmodeTxt.Location = new System.Drawing.Point(1074, 215);
this.txt_mrmodeTxt.Name = "txt_mrmodeTxt";
this.txt_mrmodeTxt.Size = new System.Drawing.Size(256, 24);
this.txt_mrmodeTxt.StyleController = this.layoutMx1;
@@ -1159,7 +1171,7 @@
//
// txt_freceQty
//
- this.txt_freceQty.Location = new System.Drawing.Point(1074, 109);
+ this.txt_freceQty.Location = new System.Drawing.Point(1074, 99);
this.txt_freceQty.Name = "txt_freceQty";
this.txt_freceQty.Size = new System.Drawing.Size(256, 24);
this.txt_freceQty.StyleController = this.layoutMx1;
@@ -1223,7 +1235,8 @@
this.layoutControlItem8,
this.layoutControlItem33,
this.layoutControlItem2,
- this.layoutControlItem12});
+ this.layoutControlItem12,
+ this.layoutControlItem35});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1255,6 +1268,8 @@
rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition8.Height = 100D;
rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
@@ -1263,17 +1278,18 @@
rowDefinition5,
rowDefinition6,
rowDefinition7,
- rowDefinition8});
+ rowDefinition8,
+ rowDefinition9});
this.Root.Size = new System.Drawing.Size(1342, 282);
this.Root.TextVisible = false;
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_releaseNo;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 29);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem1.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1282,7 +1298,7 @@
this.layoutControlItem23.Control = this.txt_djType;
this.layoutControlItem23.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
- this.layoutControlItem23.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem23.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1290,30 +1306,30 @@
//
this.layoutControlItem5.Control = this.txt_itemNo;
this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 130);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 116);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem5.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem5.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem5.Text = "浜у搧缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem30
//
this.layoutControlItem30.Control = this.txt_lineId;
- this.layoutControlItem30.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem30.Location = new System.Drawing.Point(0, 58);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem30.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem30.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem30.Text = "閫夋嫨浜х嚎";
this.layoutControlItem30.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_itemId;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 97);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 87);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem4.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem4.Text = "閫夋嫨浜у搧";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1321,31 +1337,31 @@
//
this.layoutControlItem6.Control = this.txt_itemModel;
this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 196);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 174);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem6.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem6.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_itemName;
- this.layoutControlItem34.Location = new System.Drawing.Point(0, 163);
+ this.layoutControlItem34.Location = new System.Drawing.Point(0, 145);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem34.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem34.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem34.Text = "浜у搧鍚嶇О";
this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_fmanageNo;
- this.layoutControlItem18.Location = new System.Drawing.Point(330, 196);
+ this.layoutControlItem18.Location = new System.Drawing.Point(330, 174);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem18.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem18.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem18.Text = "娴佺▼缂栧彿";
this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1355,29 +1371,29 @@
this.layoutControlItem16.Location = new System.Drawing.Point(990, 0);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(332, 31);
+ this.layoutControlItem16.Size = new System.Drawing.Size(332, 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(990, 31);
+ this.layoutControlItem15.Location = new System.Drawing.Point(990, 29);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem15.Size = new System.Drawing.Size(332, 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(990, 64);
+ this.layoutControlItem14.Location = new System.Drawing.Point(990, 58);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem14.Size = new System.Drawing.Size(332, 29);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1385,33 +1401,33 @@
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_freceQty;
- this.layoutControlItem26.Location = new System.Drawing.Point(990, 97);
+ this.layoutControlItem26.Location = new System.Drawing.Point(990, 87);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem26.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem26.Size = new System.Drawing.Size(332, 29);
this.layoutControlItem26.Text = "鍒ゅ畾缁撴灉";
this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_fngHandle;
- this.layoutControlItem13.Location = new System.Drawing.Point(990, 130);
+ this.layoutControlItem13.Location = new System.Drawing.Point(990, 116);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(332, 33);
+ 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_fzrIdTxt;
- this.layoutControlItem7.Location = new System.Drawing.Point(990, 163);
+ this.layoutControlItem7.Location = new System.Drawing.Point(990, 145);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem7.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem7.Size = new System.Drawing.Size(332, 29);
this.layoutControlItem7.Text = "璐ｄ换浜哄憳";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1419,34 +1435,34 @@
//
this.layoutControlItem25.Control = this.txt_mrmodeTxt;
this.layoutControlItem25.CustomizationFormText = "杩斿伐宸ュ簭";
- this.layoutControlItem25.Location = new System.Drawing.Point(990, 229);
+ this.layoutControlItem25.Location = new System.Drawing.Point(990, 203);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem25.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem25.Size = new System.Drawing.Size(332, 29);
this.layoutControlItem25.Text = "鍙嶅伐宸ュ簭";
this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem29
//
this.layoutControlItem29.Control = this.txt_workNo;
- this.layoutControlItem29.Location = new System.Drawing.Point(990, 196);
+ this.layoutControlItem29.Location = new System.Drawing.Point(990, 174);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem29.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem29.Size = new System.Drawing.Size(332, 29);
this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_msg;
- this.layoutControlItem27.Location = new System.Drawing.Point(660, 196);
+ this.layoutControlItem27.Location = new System.Drawing.Point(660, 174);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem27.Size = new System.Drawing.Size(330, 66);
+ this.layoutControlItem27.Size = new System.Drawing.Size(330, 58);
this.layoutControlItem27.Text = "杩濊绫诲埆";
this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem27.TextVisible = false;
@@ -1457,62 +1473,62 @@
this.layoutControlItem28.Location = new System.Drawing.Point(330, 0);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem28.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem28.Text = "鐢熶骇宸ュ崟";
this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(330, 31);
+ this.layoutControlItem9.Location = new System.Drawing.Point(330, 29);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem9.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem9.Text = "鎶芥鏁伴噺";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_lifnr;
- this.layoutControlItem22.Location = new System.Drawing.Point(330, 64);
+ this.layoutControlItem22.Location = new System.Drawing.Point(330, 58);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem22.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem22.Text = "瀹㈡埛璁㈠崟";
this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txt_suppId;
- this.layoutControlItem24.Location = new System.Drawing.Point(330, 97);
+ this.layoutControlItem24.Location = new System.Drawing.Point(330, 87);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem24.Size = new System.Drawing.Size(330, 33);
+ 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, 130);
+ this.layoutControlItem3.Location = new System.Drawing.Point(330, 116);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem3.Size = new System.Drawing.Size(330, 33);
+ 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, 163);
+ this.txt_epTagtxt.Location = new System.Drawing.Point(330, 145);
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, 33);
+ this.txt_epTagtxt.Size = new System.Drawing.Size(330, 29);
this.txt_epTagtxt.Text = "鐜繚鏍囪瘑";
this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1522,73 +1538,73 @@
this.layoutControlItem31.Location = new System.Drawing.Point(660, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem31.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem31.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(660, 130);
+ this.layoutControlItem10.Location = new System.Drawing.Point(660, 116);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem10.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem10.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_states;
- this.layoutControlItem32.Location = new System.Drawing.Point(660, 97);
+ this.layoutControlItem32.Location = new System.Drawing.Point(660, 87);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem32.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem32.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fcheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(660, 64);
+ this.layoutControlItem8.Location = new System.Drawing.Point(660, 58);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem8.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem33
//
this.layoutControlItem33.Control = this.txt_createDate;
- this.layoutControlItem33.Location = new System.Drawing.Point(660, 31);
+ this.layoutControlItem33.Location = new System.Drawing.Point(660, 29);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem33.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem33.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fcheckDate;
- this.layoutControlItem2.Location = new System.Drawing.Point(660, 163);
+ this.layoutControlItem2.Location = new System.Drawing.Point(660, 145);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem2.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem2.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 229);
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 203);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem12.Size = new System.Drawing.Size(660, 33);
+ this.layoutControlItem12.Size = new System.Drawing.Size(660, 29);
this.layoutControlItem12.Text = "澶囨敞璇存槑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1638,6 +1654,9 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
+ this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.rptDefectLevel,
+ this.rptDefectDetails});
this.gcMx1.Size = new System.Drawing.Size(1340, 287);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -1665,7 +1684,9 @@
this.gvMx1fngQty,
this.gvMx1sampleSizeNo,
this.gvMx1fcheckLevel,
- this.gvMx1facLevel});
+ this.gvMx1facLevel,
+ this.gridColumn9,
+ this.gridColumn10});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1877,6 +1898,47 @@
this.gvMx1facLevel.Visible = true;
this.gvMx1facLevel.VisibleIndex = 15;
this.gvMx1facLevel.Width = 200;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "缂洪櫡绛夌骇";
+ this.gridColumn9.ColumnEdit = this.rptDefectLevel;
+ this.gridColumn9.FieldName = "defectLevel";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Tag = "edit";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 16;
+ this.gridColumn9.Width = 94;
+ //
+ // rptDefectLevel
+ //
+ this.rptDefectLevel.AutoHeight = false;
+ this.rptDefectLevel.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptDefectLevel.Name = "rptDefectLevel";
+ this.rptDefectLevel.NullText = "--";
+ this.rptDefectLevel.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "缂洪櫡鎻忚堪";
+ this.gridColumn10.ColumnEdit = this.rptDefectDetails;
+ this.gridColumn10.FieldName = "defectDetails";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Tag = "edit";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 17;
+ this.gridColumn10.Width = 94;
+ //
+ // rptDefectDetails
+ //
+ this.rptDefectDetails.AutoHeight = false;
+ this.rptDefectDetails.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.rptDefectDetails.Name = "rptDefectDetails";
+ this.rptDefectDetails.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDefectDetails_ButtonClick);
//
// splitYangLi
//
@@ -2174,10 +2236,10 @@
columnDefinition6,
columnDefinition7,
columnDefinition8});
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition9});
+ rowDefinition10});
this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43);
this.layoutControlGroup1.TextVisible = false;
@@ -2271,6 +2333,25 @@
// gridView4
//
this.gridView4.Name = "gridView4";
+ //
+ // txt_zrType
+ //
+ this.txt_zrType.Location = new System.Drawing.Point(1074, 244);
+ this.txt_zrType.Name = "txt_zrType";
+ this.txt_zrType.Size = new System.Drawing.Size(256, 24);
+ this.txt_zrType.StyleController = this.layoutMx1;
+ this.txt_zrType.TabIndex = 829;
+ //
+ // layoutControlItem35
+ //
+ this.layoutControlItem35.Control = this.txt_zrType;
+ this.layoutControlItem35.Location = new System.Drawing.Point(990, 232);
+ this.layoutControlItem35.Name = "layoutControlItem35";
+ this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem35.Size = new System.Drawing.Size(332, 30);
+ this.layoutControlItem35.Text = "璐ｄ换鍒ゅ畾";
+ this.layoutControlItem35.TextSize = new System.Drawing.Size(60, 18);
//
// Frm_FqcDetect01
//
@@ -2374,6 +2455,8 @@
this.splitMx2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDefectLevel)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDefectDetails)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel1)).EndInit();
this.splitYangLi.Panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel2)).EndInit();
@@ -2403,6 +2486,8 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
this.ResumeLayout(false);
}
@@ -2570,5 +2655,11 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptDefectLevel;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDefectDetails;
+ private DevExpress.XtraEditors.TextEdit txt_zrType;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index 012eac3..8c1224e 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -1,4 +1,5 @@
-锘縰sing Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.DevFrm.Work;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -79,8 +80,10 @@
};
frm.ShowDialog();
};
+ // 璇诲彇缂洪櫡绛夌骇
+ getRptDefectLevel();
}
-
+
/// <summary>
/// 鎵归噺褰曞叆
/// </summary>
@@ -500,8 +503,38 @@
fmanageNo = _txt_fmanageNo,//娴佺▼缂栧彿
lotNo1 = _txt_lotNo1,//閫佹鎵瑰彿
lotNo = _txt_lotNo,//鐢熶骇宸ュ崟
- edtType = 0
+ edtType = 0,
+ list = new List<dynamic>(),
};
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ for (var i = 0; i < gvMx1.DataRowCount; i++)
+ {
+ var row = gvMx1.GetDataRow(i);
+ if (row != null)
+ {
+ Guid _guid = UtilityHelper.ToGuid(row["guid"].ToString());
+ string defectLevel = row["defectLevel"].ToString();
+ string defectDetails = row["defectDetails"].ToString();
+ if (string.IsNullOrEmpty(defectLevel))
+ {
+ MsgHelper.ShowError("璇烽�夋嫨缂洪櫡绛夌骇锛�");
+ return;
+ }
+ if (string.IsNullOrEmpty(defectDetails))
+ {
+ MsgHelper.ShowError("璇峰～鍐欑己闄锋弿杩帮紒");
+ return;
+ }
+ _obj.list.Add(new
+ {
+ guid5 = _guid,
+ defectLevel = defectLevel,
+ defectDetails = defectDetails,
+ });
+ }
+ }
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
@@ -516,7 +549,7 @@
this.setEable(false);
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
- getModel(lbGuid.Text,"0");
+ getModel(lbGuid.Text, "0");
}
}
catch (Exception ex)
@@ -685,12 +718,66 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+
private void setEable(bool bl)
{
txtJianYan.ReadOnly = !bl;
btnLoad.Enabled = bl;
btnIpt.Text = (bl == true ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰");
}
+
+
+ /// <summary>
+ /// 璇诲彇缂洪櫡绛夌骇
+ /// </summary>
+ /// <param name="curPage"></param>
+ private void getRptDefectLevel()
+ {
+ string _where = " and 1=1 and s_type='缂洪櫡绛夌骇'";
+ var pgq = new PageQueryModel(1, 999999, "a.defect_code", "asc", "", _where);
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "MesDefectCodeManager/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = dd.rtnData.list;
+ foreach (DataRow dr in dt.Rows)
+ {
+ rptDefectLevel.Items.Add(dr["defectName"].ToString());
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ /// 閫夋嫨缂洪櫡鎻忚堪
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptDefectDetails_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ UcDictionarySelect frm = new UcDictionarySelect("缂洪櫡鎻忚堪", " s_type='FQC缂洪櫡鎻忚堪'");
+ frm.UpdateParent += (ss, ee) =>
+ {
+ System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
+ var lst = ee.DynamicList;
+ foreach (dynamic dym in lst)
+ {
+ if (stringBuilder.Length > 0)
+ stringBuilder.Append("|");
+ stringBuilder.Append(dym.dicTxt);
+ }
+ gvMx1.SetFocusedRowCellValue("defectDetails", stringBuilder.ToString());
+ // this.TextTxt = ;
+ };
+ frm.ShowDialog();
+ }
+
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
index 51c34ac..5b383cb 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
@@ -41,6 +41,7 @@
DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -50,6 +51,8 @@
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_fsubmit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -59,7 +62,6 @@
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fbatchQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -113,7 +115,6 @@
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -192,7 +193,9 @@
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.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.txt_zrType = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -245,7 +248,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
@@ -305,6 +307,9 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
this.SuspendLayout();
//
// repositoryItemComboBox1
@@ -451,6 +456,29 @@
this.gv_releaseNo.VisibleIndex = 1;
this.gv_releaseNo.Width = 100;
//
+ // gv_fcheckResu
+ //
+ this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
+ this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
+ this.gv_fcheckResu.FieldName = "fcheckResu";
+ this.gv_fcheckResu.MinWidth = 30;
+ this.gv_fcheckResu.Name = "gv_fcheckResu";
+ this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
+ this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
+ this.gv_fcheckResu.Visible = true;
+ this.gv_fcheckResu.VisibleIndex = 2;
+ this.gv_fcheckResu.Width = 50;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鍒ゅ畾缁撴灉";
+ this.gridColumn5.FieldName = "freceQty";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 3;
+ this.gridColumn5.Width = 94;
+ //
// gv_lotNo
//
this.gv_lotNo.AppearanceCell.Options.UseFont = true;
@@ -563,19 +591,6 @@
this.gv_fbatchQty.Visible = true;
this.gv_fbatchQty.VisibleIndex = 12;
this.gv_fbatchQty.Width = 80;
- //
- // gv_fcheckResu
- //
- this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
- this.gv_fcheckResu.FieldName = "fcheckResu";
- this.gv_fcheckResu.MinWidth = 30;
- this.gv_fcheckResu.Name = "gv_fcheckResu";
- this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
- this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
- this.gv_fcheckResu.Visible = true;
- this.gv_fcheckResu.VisibleIndex = 2;
- this.gv_fcheckResu.Width = 50;
//
// gv_remarks
//
@@ -794,6 +809,7 @@
this.layoutMx1.Controls.Add(this.txt_suppId);
this.layoutMx1.Controls.Add(this.txt_fngHandle);
this.layoutMx1.Controls.Add(this.txt_freceQty);
+ this.layoutMx1.Controls.Add(this.txt_zrType);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem17,
@@ -809,9 +825,9 @@
// txt_msg
//
this.txt_msg.BtnTxt = "杩濊绫诲埆";
- this.txt_msg.Location = new System.Drawing.Point(672, 208);
+ this.txt_msg.Location = new System.Drawing.Point(672, 186);
this.txt_msg.Name = "txt_msg";
- this.txt_msg.Size = new System.Drawing.Size(326, 62);
+ this.txt_msg.Size = new System.Drawing.Size(326, 56);
this.txt_msg.TabIndex = 814;
this.txt_msg.TextTxt = "";
this.txt_msg.WhereTxt = null;
@@ -819,7 +835,7 @@
// txt_fmrmode
//
this.txt_fmrmode.IsReadly = false;
- this.txt_fmrmode.Location = new System.Drawing.Point(1074, 241);
+ this.txt_fmrmode.Location = new System.Drawing.Point(1074, 215);
this.txt_fmrmode.Margin = new System.Windows.Forms.Padding(0);
this.txt_fmrmode.Name = "txt_fmrmode";
this.txt_fmrmode.Size = new System.Drawing.Size(256, 24);
@@ -829,7 +845,7 @@
// txt_fzrId
//
this.txt_fzrId.IsReadly = false;
- this.txt_fzrId.Location = new System.Drawing.Point(1074, 175);
+ this.txt_fzrId.Location = new System.Drawing.Point(1074, 157);
this.txt_fzrId.Name = "txt_fzrId";
this.txt_fzrId.Size = new System.Drawing.Size(256, 24);
this.txt_fzrId.TabIndex = 812;
@@ -845,7 +861,7 @@
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(84, 241);
+ this.txt_remarks.Location = new System.Drawing.Point(84, 215);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
this.txt_remarks.Size = new System.Drawing.Size(584, 24);
@@ -855,7 +871,7 @@
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(414, 142);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(414, 128);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
this.txt_fcheckResu.StyleController = this.layoutMx1;
@@ -864,7 +880,7 @@
//
// txt_releaseNo
//
- this.txt_releaseNo.Location = new System.Drawing.Point(84, 43);
+ this.txt_releaseNo.Location = new System.Drawing.Point(84, 41);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
this.txt_releaseNo.Size = new System.Drawing.Size(254, 24);
@@ -874,7 +890,7 @@
//
// txt_fcheckDate
//
- this.txt_fcheckDate.Location = new System.Drawing.Point(414, 43);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(414, 41);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24);
@@ -884,7 +900,7 @@
//
// txt_lotNo1
//
- this.txt_lotNo1.Location = new System.Drawing.Point(744, 76);
+ this.txt_lotNo1.Location = new System.Drawing.Point(744, 70);
this.txt_lotNo1.Name = "txt_lotNo1";
this.txt_lotNo1.Properties.Appearance.Options.UseFont = true;
this.txt_lotNo1.Size = new System.Drawing.Size(254, 24);
@@ -894,7 +910,7 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(84, 142);
+ this.txt_itemNo.Location = new System.Drawing.Point(84, 128);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
@@ -904,7 +920,7 @@
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(84, 208);
+ this.txt_itemModel.Location = new System.Drawing.Point(84, 186);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
@@ -913,7 +929,7 @@
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(414, 76);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(414, 70);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24);
@@ -933,7 +949,7 @@
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 43);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 41);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
@@ -951,7 +967,7 @@
//
// txt_fsubmit
//
- this.txt_fsubmit.Location = new System.Drawing.Point(1002, 76);
+ this.txt_fsubmit.Location = new System.Drawing.Point(1002, 70);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
@@ -961,7 +977,7 @@
//
// txt_fmanageNo
//
- this.txt_fmanageNo.Location = new System.Drawing.Point(414, 208);
+ this.txt_fmanageNo.Location = new System.Drawing.Point(414, 186);
this.txt_fmanageNo.Name = "txt_fmanageNo";
this.txt_fmanageNo.Size = new System.Drawing.Size(254, 24);
this.txt_fmanageNo.StyleController = this.layoutMx1;
@@ -1004,7 +1020,7 @@
//
// txt_lotNo
//
- this.txt_lotNo.Location = new System.Drawing.Point(414, 175);
+ this.txt_lotNo.Location = new System.Drawing.Point(414, 157);
this.txt_lotNo.Name = "txt_lotNo";
this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
this.txt_lotNo.StyleController = this.layoutMx1;
@@ -1013,7 +1029,7 @@
//
// txt_workNo
//
- this.txt_workNo.Location = new System.Drawing.Point(1074, 208);
+ this.txt_workNo.Location = new System.Drawing.Point(1074, 186);
this.txt_workNo.Name = "txt_workNo";
this.txt_workNo.Size = new System.Drawing.Size(256, 24);
this.txt_workNo.StyleController = this.layoutMx1;
@@ -1021,7 +1037,7 @@
//
// txt_states
//
- this.txt_states.Location = new System.Drawing.Point(414, 109);
+ this.txt_states.Location = new System.Drawing.Point(414, 99);
this.txt_states.Name = "txt_states";
this.txt_states.Size = new System.Drawing.Size(254, 24);
this.txt_states.StyleController = this.layoutMx1;
@@ -1030,7 +1046,7 @@
//
// txt_epTag
//
- this.txt_epTag.Location = new System.Drawing.Point(744, 109);
+ this.txt_epTag.Location = new System.Drawing.Point(744, 99);
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)});
@@ -1041,7 +1057,7 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(744, 175);
+ this.txt_createBy.Location = new System.Drawing.Point(744, 157);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Size = new System.Drawing.Size(254, 24);
this.txt_createBy.StyleController = this.layoutMx1;
@@ -1050,7 +1066,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(744, 142);
+ this.txt_createDate.Location = new System.Drawing.Point(744, 128);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Size = new System.Drawing.Size(254, 24);
this.txt_createDate.StyleController = this.layoutMx1;
@@ -1059,7 +1075,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(84, 175);
+ this.txt_itemName.Location = new System.Drawing.Point(84, 157);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Size = new System.Drawing.Size(254, 24);
this.txt_itemName.StyleController = this.layoutMx1;
@@ -1068,7 +1084,7 @@
//
// txt_lineId
//
- this.txt_lineId.Location = new System.Drawing.Point(84, 76);
+ this.txt_lineId.Location = new System.Drawing.Point(84, 70);
this.txt_lineId.Name = "txt_lineId";
this.txt_lineId.Size = new System.Drawing.Size(254, 24);
this.txt_lineId.StyleController = this.layoutMx1;
@@ -1077,7 +1093,7 @@
//
// txt_itemId
//
- this.txt_itemId.Location = new System.Drawing.Point(84, 109);
+ this.txt_itemId.Location = new System.Drawing.Point(84, 99);
this.txt_itemId.Name = "txt_itemId";
this.txt_itemId.Size = new System.Drawing.Size(254, 24);
this.txt_itemId.StyleController = this.layoutMx1;
@@ -1086,7 +1102,7 @@
//
// txt_suppId
//
- this.txt_suppId.Location = new System.Drawing.Point(744, 43);
+ this.txt_suppId.Location = new System.Drawing.Point(744, 41);
this.txt_suppId.Name = "txt_suppId";
this.txt_suppId.Size = new System.Drawing.Size(254, 24);
this.txt_suppId.StyleController = this.layoutMx1;
@@ -1096,7 +1112,7 @@
// txt_fngHandle
//
this.txt_fngHandle.EditValue = "-璇烽�夋嫨-";
- this.txt_fngHandle.Location = new System.Drawing.Point(1074, 142);
+ this.txt_fngHandle.Location = new System.Drawing.Point(1074, 128);
this.txt_fngHandle.Name = "txt_fngHandle";
this.txt_fngHandle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1113,7 +1129,7 @@
// txt_freceQty
//
this.txt_freceQty.EditValue = "-璇烽�夋嫨-";
- this.txt_freceQty.Location = new System.Drawing.Point(1074, 109);
+ this.txt_freceQty.Location = new System.Drawing.Point(1074, 99);
this.txt_freceQty.Name = "txt_freceQty";
this.txt_freceQty.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1155,7 +1171,6 @@
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
- this.layoutControlItem23,
this.layoutControlItem8,
this.layoutControlItem2,
this.layoutControlItem9,
@@ -1183,7 +1198,9 @@
this.layoutControlItem13,
this.layoutControlItem11,
this.layoutControlItem25,
- this.layoutControlItem12});
+ this.layoutControlItem12,
+ this.layoutControlItem35,
+ this.layoutControlItem23});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1215,6 +1232,8 @@
rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition8.Height = 100D;
rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 28D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.AutoSize;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
@@ -1223,48 +1242,40 @@
rowDefinition5,
rowDefinition6,
rowDefinition7,
- rowDefinition8});
+ rowDefinition8,
+ rowDefinition9});
this.Root.Size = new System.Drawing.Size(1342, 282);
this.Root.TextVisible = false;
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_releaseNo;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 29);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem1.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem23
- //
- this.layoutControlItem23.Control = this.txt_djType;
- this.layoutControlItem23.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem23.Name = "layoutControlItem23";
- this.layoutControlItem23.Size = new System.Drawing.Size(330, 31);
- this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fcheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(330, 64);
+ this.layoutControlItem8.Location = new System.Drawing.Point(330, 58);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem8.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fcheckDate;
- this.layoutControlItem2.Location = new System.Drawing.Point(330, 31);
+ this.layoutControlItem2.Location = new System.Drawing.Point(330, 29);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem2.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1274,18 +1285,18 @@
this.layoutControlItem9.Location = new System.Drawing.Point(330, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem9.Text = "鎶芥鏁伴噺";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_lotNo1;
- this.layoutControlItem3.Location = new System.Drawing.Point(660, 64);
+ this.layoutControlItem3.Location = new System.Drawing.Point(660, 58);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem3.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem3.Text = "閫佹鎵瑰彿";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1295,51 +1306,51 @@
this.layoutControlItem22.Location = new System.Drawing.Point(660, 0);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem22.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem22.Text = "瀹㈡埛璁㈠崟";
this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
//
// txt_epTagtxt
//
this.txt_epTagtxt.Control = this.txt_epTag;
- this.txt_epTagtxt.Location = new System.Drawing.Point(660, 97);
+ this.txt_epTagtxt.Location = new System.Drawing.Point(660, 87);
this.txt_epTagtxt.Name = "txt_epTagtxt";
this.txt_epTagtxt.OptionsTableLayoutItem.ColumnIndex = 2;
this.txt_epTagtxt.OptionsTableLayoutItem.RowIndex = 3;
- this.txt_epTagtxt.Size = new System.Drawing.Size(330, 33);
+ this.txt_epTagtxt.Size = new System.Drawing.Size(330, 29);
this.txt_epTagtxt.Text = "鐜繚鏍囪瘑";
this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(330, 130);
+ this.layoutControlItem10.Location = new System.Drawing.Point(330, 116);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem10.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem10.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_states;
- this.layoutControlItem32.Location = new System.Drawing.Point(330, 97);
+ this.layoutControlItem32.Location = new System.Drawing.Point(330, 87);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem32.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem32.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem29
//
this.layoutControlItem29.Control = this.txt_workNo;
- this.layoutControlItem29.Location = new System.Drawing.Point(990, 196);
+ this.layoutControlItem29.Location = new System.Drawing.Point(990, 174);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem29.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem29.Size = new System.Drawing.Size(332, 29);
this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1347,10 +1358,10 @@
//
this.layoutControlItem5.Control = this.txt_itemNo;
this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 130);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 116);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem5.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem5.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1358,85 +1369,85 @@
//
this.layoutControlItem6.Control = this.txt_itemModel;
this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 196);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 174);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem6.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem6.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_itemName;
- this.layoutControlItem34.Location = new System.Drawing.Point(0, 163);
+ this.layoutControlItem34.Location = new System.Drawing.Point(0, 145);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem34.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem34.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem34.Text = "浜у搧鍚嶇О";
this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_lineId;
- this.layoutControlItem7.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem7.Location = new System.Drawing.Point(0, 58);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem7.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem7.Text = "鐢熶骇绾垮埆";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// txt_itemId11111
//
this.txt_itemId11111.Control = this.txt_itemId;
- this.txt_itemId11111.Location = new System.Drawing.Point(0, 97);
+ this.txt_itemId11111.Location = new System.Drawing.Point(0, 87);
this.txt_itemId11111.Name = "txt_itemId11111";
this.txt_itemId11111.OptionsTableLayoutItem.RowIndex = 3;
- this.txt_itemId11111.Size = new System.Drawing.Size(330, 33);
+ this.txt_itemId11111.Size = new System.Drawing.Size(330, 29);
this.txt_itemId11111.Text = "鐗╂枡ID";
this.txt_itemId11111.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_fmanageNo;
- this.layoutControlItem18.Location = new System.Drawing.Point(330, 196);
+ this.layoutControlItem18.Location = new System.Drawing.Point(330, 174);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem18.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem18.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem18.Text = "娴佺▼缂栧彿";
this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_lotNo;
- this.layoutControlItem28.Location = new System.Drawing.Point(330, 163);
+ this.layoutControlItem28.Location = new System.Drawing.Point(330, 145);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem28.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem28.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem28.Text = "鐢熶骇宸ュ崟";
this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_suppId;
- this.layoutControlItem4.Location = new System.Drawing.Point(660, 31);
+ this.layoutControlItem4.Location = new System.Drawing.Point(660, 29);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem4.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem4.Text = "瀹㈡埛鍚嶇О";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_msg;
- this.layoutControlItem27.Location = new System.Drawing.Point(660, 196);
+ this.layoutControlItem27.Location = new System.Drawing.Point(660, 174);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem27.Size = new System.Drawing.Size(330, 66);
+ this.layoutControlItem27.Size = new System.Drawing.Size(330, 60);
this.layoutControlItem27.Text = "杩濊绫诲埆";
this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem27.TextVisible = false;
@@ -1444,22 +1455,22 @@
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_fmrmode;
- this.layoutControlItem26.Location = new System.Drawing.Point(990, 229);
+ this.layoutControlItem26.Location = new System.Drawing.Point(990, 203);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem26.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem26.Size = new System.Drawing.Size(332, 31);
this.layoutControlItem26.Text = "杩斿伐宸ュ簭";
this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem33
//
this.layoutControlItem33.Control = this.txt_createDate;
- this.layoutControlItem33.Location = new System.Drawing.Point(660, 130);
+ this.layoutControlItem33.Location = new System.Drawing.Point(660, 116);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem33.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem33.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1467,11 +1478,11 @@
//
this.layoutControlItem31.Control = this.txt_createBy;
this.layoutControlItem31.CustomizationFormText = "鍒涘缓浜哄憳";
- this.layoutControlItem31.Location = new System.Drawing.Point(660, 163);
+ this.layoutControlItem31.Location = new System.Drawing.Point(660, 145);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem31.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem31.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1482,29 +1493,29 @@
this.layoutControlItem16.Location = new System.Drawing.Point(990, 0);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(332, 31);
+ this.layoutControlItem16.Size = new System.Drawing.Size(332, 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(990, 31);
+ this.layoutControlItem15.Location = new System.Drawing.Point(990, 29);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem15.Size = new System.Drawing.Size(332, 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(990, 64);
+ this.layoutControlItem14.Location = new System.Drawing.Point(990, 58);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem14.Size = new System.Drawing.Size(332, 29);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1512,11 +1523,11 @@
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_freceQty;
- this.layoutControlItem13.Location = new System.Drawing.Point(990, 97);
+ this.layoutControlItem13.Location = new System.Drawing.Point(990, 87);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem13.Size = new System.Drawing.Size(332, 29);
this.layoutControlItem13.Text = "鍒ゅ畾缁撴灉";
this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1524,33 +1535,33 @@
//
this.layoutControlItem11.Control = this.txt_fngHandle;
this.layoutControlItem11.CustomizationFormText = "澶勭疆缁撴灉";
- this.layoutControlItem11.Location = new System.Drawing.Point(990, 130);
+ this.layoutControlItem11.Location = new System.Drawing.Point(990, 116);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem11.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem11.Size = new System.Drawing.Size(332, 29);
this.layoutControlItem11.Text = "澶勭疆缁撴灉";
this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_fzrId;
- this.layoutControlItem25.Location = new System.Drawing.Point(990, 163);
+ this.layoutControlItem25.Location = new System.Drawing.Point(990, 145);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem25.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem25.Size = new System.Drawing.Size(332, 29);
this.layoutControlItem25.Text = "璐ｄ换浜�";
this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 229);
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 203);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem12.Size = new System.Drawing.Size(660, 33);
+ this.layoutControlItem12.Size = new System.Drawing.Size(660, 31);
this.layoutControlItem12.Text = "澶囨敞璇存槑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
@@ -2108,15 +2119,42 @@
//
this.gridView4.Name = "gridView4";
//
- // gridColumn5
+ // txt_zrType
//
- this.gridColumn5.Caption = "鍒ゅ畾缁撴灉";
- this.gridColumn5.FieldName = "freceQty";
- this.gridColumn5.MinWidth = 25;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 3;
- this.gridColumn5.Width = 94;
+ this.txt_zrType.EditValue = "1:鐢熶骇璐ｄ换";
+ this.txt_zrType.Location = new System.Drawing.Point(744, 246);
+ 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)});
+ this.txt_zrType.Properties.Items.AddRange(new object[] {
+ "1:鐢熶骇璐ｄ换",
+ "2:闈炵敓浜ц矗浠�"});
+ this.txt_zrType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_zrType.Size = new System.Drawing.Size(254, 24);
+ this.txt_zrType.StyleController = this.layoutMx1;
+ this.txt_zrType.TabIndex = 829;
+ //
+ // layoutControlItem35
+ //
+ this.layoutControlItem35.Control = this.txt_zrType;
+ this.layoutControlItem35.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem35.CustomizationFormText = "璐ｄ换鍒ゅ畾";
+ this.layoutControlItem35.Location = new System.Drawing.Point(660, 234);
+ this.layoutControlItem35.Name = "layoutControlItem35";
+ this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem35.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem35.Text = "璐ｄ换鍒ゅ畾";
+ this.layoutControlItem35.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.txt_djType;
+ this.layoutControlItem23.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.Size = new System.Drawing.Size(330, 29);
+ this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷";
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
//
// Frm_FqcDetect01Check
//
@@ -2180,7 +2218,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
@@ -2240,6 +2277,9 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
this.ResumeLayout(false);
}
@@ -2352,7 +2392,6 @@
private DevExpress.XtraEditors.TextEdit txt_lotNo;
private DevExpress.XtraEditors.TextEdit txt_workNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
@@ -2396,5 +2435,8 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_zrType;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
index d57dee4..21834e9 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
@@ -166,7 +166,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var pgq = new PageQueryModel(1, 999999, "a.defect_name");
+ var pgq = new PageQueryModel(1, 999999, "a.defect_code ", "asc");
var json = JsonConvert.SerializeObject(pgq);
try
{
--
Gitblit v1.9.3