From 13119fa78167af87f5743cb71bc06c65acc58fdb Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 09 四月 2025 11:26:46 +0800
Subject: [PATCH] fqc
---
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs | 15 ++
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs | 173 +++++++++++++++++-----------------
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs | 58 ++++++-----
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 40 ++++---
4 files changed, 155 insertions(+), 131 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
index 14b0d1d..97de430 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -119,6 +119,7 @@
this.txt_fzrIdTxt = new DevExpress.XtraEditors.TextEdit();
this.txt_mrmodeTxt = new DevExpress.XtraEditors.TextEdit();
this.txt_freceQty = new DevExpress.XtraEditors.TextEdit();
+ this.txt_zrType = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -152,6 +153,7 @@
this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -215,8 +217,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.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();
@@ -265,6 +265,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fzrIdTxt.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -298,6 +299,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -340,8 +342,6 @@
((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
@@ -1178,6 +1178,14 @@
this.txt_freceQty.TabIndex = 828;
this.txt_freceQty.Tag = "readonly";
//
+ // 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;
+ //
// layoutControlItem17
//
this.layoutControlItem17.Control = this.lbGuid;
@@ -1608,6 +1616,17 @@
this.layoutControlItem12.Text = "澶囨敞璇存槑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
+ // 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);
+ //
// xtraTabControl2
//
this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1901,6 +1920,10 @@
//
// gridColumn9
//
+ this.gridColumn9.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn9.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn9.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn9.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn9.Caption = "缂洪櫡绛夌骇";
this.gridColumn9.ColumnEdit = this.rptDefectLevel;
this.gridColumn9.FieldName = "defectLevel";
@@ -1922,6 +1945,10 @@
//
// gridColumn10
//
+ this.gridColumn10.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn10.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn10.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn10.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn10.Caption = "缂洪櫡鎻忚堪";
this.gridColumn10.ColumnEdit = this.rptDefectDetails;
this.gridColumn10.FieldName = "defectDetails";
@@ -2334,25 +2361,6 @@
//
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
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2411,6 +2419,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fzrIdTxt.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -2444,6 +2453,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2486,8 +2496,6 @@
((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);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index 8c1224e..fc5edf2 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -515,24 +515,28 @@
if (row != null)
{
Guid _guid = UtilityHelper.ToGuid(row["guid"].ToString());
- string defectLevel = row["defectLevel"].ToString();
- string defectDetails = row["defectDetails"].ToString();
- if (string.IsNullOrEmpty(defectLevel))
+ string _defectLevel = row["defectLevel"].ToString();
+ string _defectDetails = row["defectDetails"].ToString();
+ string _fcheckResu = row["fcheckResu"].ToString();
+ if (_fcheckResu == "涓嶅悎鏍�")
{
- MsgHelper.ShowError("璇烽�夋嫨缂洪櫡绛夌骇锛�");
- return;
+ if (string.IsNullOrEmpty(_defectLevel))
+ {
+ MsgHelper.ShowError("璇烽�夋嫨缂洪櫡绛夌骇锛�");
+ return;
+ }
+ if (string.IsNullOrEmpty(_defectDetails))
+ {
+ MsgHelper.ShowError("璇峰～鍐欑己闄锋弿杩帮紒");
+ return;
+ }
+ _obj.list.Add(new
+ {
+ guid5 = _guid,
+ defectLevel = _defectLevel,
+ defectDetails = _defectDetails,
+ });
}
- if (string.IsNullOrEmpty(defectDetails))
- {
- MsgHelper.ShowError("璇峰～鍐欑己闄锋弿杩帮紒");
- return;
- }
- _obj.list.Add(new
- {
- guid5 = _guid,
- defectLevel = defectLevel,
- defectDetails = defectDetails,
- });
}
}
try
@@ -777,7 +781,7 @@
};
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 5b383cb..9fbfbdf 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
@@ -111,6 +111,7 @@
this.txt_suppId = new DevExpress.XtraEditors.TextEdit();
this.txt_fngHandle = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_freceQty = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_zrType = new DevExpress.XtraEditors.ComboBoxEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -123,7 +124,6 @@
this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -133,7 +133,6 @@
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -141,8 +140,8 @@
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -193,9 +192,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_zrType = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
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();
@@ -244,6 +244,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -256,7 +257,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
@@ -266,7 +266,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
@@ -274,8 +273,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -307,9 +306,10 @@
((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.layoutControlItem26)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
this.SuspendLayout();
//
// repositoryItemComboBox1
@@ -835,7 +835,7 @@
// txt_fmrmode
//
this.txt_fmrmode.IsReadly = false;
- this.txt_fmrmode.Location = new System.Drawing.Point(1074, 215);
+ this.txt_fmrmode.Location = new System.Drawing.Point(1074, 246);
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);
@@ -845,7 +845,7 @@
// txt_fzrId
//
this.txt_fzrId.IsReadly = false;
- this.txt_fzrId.Location = new System.Drawing.Point(1074, 157);
+ this.txt_fzrId.Location = new System.Drawing.Point(1074, 186);
this.txt_fzrId.Name = "txt_fzrId";
this.txt_fzrId.Size = new System.Drawing.Size(256, 24);
this.txt_fzrId.TabIndex = 812;
@@ -1029,7 +1029,7 @@
//
// txt_workNo
//
- this.txt_workNo.Location = new System.Drawing.Point(1074, 186);
+ this.txt_workNo.Location = new System.Drawing.Point(1074, 215);
this.txt_workNo.Name = "txt_workNo";
this.txt_workNo.Size = new System.Drawing.Size(256, 24);
this.txt_workNo.StyleController = this.layoutMx1;
@@ -1142,6 +1142,22 @@
this.txt_freceQty.StyleController = this.layoutMx1;
this.txt_freceQty.TabIndex = 830;
//
+ // txt_zrType
+ //
+ this.txt_zrType.EditValue = "-璇烽�夋嫨-";
+ this.txt_zrType.Location = new System.Drawing.Point(1074, 157);
+ 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(256, 24);
+ this.txt_zrType.StyleController = this.layoutMx1;
+ this.txt_zrType.TabIndex = 829;
+ //
// layoutControlItem17
//
this.layoutControlItem17.Control = this.lbGuid;
@@ -1179,7 +1195,6 @@
this.txt_epTagtxt,
this.layoutControlItem10,
this.layoutControlItem32,
- this.layoutControlItem29,
this.layoutControlItem5,
this.layoutControlItem6,
this.layoutControlItem34,
@@ -1189,7 +1204,6 @@
this.layoutControlItem28,
this.layoutControlItem4,
this.layoutControlItem27,
- this.layoutControlItem26,
this.layoutControlItem33,
this.layoutControlItem31,
this.layoutControlItem16,
@@ -1197,10 +1211,12 @@
this.layoutControlItem14,
this.layoutControlItem13,
this.layoutControlItem11,
- this.layoutControlItem25,
this.layoutControlItem12,
- this.layoutControlItem35,
- this.layoutControlItem23});
+ this.layoutControlItem23,
+ this.layoutControlItem26,
+ this.layoutControlItem29,
+ this.layoutControlItem25,
+ this.layoutControlItem35});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1343,17 +1359,6 @@
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, 174);
- this.layoutControlItem29.Name = "layoutControlItem29";
- this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem29.Size = new System.Drawing.Size(332, 29);
- this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
- this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
- //
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo;
@@ -1452,17 +1457,6 @@
this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem27.TextVisible = false;
//
- // layoutControlItem26
- //
- this.layoutControlItem26.Control = this.txt_fmrmode;
- 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, 31);
- this.layoutControlItem26.Text = "杩斿伐宸ュ簭";
- this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
- //
// layoutControlItem33
//
this.layoutControlItem33.Control = this.txt_createDate;
@@ -1543,17 +1537,6 @@
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, 145);
- this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5;
- 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;
@@ -1564,6 +1547,15 @@
this.layoutControlItem12.Size = new System.Drawing.Size(660, 31);
this.layoutControlItem12.Text = "澶囨敞璇存槑";
this.layoutControlItem12.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);
//
// xtraTabControl2
//
@@ -2119,42 +2111,51 @@
//
this.gridView4.Name = "gridView4";
//
- // txt_zrType
+ // layoutControlItem26
//
- 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;
+ this.layoutControlItem26.Control = this.txt_fmrmode;
+ this.layoutControlItem26.Location = new System.Drawing.Point(990, 234);
+ this.layoutControlItem26.Name = "layoutControlItem26";
+ this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem26.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem26.Text = "杩斿伐宸ュ簭";
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem29
+ //
+ this.layoutControlItem29.Control = this.txt_workNo;
+ this.layoutControlItem29.Location = new System.Drawing.Point(990, 203);
+ this.layoutControlItem29.Name = "layoutControlItem29";
+ this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem29.Size = new System.Drawing.Size(332, 31);
+ this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem25
+ //
+ this.layoutControlItem25.Control = this.txt_fzrId;
+ this.layoutControlItem25.Location = new System.Drawing.Point(990, 174);
+ this.layoutControlItem25.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem25.Size = new System.Drawing.Size(332, 29);
+ this.layoutControlItem25.Text = "璐ｄ换浜�";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
//
// 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.Location = new System.Drawing.Point(990, 145);
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.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem35.Size = new System.Drawing.Size(332, 29);
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
//
@@ -2214,6 +2215,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -2226,7 +2228,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
@@ -2236,7 +2237,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
@@ -2244,8 +2244,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2277,9 +2277,10 @@
((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.layoutControlItem26)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
this.ResumeLayout(false);
}
@@ -2404,7 +2405,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraEditors.TextEdit txt_itemName;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
@@ -2424,7 +2424,6 @@
private DevExpress.XtraEditors.ComboBoxEdit txt_fngHandle;
private DevExpress.XtraEditors.ComboBoxEdit txt_freceQty;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
@@ -2432,11 +2431,13 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- 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;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
index b1c51d0..54ac72d 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
@@ -6,6 +6,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.Runtime.InteropServices;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -233,6 +234,7 @@
string _txt_fzrId = txt_fzrId.GetId();
string _txt_workNo = txt_workNo.Text.Trim();
string _txt_msg = txt_msg.TextTxt;
+ string _txt_zrType=txt_zrType.Text.Trim();
if (txt_freceQty.SelectedIndex <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍒ゅ畾缁撴灉锛�");
@@ -248,6 +250,14 @@
txt_fngHandle.Focus();
return;
}
+
+ if (txt_zrType.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐ｄ换鍒ゅ畾锛�");
+ txt_zrType.Focus();
+ return;
+ }
+
//褰撳缃粨鏋滀负鍙嶅伐鏃讹紝瑕侀�夋嫨宸ュ簭鍜屽弽宸ョ紪鍙�
if (txt_fngHandle.SelectedIndex == 1)
{
@@ -267,9 +277,9 @@
}
//褰撲负鍚堟牸鏃讹紝灏变笉搴旇閫夋嫨鍏跺畠椤圭洰浜�
else {
- if ((_txt_fngHandle.Length + _txt_fmrmode.Length + _txt_fzrId.Length + _txt_workNo.Length) > 0)
+ if ((_txt_fngHandle.Length + _txt_fmrmode.Length + _txt_fzrId.Length + _txt_workNo.Length) > 0 || txt_zrType.SelectedIndex>0)
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("褰撳垽瀹氱粨鏋滀负鍚堟牸鏃讹紝灏变笉搴旇閫夋嫨鍏跺畠椤圭洰浜嗭紒锛�");
+ Gs.DevApp.ToolBox.MsgHelper.Warning("褰撳垽瀹氱粨鏋滀负鍚堟牸鏃讹紝灏变笉搴旇閫夋嫨鍏跺畠椤圭洰浜嗭紒");
txt_freceQty.Focus();
return;
}
@@ -284,6 +294,7 @@
workNo = _txt_workNo,
fmrmode = _txt_fmrmode,
msg = _txt_msg,
+ zrType= _txt_zrType,
edtType = 1
};
try
--
Gitblit v1.9.3