From f0ccfe6d323784333b7c08835b52a97c5233cfe2 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 08 四月 2025 16:31:55 +0800
Subject: [PATCH] fqc
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx | 2
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs | 68 -
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs | 421 ++++++++--------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 532 ++++++++++---------
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs | 434 ++++++++-------
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 61 +-
7 files changed, 778 insertions(+), 744 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 09d6be2..2d4703e 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
index 7abef8e..cd5f857 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -89,7 +89,7 @@
this.txt_msg = new Gs.DevApp.UserControl.UcDictionary();
this.txt_suppId = new Gs.DevApp.UserControl.UcLookCustomer();
this.lbGuid = new System.Windows.Forms.Label();
- this.txt_fsecondResu = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fngHandle = new DevExpress.XtraEditors.TextEdit();
this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
this.txt_fcheckResu = new DevExpress.XtraEditors.TextEdit();
this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit();
@@ -107,14 +107,15 @@
this.txt_lifnr = new DevExpress.XtraEditors.TextEdit();
this.txt_djType = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_lotNo2 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
this.textEdit5 = new DevExpress.XtraEditors.TextEdit();
this.txt_epTag = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
this.txt_fzrId = new DevExpress.XtraEditors.TextEdit();
- this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fmrmode = new DevExpress.XtraEditors.TextEdit();
+ this.txt_freceQty = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -123,30 +124,31 @@
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -227,7 +229,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsecondResu.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).BeginInit();
@@ -245,14 +247,15 @@
((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_djType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_epTag.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fzrId.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -261,30 +264,31 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -815,7 +819,7 @@
this.layoutMx1.Controls.Add(this.txt_msg);
this.layoutMx1.Controls.Add(this.txt_suppId);
this.layoutMx1.Controls.Add(this.lbGuid);
- this.layoutMx1.Controls.Add(this.txt_fsecondResu);
+ this.layoutMx1.Controls.Add(this.txt_fngHandle);
this.layoutMx1.Controls.Add(this.txt_remarks);
this.layoutMx1.Controls.Add(this.txt_fcheckResu);
this.layoutMx1.Controls.Add(this.txt_releaseNo);
@@ -833,21 +837,22 @@
this.layoutMx1.Controls.Add(this.txt_lifnr);
this.layoutMx1.Controls.Add(this.txt_djType);
this.layoutMx1.Controls.Add(this.txt_lotNo);
- this.layoutMx1.Controls.Add(this.txt_lotNo2);
+ this.layoutMx1.Controls.Add(this.txt_workNo);
this.layoutMx1.Controls.Add(this.textEdit5);
this.layoutMx1.Controls.Add(this.txt_epTag);
this.layoutMx1.Controls.Add(this.txt_createBy);
this.layoutMx1.Controls.Add(this.txt_createDate);
this.layoutMx1.Controls.Add(this.txt_itemName);
this.layoutMx1.Controls.Add(this.txt_fzrId);
- this.layoutMx1.Controls.Add(this.txt_workNo);
+ this.layoutMx1.Controls.Add(this.txt_fmrmode);
+ this.layoutMx1.Controls.Add(this.txt_freceQty);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem17,
this.layoutControlItem21});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(859, 421, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(613, 530, 812, 500);
this.layoutMx1.Root = this.Root;
this.layoutMx1.Size = new System.Drawing.Size(1342, 282);
this.layoutMx1.TabIndex = 0;
@@ -875,9 +880,9 @@
// txt_msg
//
this.txt_msg.BtnTxt = "杩濊绫诲埆";
- this.txt_msg.Location = new System.Drawing.Point(672, 175);
+ this.txt_msg.Location = new System.Drawing.Point(672, 208);
this.txt_msg.Name = "txt_msg";
- this.txt_msg.Size = new System.Drawing.Size(326, 95);
+ this.txt_msg.Size = new System.Drawing.Size(326, 62);
this.txt_msg.TabIndex = 814;
this.txt_msg.TextTxt = "";
this.txt_msg.WhereTxt = null;
@@ -899,14 +904,14 @@
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
- // txt_fsecondResu
+ // txt_fngHandle
//
- this.txt_fsecondResu.Location = new System.Drawing.Point(1074, 175);
- this.txt_fsecondResu.Name = "txt_fsecondResu";
- this.txt_fsecondResu.Size = new System.Drawing.Size(256, 24);
- this.txt_fsecondResu.StyleController = this.layoutMx1;
- this.txt_fsecondResu.TabIndex = 801;
- this.txt_fsecondResu.Tag = "readonly";
+ this.txt_fngHandle.Location = new System.Drawing.Point(1074, 142);
+ this.txt_fngHandle.Name = "txt_fngHandle";
+ this.txt_fngHandle.Size = new System.Drawing.Size(256, 24);
+ this.txt_fngHandle.StyleController = this.layoutMx1;
+ this.txt_fngHandle.TabIndex = 801;
+ this.txt_fngHandle.Tag = "readonly";
//
// txt_remarks
//
@@ -1004,7 +1009,7 @@
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 109);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 44);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
@@ -1013,7 +1018,7 @@
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 76);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 12);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
@@ -1022,7 +1027,7 @@
//
// txt_fsubmit
//
- this.txt_fsubmit.Location = new System.Drawing.Point(1002, 142);
+ this.txt_fsubmit.Location = new System.Drawing.Point(1002, 76);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
@@ -1080,14 +1085,14 @@
this.txt_lotNo.TabIndex = 815;
this.txt_lotNo.Tag = "readonly";
//
- // txt_lotNo2
+ // txt_workNo
//
- this.txt_lotNo2.Location = new System.Drawing.Point(1074, 241);
- this.txt_lotNo2.Name = "txt_lotNo2";
- this.txt_lotNo2.Size = new System.Drawing.Size(256, 24);
- this.txt_lotNo2.StyleController = this.layoutMx1;
- this.txt_lotNo2.TabIndex = 816;
- this.txt_lotNo2.Tag = "readonly";
+ this.txt_workNo.Location = new System.Drawing.Point(1074, 208);
+ this.txt_workNo.Name = "txt_workNo";
+ this.txt_workNo.Size = new System.Drawing.Size(256, 24);
+ this.txt_workNo.StyleController = this.layoutMx1;
+ this.txt_workNo.TabIndex = 816;
+ this.txt_workNo.Tag = "readonly";
//
// textEdit5
//
@@ -1110,18 +1115,18 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(1074, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(744, 142);
this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(256, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(254, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 822;
this.txt_createBy.Tag = "readonly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(1074, 44);
+ this.txt_createDate.Location = new System.Drawing.Point(744, 175);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(256, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(254, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 823;
this.txt_createDate.Tag = "readonly";
@@ -1137,21 +1142,30 @@
//
// txt_fzrId
//
- this.txt_fzrId.Location = new System.Drawing.Point(744, 142);
+ this.txt_fzrId.Location = new System.Drawing.Point(1074, 175);
this.txt_fzrId.Name = "txt_fzrId";
- this.txt_fzrId.Size = new System.Drawing.Size(254, 24);
+ this.txt_fzrId.Size = new System.Drawing.Size(256, 24);
this.txt_fzrId.StyleController = this.layoutMx1;
this.txt_fzrId.TabIndex = 826;
this.txt_fzrId.Tag = "readonly";
//
- // txt_workNo
+ // txt_fmrmode
//
- this.txt_workNo.Location = new System.Drawing.Point(1074, 208);
- this.txt_workNo.Name = "txt_workNo";
- this.txt_workNo.Size = new System.Drawing.Size(256, 24);
- this.txt_workNo.StyleController = this.layoutMx1;
- this.txt_workNo.TabIndex = 827;
- this.txt_workNo.Tag = "readonly";
+ this.txt_fmrmode.Location = new System.Drawing.Point(1074, 241);
+ this.txt_fmrmode.Name = "txt_fmrmode";
+ this.txt_fmrmode.Size = new System.Drawing.Size(256, 24);
+ this.txt_fmrmode.StyleController = this.layoutMx1;
+ this.txt_fmrmode.TabIndex = 827;
+ this.txt_fmrmode.Tag = "readonly";
+ //
+ // txt_freceQty
+ //
+ this.txt_freceQty.Location = new System.Drawing.Point(1074, 109);
+ this.txt_freceQty.Name = "txt_freceQty";
+ this.txt_freceQty.Size = new System.Drawing.Size(256, 24);
+ this.txt_freceQty.StyleController = this.layoutMx1;
+ this.txt_freceQty.TabIndex = 828;
+ this.txt_freceQty.Tag = "readonly";
//
// layoutControlItem17
//
@@ -1186,30 +1200,31 @@
this.layoutControlItem9,
this.layoutControlItem3,
this.layoutControlItem24,
- this.layoutControlItem27,
this.layoutControlItem22,
this.txt_epTagtxt,
- this.layoutControlItem12,
this.layoutControlItem5,
this.layoutControlItem30,
this.layoutControlItem4,
this.layoutControlItem6,
this.layoutControlItem34,
- this.layoutControlItem31,
- this.layoutControlItem33,
- this.layoutControlItem16,
- this.layoutControlItem15,
- this.layoutControlItem14,
- this.layoutControlItem29,
- this.layoutControlItem13,
this.layoutControlItem18,
this.layoutControlItem10,
this.layoutControlItem32,
this.layoutControlItem8,
this.layoutControlItem2,
this.layoutControlItem28,
+ this.layoutControlItem16,
+ this.layoutControlItem15,
+ this.layoutControlItem14,
+ this.layoutControlItem26,
+ this.layoutControlItem13,
this.layoutControlItem7,
- this.layoutControlItem25});
+ this.layoutControlItem25,
+ this.layoutControlItem29,
+ this.layoutControlItem31,
+ this.layoutControlItem33,
+ this.layoutControlItem27,
+ this.layoutControlItem12});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1304,19 +1319,6 @@
this.layoutControlItem24.Text = "瀹㈡埛缂栫爜";
this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem27
- //
- this.layoutControlItem27.Control = this.txt_msg;
- this.layoutControlItem27.Location = new System.Drawing.Point(660, 163);
- this.layoutControlItem27.Name = "layoutControlItem27";
- this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 3;
- this.layoutControlItem27.Size = new System.Drawing.Size(330, 99);
- this.layoutControlItem27.Text = "杩濊绫诲埆";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem27.TextVisible = false;
- //
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_lifnr;
@@ -1337,17 +1339,6 @@
this.txt_epTagtxt.Size = new System.Drawing.Size(330, 33);
this.txt_epTagtxt.Text = "鐜繚鏍囪瘑";
this.txt_epTagtxt.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.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem12.Size = new System.Drawing.Size(660, 33);
- this.layoutControlItem12.Text = "澶囨敞璇存槑";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
@@ -1400,83 +1391,6 @@
this.layoutControlItem34.Size = new System.Drawing.Size(330, 33);
this.layoutControlItem34.Text = "浜у搧鍚嶇О";
this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem31
- //
- this.layoutControlItem31.Control = this.txt_createBy;
- this.layoutControlItem31.Location = new System.Drawing.Point(990, 0);
- this.layoutControlItem31.Name = "layoutControlItem31";
- this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem31.Size = new System.Drawing.Size(332, 32);
- this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem33
- //
- this.layoutControlItem33.Control = this.txt_createDate;
- this.layoutControlItem33.Location = new System.Drawing.Point(990, 32);
- this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem33.Size = new System.Drawing.Size(332, 32);
- this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_fsubmitDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(990, 64);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(332, 33);
- 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, 97);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(332, 33);
- 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, 130);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem14.Size = new System.Drawing.Size(332, 33);
- this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem14.TextVisible = false;
- //
- // layoutControlItem29
- //
- this.layoutControlItem29.Control = this.txt_lotNo2;
- this.layoutControlItem29.Location = new System.Drawing.Point(990, 229);
- this.layoutControlItem29.Name = "layoutControlItem29";
- this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem29.Size = new System.Drawing.Size(332, 33);
- this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
- this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_fsecondResu;
- this.layoutControlItem13.Location = new System.Drawing.Point(990, 163);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem13.Size = new System.Drawing.Size(332, 33);
- this.layoutControlItem13.Text = "澶勭疆缁撴灉";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem18
//
@@ -1544,27 +1458,139 @@
this.layoutControlItem28.Text = "鐢熶骇宸ュ崟";
this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
//
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_fsubmitDate;
+ 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, 32);
+ 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, 32);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem15.Size = new System.Drawing.Size(332, 32);
+ 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.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem14.TextVisible = false;
+ //
+ // layoutControlItem26
+ //
+ this.layoutControlItem26.Control = this.txt_freceQty;
+ this.layoutControlItem26.Location = new System.Drawing.Point(990, 97);
+ 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.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.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem13.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem13.Text = "澶勭疆缁撴灉";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ //
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_fzrId;
- this.layoutControlItem7.Location = new System.Drawing.Point(660, 130);
+ this.layoutControlItem7.Location = new System.Drawing.Point(990, 163);
this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem7.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem7.Size = new System.Drawing.Size(332, 33);
this.layoutControlItem7.Text = "璐ｄ换浜哄憳";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem25
//
- this.layoutControlItem25.Control = this.txt_workNo;
- this.layoutControlItem25.Location = new System.Drawing.Point(990, 196);
+ this.layoutControlItem25.Control = this.txt_fmrmode;
+ this.layoutControlItem25.Location = new System.Drawing.Point(990, 229);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 7;
this.layoutControlItem25.Size = new System.Drawing.Size(332, 33);
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.Name = "layoutControlItem29";
+ this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem29.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem31
+ //
+ this.layoutControlItem31.Control = this.txt_createBy;
+ this.layoutControlItem31.Location = new System.Drawing.Point(660, 130);
+ this.layoutControlItem31.Name = "layoutControlItem31";
+ this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem31.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem33
+ //
+ this.layoutControlItem33.Control = this.txt_createDate;
+ this.layoutControlItem33.Location = new System.Drawing.Point(660, 163);
+ this.layoutControlItem33.Name = "layoutControlItem33";
+ this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem33.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
+ this.layoutControlItem33.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.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.Text = "杩濊绫诲埆";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem27.TextVisible = false;
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_remarks;
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 229);
+ 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.Text = "澶囨敞璇存槑";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
// xtraTabControl2
//
@@ -2296,7 +2322,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsecondResu.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).EndInit();
@@ -2314,14 +2340,15 @@
((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_djType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_epTag.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fzrId.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -2330,30 +2357,31 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2428,7 +2456,7 @@
private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
private DevExpress.XtraGrid.Views.Grid.GridView gridView4;
- private DevExpress.XtraEditors.TextEdit txt_fsecondResu;
+ private DevExpress.XtraEditors.TextEdit txt_fngHandle;
private DevExpress.XtraEditors.TextEdit txt_fcheckResu;
private DevExpress.XtraEditors.TextEdit txt_remarks;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
@@ -2513,13 +2541,12 @@
private UserControl.UcLookCustomer txt_suppId;
private UserControl.UcDictionary txt_msg;
private DevExpress.XtraEditors.TextEdit txt_lotNo;
- private DevExpress.XtraEditors.TextEdit txt_lotNo2;
+ private DevExpress.XtraEditors.TextEdit txt_workNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
private DevExpress.XtraEditors.TextEdit textEdit5;
private DevExpress.XtraEditors.ComboBoxEdit txt_epTag;
@@ -2527,7 +2554,6 @@
private UserControl.UcLookWorkline txt_lineId;
private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
private DevExpress.XtraEditors.ButtonEdit txt_itemId;
@@ -2535,18 +2561,11 @@
private DevExpress.XtraEditors.TextEdit txt_itemName;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private UserControl.UCUpFileList ucUpFileList1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.Utils.ToolTipController tips;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
@@ -2554,8 +2573,19 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
private DevExpress.XtraEditors.TextEdit txt_fzrId;
- private DevExpress.XtraEditors.TextEdit txt_workNo;
+ private DevExpress.XtraEditors.TextEdit txt_fmrmode;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraEditors.TextEdit txt_freceQty;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
}
}
\ 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 0337b88..7d1d737 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -270,7 +270,7 @@
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_releaseNo, gridView1, "lotNo");
+ lbGuid, txt_releaseNo, gridView1, "releaseNo");
toolBarMenu1.guidKey = rowGuid;
if (string.IsNullOrEmpty(rowGuid))
{
@@ -281,9 +281,9 @@
return;
if (txt_fcheckResu.Text.Trim() == "涓嶅悎鏍�")
{
- if (string.IsNullOrEmpty(txt_remarks.Text.Trim()))
+ if (string.IsNullOrEmpty(txt_msg.TextTxt.Trim()))
{
- MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄨ鏄庯紒");
+ MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃讹紝璇峰～鍐欒繚瑙勪俊鎭紒");
return;
}
};
@@ -445,21 +445,18 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- string _txt_djType = txt_djType.Text.Trim();
- string _txt_fbatchQty = txt_fbatchQty.Text.Trim();
- string _txt_lifnr = txt_lifnr.Text.Trim();
- string _txt_suppId = txt_suppId.GetId();
- string _txt_lineId = txt_lineId.GetId();
- string _txt_itemId = txt_itemId.Text.Trim();
- string _txt_remarks = txt_remarks.Text.Trim();
- string _txt_workNo = "";
- string _txt_epTag = txt_epTag.Text.Trim();
- string _txt_fzrId = "";
- string _txt_msg = txt_msg.TextTxt;
- string _txt_fmanageNo = txt_fmanageNo.Text.Trim();
- string _txt_lotNo2 = txt_lotNo2.Text.Trim();
- string _txt_lotNo1 = txt_lotNo1.Text.Trim();
- string _txt_lotNo = txt_lotNo.Text.Trim();
+ string _txt_djType = txt_djType.Text.Trim();//鍗曟嵁绫诲瀷
+ string _txt_fbatchQty = txt_fbatchQty.Text.Trim();//鎶芥鏁伴噺
+ string _txt_lifnr = txt_lifnr.Text.Trim();//瀹㈡埛璁㈠崟
+ string _txt_suppId = txt_suppId.GetId();//瀹㈡埛id
+ string _txt_lineId = txt_lineId.GetId();//浜х嚎
+ string _txt_itemId = txt_itemId.Text.Trim();//浜у搧
+ string _txt_remarks = txt_remarks.Text.Trim();//澶囨敞
+ string _txt_epTag = txt_epTag.Text.Trim();//鐜繚
+ string _txt_msg = txt_msg.TextTxt;//寮傚父
+ string _txt_fmanageNo = txt_fmanageNo.Text.Trim();//娴佺▼缂栧彿
+ string _txt_lotNo1 = txt_lotNo1.Text.Trim();//閫佹鎵瑰彿
+ string _txt_lotNo = txt_lotNo.Text.Trim();//鐢熶骇宸ュ崟
if (txt_djType.SelectedIndex <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.Warning("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�");
@@ -493,21 +490,18 @@
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- djType = _txt_djType,
- fbatchQty = _txt_fbatchQty,
- lifnr = _txt_lifnr,
- suppId = _txt_suppId,
- lineId = _txt_lineId,
- itemId = _txt_itemId,
- remarks = _txt_remarks,
- workNo = _txt_workNo,
- epTag = _txt_epTag,
- fzrId = _txt_fzrId,
- msg = _txt_msg,
- fmanageNo = _txt_fmanageNo,
- lotNo2 = _txt_lotNo2,
- lotNo1 = _txt_lotNo1,
- lotNo = _txt_lotNo
+ djType = _txt_djType,//鍗曟嵁绫诲瀷
+ fbatchQty = _txt_fbatchQty,//鎶芥鏁伴噺
+ lifnr = _txt_lifnr,//瀹㈡埛璁㈠崟
+ suppId = _txt_suppId,//瀹㈡埛id
+ lineId = _txt_lineId,//浜х嚎
+ itemId = _txt_itemId,//浜у搧
+ remarks = _txt_remarks,//澶囨敞
+ epTag = _txt_epTag,//鐜繚
+ msg = _txt_msg,//寮傚父
+ fmanageNo = _txt_fmanageNo,//娴佺▼缂栧彿
+ lotNo1 = _txt_lotNo1,//閫佹鎵瑰彿
+ lotNo = _txt_lotNo//鐢熶骇宸ュ崟
};
try
{
@@ -523,6 +517,7 @@
this.setEable(false);
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ getModel(lbGuid.Text,"0");
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
index 239d57c..808c3be 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
@@ -79,7 +79,7 @@
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.txt_msg = new Gs.DevApp.UserControl.UcDictionary();
- this.txt_workNo = new Gs.DevApp.UserControl.UcLookGx();
+ this.txt_fmrmode = new Gs.DevApp.UserControl.UcLookGx();
this.txt_fzrId = new Gs.DevApp.UserControl.UcLookStaff();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
@@ -99,7 +99,7 @@
this.txt_lifnr = new DevExpress.XtraEditors.TextEdit();
this.txt_djType = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_lotNo2 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
this.textEdit5 = new DevExpress.XtraEditors.TextEdit();
this.txt_epTag = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
@@ -108,7 +108,7 @@
this.txt_lineId = new DevExpress.XtraEditors.TextEdit();
this.txt_itemId = new DevExpress.XtraEditors.TextEdit();
this.txt_suppId = new DevExpress.XtraEditors.TextEdit();
- this.txt_fsecondResu = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_fngHandle = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_freceQty = new DevExpress.XtraEditors.ComboBoxEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -123,23 +123,26 @@
this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = 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();
- this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.txt_itemId11111 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = 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();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ 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.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -190,9 +193,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.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -230,7 +230,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_djType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_epTag.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
@@ -239,7 +239,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_lineId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsecondResu.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
@@ -254,23 +254,26 @@
((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).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();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemId11111)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).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();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((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.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -302,9 +305,6 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
this.SuspendLayout();
//
// repositoryItemComboBox1
@@ -791,7 +791,7 @@
// layoutMx1
//
this.layoutMx1.Controls.Add(this.txt_msg);
- this.layoutMx1.Controls.Add(this.txt_workNo);
+ this.layoutMx1.Controls.Add(this.txt_fmrmode);
this.layoutMx1.Controls.Add(this.txt_fzrId);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_remarks);
@@ -811,7 +811,7 @@
this.layoutMx1.Controls.Add(this.txt_lifnr);
this.layoutMx1.Controls.Add(this.txt_djType);
this.layoutMx1.Controls.Add(this.txt_lotNo);
- this.layoutMx1.Controls.Add(this.txt_lotNo2);
+ this.layoutMx1.Controls.Add(this.txt_workNo);
this.layoutMx1.Controls.Add(this.textEdit5);
this.layoutMx1.Controls.Add(this.txt_epTag);
this.layoutMx1.Controls.Add(this.txt_createBy);
@@ -820,7 +820,7 @@
this.layoutMx1.Controls.Add(this.txt_lineId);
this.layoutMx1.Controls.Add(this.txt_itemId);
this.layoutMx1.Controls.Add(this.txt_suppId);
- this.layoutMx1.Controls.Add(this.txt_fsecondResu);
+ this.layoutMx1.Controls.Add(this.txt_fngHandle);
this.layoutMx1.Controls.Add(this.txt_freceQty);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
@@ -828,7 +828,7 @@
this.layoutControlItem21});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(225, 479, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(116, 591, 812, 500);
this.layoutMx1.Root = this.Root;
this.layoutMx1.Size = new System.Drawing.Size(1342, 282);
this.layoutMx1.TabIndex = 0;
@@ -844,22 +844,22 @@
this.txt_msg.TextTxt = "";
this.txt_msg.WhereTxt = null;
//
- // txt_workNo
+ // txt_fmrmode
//
- this.txt_workNo.IsReadly = false;
- this.txt_workNo.Location = new System.Drawing.Point(1074, 241);
- this.txt_workNo.Margin = new System.Windows.Forms.Padding(0);
- this.txt_workNo.Name = "txt_workNo";
- this.txt_workNo.Size = new System.Drawing.Size(256, 24);
- this.txt_workNo.TabIndex = 813;
- this.txt_workNo.Tag = "readonly";
+ this.txt_fmrmode.IsReadly = false;
+ this.txt_fmrmode.Location = new System.Drawing.Point(1074, 241);
+ 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);
+ this.txt_fmrmode.TabIndex = 813;
+ this.txt_fmrmode.Tag = "readonly";
//
// txt_fzrId
//
this.txt_fzrId.IsReadly = false;
- this.txt_fzrId.Location = new System.Drawing.Point(744, 175);
+ this.txt_fzrId.Location = new System.Drawing.Point(1074, 175);
this.txt_fzrId.Name = "txt_fzrId";
- this.txt_fzrId.Size = new System.Drawing.Size(254, 24);
+ this.txt_fzrId.Size = new System.Drawing.Size(256, 24);
this.txt_fzrId.TabIndex = 812;
//
// lbGuid
@@ -968,7 +968,7 @@
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 109);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 44);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
@@ -977,7 +977,7 @@
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 76);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 12);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
@@ -986,7 +986,7 @@
//
// txt_fsubmit
//
- this.txt_fsubmit.Location = new System.Drawing.Point(1002, 142);
+ this.txt_fsubmit.Location = new System.Drawing.Point(1002, 76);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
@@ -1046,13 +1046,13 @@
this.txt_lotNo.TabIndex = 815;
this.txt_lotNo.Tag = "readonly";
//
- // txt_lotNo2
+ // txt_workNo
//
- this.txt_lotNo2.Location = new System.Drawing.Point(1074, 208);
- this.txt_lotNo2.Name = "txt_lotNo2";
- this.txt_lotNo2.Size = new System.Drawing.Size(256, 24);
- this.txt_lotNo2.StyleController = this.layoutMx1;
- this.txt_lotNo2.TabIndex = 816;
+ this.txt_workNo.Location = new System.Drawing.Point(1074, 208);
+ this.txt_workNo.Name = "txt_workNo";
+ this.txt_workNo.Size = new System.Drawing.Size(256, 24);
+ this.txt_workNo.StyleController = this.layoutMx1;
+ this.txt_workNo.TabIndex = 816;
//
// textEdit5
//
@@ -1076,18 +1076,18 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(1074, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(744, 175);
this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(256, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(254, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 822;
this.txt_createBy.Tag = "readonly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(1074, 44);
+ this.txt_createDate.Location = new System.Drawing.Point(744, 142);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(256, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(254, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 823;
this.txt_createDate.Tag = "readonly";
@@ -1128,27 +1128,27 @@
this.txt_suppId.TabIndex = 828;
this.txt_suppId.Tag = "readonly";
//
- // txt_fsecondResu
+ // txt_fngHandle
//
- this.txt_fsecondResu.EditValue = "-璇烽�夋嫨-";
- this.txt_fsecondResu.Location = new System.Drawing.Point(1074, 175);
- this.txt_fsecondResu.Name = "txt_fsecondResu";
- this.txt_fsecondResu.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ this.txt_fngHandle.EditValue = "-璇烽�夋嫨-";
+ this.txt_fngHandle.Location = new System.Drawing.Point(1074, 142);
+ 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)});
- this.txt_fsecondResu.Properties.Items.AddRange(new object[] {
+ this.txt_fngHandle.Properties.Items.AddRange(new object[] {
"-璇烽�夋嫨-",
"杩斿伐",
"鐗归噰",
"鎸戦�変娇鐢�"});
- this.txt_fsecondResu.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fsecondResu.Size = new System.Drawing.Size(256, 24);
- this.txt_fsecondResu.StyleController = this.layoutMx1;
- this.txt_fsecondResu.TabIndex = 829;
+ this.txt_fngHandle.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_fngHandle.Size = new System.Drawing.Size(256, 24);
+ this.txt_fngHandle.StyleController = this.layoutMx1;
+ this.txt_fngHandle.TabIndex = 829;
//
// txt_freceQty
//
this.txt_freceQty.EditValue = "-璇烽�夋嫨-";
- this.txt_freceQty.Location = new System.Drawing.Point(744, 142);
+ this.txt_freceQty.Location = new System.Drawing.Point(1074, 109);
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)});
@@ -1157,7 +1157,7 @@
"1:鍚堟牸",
"2:涓嶅悎鏍�"});
this.txt_freceQty.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_freceQty.Size = new System.Drawing.Size(254, 24);
+ this.txt_freceQty.Size = new System.Drawing.Size(256, 24);
this.txt_freceQty.StyleController = this.layoutMx1;
this.txt_freceQty.TabIndex = 830;
//
@@ -1199,26 +1199,26 @@
this.txt_epTagtxt,
this.layoutControlItem10,
this.layoutControlItem32,
- this.layoutControlItem12,
this.layoutControlItem29,
this.layoutControlItem5,
this.layoutControlItem6,
this.layoutControlItem34,
- this.layoutControlItem31,
- this.layoutControlItem33,
- this.layoutControlItem16,
- this.layoutControlItem15,
- this.layoutControlItem14,
this.layoutControlItem7,
this.txt_itemId11111,
this.layoutControlItem18,
this.layoutControlItem28,
this.layoutControlItem4,
- this.layoutControlItem11,
this.layoutControlItem27,
- this.layoutControlItem25,
+ this.layoutControlItem26,
+ this.layoutControlItem33,
+ this.layoutControlItem31,
+ this.layoutControlItem16,
+ this.layoutControlItem15,
+ this.layoutControlItem14,
this.layoutControlItem13,
- this.layoutControlItem26});
+ this.layoutControlItem11,
+ this.layoutControlItem25,
+ this.layoutControlItem12});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1367,20 +1367,9 @@
this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
this.layoutControlItem32.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.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem12.Size = new System.Drawing.Size(660, 33);
- this.layoutControlItem12.Text = "澶囨敞璇存槑";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
- //
// layoutControlItem29
//
- this.layoutControlItem29.Control = this.txt_lotNo2;
+ this.layoutControlItem29.Control = this.txt_workNo;
this.layoutControlItem29.Location = new System.Drawing.Point(990, 196);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -1420,63 +1409,6 @@
this.layoutControlItem34.Size = new System.Drawing.Size(330, 33);
this.layoutControlItem34.Text = "浜у搧鍚嶇О";
this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem31
- //
- this.layoutControlItem31.Control = this.txt_createBy;
- this.layoutControlItem31.CustomizationFormText = "鍒涘缓浜哄憳";
- this.layoutControlItem31.Location = new System.Drawing.Point(990, 0);
- this.layoutControlItem31.Name = "layoutControlItem31";
- this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem31.Size = new System.Drawing.Size(332, 32);
- this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem33
- //
- this.layoutControlItem33.Control = this.txt_createDate;
- this.layoutControlItem33.Location = new System.Drawing.Point(990, 32);
- this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem33.Size = new System.Drawing.Size(332, 32);
- this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_fsubmitDate;
- this.layoutControlItem16.CustomizationFormText = "瀹℃牳浜哄憳";
- this.layoutControlItem16.Location = new System.Drawing.Point(990, 64);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(332, 33);
- 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, 97);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(332, 33);
- 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, 130);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem14.Size = new System.Drawing.Size(332, 33);
- this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem14.TextVisible = false;
//
// layoutControlItem7
//
@@ -1531,17 +1463,6 @@
this.layoutControlItem4.Text = "瀹㈡埛鍚嶇О";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_fsecondResu;
- this.layoutControlItem11.Location = new System.Drawing.Point(990, 163);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem11.Size = new System.Drawing.Size(332, 33);
- this.layoutControlItem11.Text = "澶勭疆缁撴灉";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
- //
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_msg;
@@ -1554,6 +1475,119 @@
this.layoutControlItem27.Text = "杩濊绫诲埆";
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, 229);
+ 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.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.Name = "layoutControlItem33";
+ this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem33.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
+ this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem31
+ //
+ this.layoutControlItem31.Control = this.txt_createBy;
+ this.layoutControlItem31.CustomizationFormText = "鍒涘缓浜哄憳";
+ this.layoutControlItem31.Location = new System.Drawing.Point(660, 163);
+ 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.Text = "鍒涘缓浜哄憳";
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_fsubmitDate;
+ this.layoutControlItem16.CustomizationFormText = "瀹℃牳浜哄憳";
+ 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, 32);
+ 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, 32);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem15.Size = new System.Drawing.Size(332, 32);
+ 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.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem14.TextVisible = false;
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_freceQty;
+ this.layoutControlItem13.Location = new System.Drawing.Point(990, 97);
+ 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.Text = "鍒ゅ畾缁撴灉";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_fngHandle;
+ this.layoutControlItem11.CustomizationFormText = "澶勭疆缁撴灉";
+ this.layoutControlItem11.Location = new System.Drawing.Point(990, 130);
+ 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.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.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem25.Size = new System.Drawing.Size(332, 33);
+ 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.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem12.Size = new System.Drawing.Size(660, 33);
+ this.layoutControlItem12.Text = "澶囨敞璇存槑";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
// xtraTabControl2
//
@@ -2128,39 +2162,6 @@
//
this.gridView4.Name = "gridView4";
//
- // layoutControlItem25
- //
- this.layoutControlItem25.Control = this.txt_fzrId;
- this.layoutControlItem25.Location = new System.Drawing.Point(660, 163);
- this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem25.Size = new System.Drawing.Size(330, 33);
- this.layoutControlItem25.Text = "璐ｄ换浜�";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_freceQty;
- this.layoutControlItem13.Location = new System.Drawing.Point(660, 130);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(330, 33);
- this.layoutControlItem13.Text = "鍒ゅ畾缁撴灉";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem26
- //
- this.layoutControlItem26.Control = this.txt_workNo;
- this.layoutControlItem26.Location = new System.Drawing.Point(990, 229);
- 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.Text = "杩斿伐宸ュ簭";
- this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
- //
// Frm_FqcDetect01Check
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2208,7 +2209,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_djType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_epTag.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
@@ -2217,7 +2218,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_lineId.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsecondResu.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
@@ -2232,23 +2233,26 @@
((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).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();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemId11111)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).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();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((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.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2280,9 +2284,6 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
this.ResumeLayout(false);
}
@@ -2390,10 +2391,10 @@
private DevExpress.XtraEditors.TextEdit txt_lifnr;
private DevExpress.XtraEditors.ComboBoxEdit txt_djType;
private UserControl.UcLookStaff txt_fzrId;
- private UserControl.UcLookGx txt_workNo;
+ private UserControl.UcLookGx txt_fmrmode;
private UserControl.UcDictionary txt_msg;
private DevExpress.XtraEditors.TextEdit txt_lotNo;
- private DevExpress.XtraEditors.TextEdit txt_lotNo2;
+ private DevExpress.XtraEditors.TextEdit txt_workNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
@@ -2408,17 +2409,11 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraEditors.TextEdit txt_itemName;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private UserControl.UCUpFileList ucUpFileList1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
@@ -2432,12 +2427,18 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
private DevExpress.XtraEditors.TextEdit txt_suppId;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraEditors.ComboBoxEdit txt_fsecondResu;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_fngHandle;
private DevExpress.XtraEditors.ComboBoxEdit txt_freceQty;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ 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;
}
}
\ 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 ddf4c99..6570002 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
@@ -100,7 +100,7 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -166,7 +166,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
-
+
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
@@ -189,7 +189,7 @@
getPageList(this.pageBar1.CurrentPage);
}
}
-
+
/// <summary>
/// 淇敼浜嬩欢
/// </summary>
@@ -228,57 +228,28 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- string _txt_djType = txt_djType.Text.Trim();
- string _txt_fbatchQty = txt_fbatchQty.Text.Trim();
- string _txt_lifnr = txt_lifnr.Text.Trim();
- string _txt_suppId ="";
- string _txt_lineId ="";
- string _txt_itemId = txt_itemId11111.Text.Trim();
- string _txt_remarks = txt_remarks.Text.Trim();
- string _txt_workNo = txt_workNo.GetCode();
- string _txt_epTag = txt_epTag.Text.Trim();
+ string _txt_fngHandle = txt_fngHandle.Text.Trim();
+ string _freceQty = txt_freceQty.Text.Trim();
+ string _txt_fmrmode = txt_fmrmode.GetCode();
string _txt_fzrId = txt_fzrId.GetId();
+ string _txt_workNo = txt_workNo.Text.Trim();
string _txt_msg = txt_msg.TextTxt;
- string _txt_fmanageNo = txt_fmanageNo.Text.Trim();
- string _txt_lotNo2 = txt_lotNo2.Text.Trim();
- string _txt_lotNo1 = txt_lotNo1.Text.Trim();
- string _txt_lotNo = txt_lotNo.Text.Trim();
- if (txt_djType.SelectedIndex <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�");
- txt_djType.Focus();
- return;
- }
- if (string.IsNullOrEmpty(_txt_fbatchQty.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥鏁伴噺涓嶈兘涓虹┖锛�");
- txt_fbatchQty.Focus();
- return;
- }
- if (string.IsNullOrEmpty(_txt_lotNo.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("宸ュ崟鍙蜂笉鑳戒负绌猴紒");
- txt_lotNo.Focus();
- return;
- }
+ //if (string.IsNullOrEmpty(_txt_fbatchQty.Trim()))
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥鏁伴噺涓嶈兘涓虹┖锛�");
+ // txt_fbatchQty.Focus();
+ // return;
+ //}
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- djType = _txt_djType,
- fbatchQty = _txt_fbatchQty,
- lifnr = _txt_lifnr,
- suppId = _txt_suppId,
- lineId = _txt_lineId,
- itemId = _txt_itemId,
- remarks = _txt_remarks,
- workNo = _txt_workNo,
- epTag = _txt_epTag,
+ freceQty = _freceQty,
+ fngHandle = _txt_fngHandle,
fzrId = _txt_fzrId,
+ workNo = _txt_workNo,
+ fmrmode = _txt_fmrmode,
msg = _txt_msg,
- fmanageNo = _txt_fmanageNo,
- lotNo2 = _txt_lotNo2,
- lotNo1 = _txt_lotNo1,
- lotNo = _txt_lotNo
+ edtType = 1
};
try
{
@@ -288,7 +259,6 @@
if (_rtn.rtnCode > 0)
{
lbGuid.Text = _rtn.rtnData.outGuid;
- txt_releaseNo.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
this.setEable(false);
@@ -522,7 +492,7 @@
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(lbGuid.Text.Trim(),"0");
+ getModel(lbGuid.Text.Trim(), "0");
}
int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
gridView1.FocusedRowHandle = rowHandle;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index 671c7f5..d5211a0 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -30,31 +30,31 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ 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 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.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesQaItemsDetect01Check));
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -112,27 +112,17 @@
this.txt_modify1Date = new DevExpress.XtraEditors.TextEdit();
this.txt_modify1By = new DevExpress.XtraEditors.TextEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
+ this.txt_freceQty = new DevExpress.XtraEditors.ComboBoxEdit();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.modify1By = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -193,6 +183,18 @@
this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_freceQty1111 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.modify1By = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -231,27 +233,17 @@
((System.ComponentModel.ISupportInitialize)(this.txt_modify1Date.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modify1By.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.modify1By)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -284,6 +276,18 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty1111)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.modify1By)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -783,13 +787,14 @@
this.layoutMx1.Controls.Add(this.txt_modify1Date);
this.layoutMx1.Controls.Add(this.txt_modify1By);
this.layoutMx1.Controls.Add(this.txt_guid);
+ this.layoutMx1.Controls.Add(this.txt_freceQty);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem16,
this.layoutControlItem19});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(940, 345, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(614, 459, 812, 500);
this.layoutMx1.Root = this.Root;
this.layoutMx1.Size = new System.Drawing.Size(1186, 179);
this.layoutMx1.TabIndex = 0;
@@ -807,7 +812,7 @@
// txt_fmrmode
//
this.txt_fmrmode.EditValue = "-璇烽�夋嫨-";
- this.txt_fmrmode.Location = new System.Drawing.Point(671, 107);
+ this.txt_fmrmode.Location = new System.Drawing.Point(671, 139);
this.txt_fmrmode.Name = "txt_fmrmode";
this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -822,7 +827,7 @@
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(380, 139);
+ this.txt_remarks.Location = new System.Drawing.Point(89, 139);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
this.txt_remarks.Size = new System.Drawing.Size(501, 24);
@@ -833,7 +838,7 @@
// txt_fngHandle
//
this.txt_fngHandle.EditValue = "-璇烽�夋嫨-";
- this.txt_fngHandle.Location = new System.Drawing.Point(380, 107);
+ this.txt_fngHandle.Location = new System.Drawing.Point(671, 107);
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)});
@@ -849,9 +854,9 @@
// txt_suppName
//
this.txt_suppName.EnterMoveNextControl = true;
- this.txt_suppName.Location = new System.Drawing.Point(962, 12);
+ this.txt_suppName.Location = new System.Drawing.Point(671, 12);
this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Size = new System.Drawing.Size(212, 24);
+ this.txt_suppName.Size = new System.Drawing.Size(210, 24);
this.txt_suppName.StyleController = this.layoutMx1;
this.txt_suppName.TabIndex = 802;
this.txt_suppName.Tag = "readonly";
@@ -891,7 +896,7 @@
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(671, 12);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(380, 107);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
this.txt_fcheckBy.Size = new System.Drawing.Size(210, 24);
@@ -912,17 +917,17 @@
//
// txt_fcheckDate
//
- this.txt_fcheckDate.Location = new System.Drawing.Point(671, 43);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(962, 139);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckDate.Size = new System.Drawing.Size(210, 24);
+ this.txt_fcheckDate.Size = new System.Drawing.Size(212, 24);
this.txt_fcheckDate.StyleController = this.layoutMx1;
this.txt_fcheckDate.TabIndex = 216;
this.txt_fcheckDate.Tag = "readonly";
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(671, 75);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(671, 43);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Properties.Appearance.Options.UseFont = true;
this.txt_fcheckResu.Size = new System.Drawing.Size(210, 24);
@@ -963,7 +968,7 @@
//
// txt_modify1Flag
//
- this.txt_modify1Flag.Location = new System.Drawing.Point(885, 107);
+ this.txt_modify1Flag.Location = new System.Drawing.Point(885, 75);
this.txt_modify1Flag.Name = "txt_modify1Flag";
this.txt_modify1Flag.Properties.Caption = "瀹℃牳鏍囪瘑";
this.txt_modify1Flag.Size = new System.Drawing.Size(289, 24);
@@ -973,16 +978,16 @@
//
// txt_slOrg
//
- this.txt_slOrg.Location = new System.Drawing.Point(89, 139);
+ this.txt_slOrg.Location = new System.Drawing.Point(962, 107);
this.txt_slOrg.Name = "txt_slOrg";
- this.txt_slOrg.Size = new System.Drawing.Size(210, 24);
+ this.txt_slOrg.Size = new System.Drawing.Size(212, 24);
this.txt_slOrg.StyleController = this.layoutMx1;
this.txt_slOrg.TabIndex = 812;
this.txt_slOrg.Tag = "readonly";
//
// txt_modify1Date
//
- this.txt_modify1Date.Location = new System.Drawing.Point(962, 75);
+ this.txt_modify1Date.Location = new System.Drawing.Point(962, 43);
this.txt_modify1Date.Name = "txt_modify1Date";
this.txt_modify1Date.Size = new System.Drawing.Size(212, 24);
this.txt_modify1Date.StyleController = this.layoutMx1;
@@ -991,7 +996,7 @@
//
// txt_modify1By
//
- this.txt_modify1By.Location = new System.Drawing.Point(962, 43);
+ this.txt_modify1By.Location = new System.Drawing.Point(962, 12);
this.txt_modify1By.Name = "txt_modify1By";
this.txt_modify1By.Size = new System.Drawing.Size(212, 24);
this.txt_modify1By.StyleController = this.layoutMx1;
@@ -1006,6 +1011,22 @@
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 815;
this.txt_guid.Tag = "readonly";
+ //
+ // txt_freceQty
+ //
+ this.txt_freceQty.EditValue = "-璇烽�夋嫨-";
+ this.txt_freceQty.Location = new System.Drawing.Point(671, 75);
+ 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)});
+ this.txt_freceQty.Properties.Items.AddRange(new object[] {
+ "-璇烽�夋嫨-",
+ "1:鍚堟牸",
+ "2:涓嶅悎鏍�"});
+ this.txt_freceQty.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_freceQty.Size = new System.Drawing.Size(210, 24);
+ this.txt_freceQty.StyleController = this.layoutMx1;
+ this.txt_freceQty.TabIndex = 816;
//
// layoutControlItem16
//
@@ -1037,53 +1058,54 @@
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
this.layoutControlItem2,
- this.layoutControlItem3,
- this.layoutControlItem4,
- this.layoutControlItem5,
this.layoutControlItem6,
this.layoutControlItem7,
this.layoutControlItem8,
- this.layoutControlItem12,
this.layoutControlItem10,
- this.layoutControlItem17,
- this.layoutControlItem14,
this.layoutControlItem9,
- this.layoutControlItem11,
+ this.layoutControlItem3,
+ this.layoutControlItem5,
+ this.txt_freceQty1111,
+ this.layoutControlItem14,
this.layoutControlItem15,
+ this.layoutControlItem12,
this.modify1By,
this.layoutControlItem18,
- this.layoutControlItem13});
+ this.layoutControlItem13,
+ this.layoutControlItem17,
+ this.layoutControlItem4,
+ this.layoutControlItem11});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ 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;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5});
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8,
+ rowDefinition9,
+ rowDefinition10});
this.Root.Size = new System.Drawing.Size(1186, 179);
this.Root.TextVisible = false;
//
@@ -1105,38 +1127,6 @@
this.layoutControlItem2.Size = new System.Drawing.Size(291, 31);
this.layoutControlItem2.Text = "鍒拌揣鏁伴噺";
this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_fcheckBy;
- this.layoutControlItem3.Location = new System.Drawing.Point(582, 0);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(291, 31);
- this.layoutControlItem3.Text = "妫�楠屼汉鍛� ";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_fcheckDate;
- this.layoutControlItem4.Location = new System.Drawing.Point(582, 31);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(291, 32);
- this.layoutControlItem4.Text = "妫�楠屾棩鏈�";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_fcheckResu;
- this.layoutControlItem5.Location = new System.Drawing.Point(582, 63);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(291, 32);
- this.layoutControlItem5.Text = "妫�楠岀粨鏋�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem6
//
@@ -1168,16 +1158,6 @@
this.layoutControlItem8.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem8.TextSize = new System.Drawing.Size(65, 18);
//
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_suppName;
- this.layoutControlItem12.Location = new System.Drawing.Point(873, 0);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(293, 31);
- this.layoutControlItem12.Text = "渚涘簲鍟�";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(65, 18);
- //
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fcovertQty;
@@ -1189,27 +1169,6 @@
this.layoutControlItem10.Text = "杞崲鏁伴噺";
this.layoutControlItem10.TextSize = new System.Drawing.Size(65, 18);
//
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_slOrg;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 127);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(291, 32);
- this.layoutControlItem17.Text = "鏀舵枡缁勭粐";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_fngHandle;
- this.layoutControlItem14.Location = new System.Drawing.Point(291, 95);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(291, 32);
- this.layoutControlItem14.Text = "澶勭悊鏂瑰紡";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(65, 18);
- //
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_lotNo;
@@ -1220,63 +1179,6 @@
this.layoutControlItem9.Size = new System.Drawing.Size(291, 32);
this.layoutControlItem9.Text = "鎵规鍙�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_remarks;
- this.layoutControlItem11.Location = new System.Drawing.Point(291, 127);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem11.Size = new System.Drawing.Size(582, 32);
- this.layoutControlItem11.Text = "澶囨敞璇存槑";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_fmrmode;
- this.layoutControlItem15.Location = new System.Drawing.Point(582, 95);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(291, 32);
- this.layoutControlItem15.Text = "閫�鏂欐柟寮�";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(65, 18);
- //
- // modify1By
- //
- this.modify1By.Control = this.txt_modify1By;
- this.modify1By.Location = new System.Drawing.Point(873, 31);
- this.modify1By.Name = "modify1By";
- this.modify1By.OptionsTableLayoutItem.ColumnIndex = 3;
- this.modify1By.OptionsTableLayoutItem.RowIndex = 1;
- this.modify1By.Size = new System.Drawing.Size(293, 32);
- this.modify1By.Text = "瀹℃牳浜�";
- this.modify1By.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem18
- //
- this.layoutControlItem18.Control = this.txt_modify1Date;
- this.layoutControlItem18.Location = new System.Drawing.Point(873, 63);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem18.Size = new System.Drawing.Size(293, 32);
- this.layoutControlItem18.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_modify1Flag;
- this.layoutControlItem13.Location = new System.Drawing.Point(873, 95);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(293, 32);
- this.layoutControlItem13.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem13.TextVisible = false;
//
// xtraTabControl2
//
@@ -1884,10 +1786,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions4.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions4.Image")));
+ editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "娴忚", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "娴忚", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1905,10 +1807,10 @@
// repositoryItemButtonEdit3
//
this.repositoryItemButtonEdit3.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x161;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.download_16x161;
+ editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
@@ -1926,10 +1828,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍒犻櫎", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍒犻櫎", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1954,6 +1856,137 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_fcheckBy;
+ this.layoutControlItem3.Location = new System.Drawing.Point(291, 95);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem3.Size = new System.Drawing.Size(291, 32);
+ this.layoutControlItem3.Text = "妫�楠屼汉鍛� ";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_fcheckResu;
+ this.layoutControlItem5.Location = new System.Drawing.Point(582, 31);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem5.Size = new System.Drawing.Size(291, 32);
+ this.layoutControlItem5.Text = "妫�楠岀粨鏋�";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // txt_freceQty1111
+ //
+ this.txt_freceQty1111.Control = this.txt_freceQty;
+ this.txt_freceQty1111.Location = new System.Drawing.Point(582, 63);
+ this.txt_freceQty1111.Name = "txt_freceQty1111";
+ this.txt_freceQty1111.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.txt_freceQty1111.OptionsTableLayoutItem.RowIndex = 2;
+ this.txt_freceQty1111.Size = new System.Drawing.Size(291, 32);
+ this.txt_freceQty1111.Text = "鍒ゅ畾缁撴灉";
+ this.txt_freceQty1111.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_fngHandle;
+ this.layoutControlItem14.Location = new System.Drawing.Point(582, 95);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem14.Size = new System.Drawing.Size(291, 32);
+ this.layoutControlItem14.Text = "澶勭疆缁撴灉";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_fmrmode;
+ this.layoutControlItem15.Location = new System.Drawing.Point(582, 127);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem15.Size = new System.Drawing.Size(291, 32);
+ this.layoutControlItem15.Text = "澶勭疆鏂瑰紡";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_suppName;
+ this.layoutControlItem12.Location = new System.Drawing.Point(582, 0);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem12.Size = new System.Drawing.Size(291, 31);
+ this.layoutControlItem12.Text = "渚涘簲鍟�";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // modify1By
+ //
+ this.modify1By.Control = this.txt_modify1By;
+ this.modify1By.Location = new System.Drawing.Point(873, 0);
+ this.modify1By.Name = "modify1By";
+ this.modify1By.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.modify1By.Size = new System.Drawing.Size(293, 31);
+ this.modify1By.Text = "瀹℃牳浜�";
+ this.modify1By.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txt_modify1Date;
+ this.layoutControlItem18.Location = new System.Drawing.Point(873, 31);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem18.Size = new System.Drawing.Size(293, 32);
+ this.layoutControlItem18.Text = "瀹℃牳鏃ユ湡";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_modify1Flag;
+ this.layoutControlItem13.Location = new System.Drawing.Point(873, 63);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem13.Size = new System.Drawing.Size(293, 32);
+ this.layoutControlItem13.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem13.TextVisible = false;
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_slOrg;
+ this.layoutControlItem17.Location = new System.Drawing.Point(873, 95);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem17.Size = new System.Drawing.Size(293, 32);
+ this.layoutControlItem17.Text = "鏀舵枡缁勭粐";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_fcheckDate;
+ this.layoutControlItem4.Location = new System.Drawing.Point(873, 127);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem4.Size = new System.Drawing.Size(293, 32);
+ this.layoutControlItem4.Text = "妫�楠屾棩鏈�";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_remarks;
+ this.layoutControlItem11.Location = new System.Drawing.Point(0, 127);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem11.Size = new System.Drawing.Size(582, 32);
+ this.layoutControlItem11.Text = "澶囨敞璇存槑";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(65, 18);
+ //
// Frm_MesQaItemsDetect01Check
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1963,6 +1996,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesQaItemsDetect01Check";
+ this.Text = "iqc瀹℃牳";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
@@ -2001,27 +2035,17 @@
((System.ComponentModel.ISupportInitialize)(this.txt_modify1Date.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modify1By.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.modify1By)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2054,6 +2078,18 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty1111)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.modify1By)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
this.ResumeLayout(false);
}
@@ -2081,15 +2117,11 @@
private DevExpress.XtraEditors.TextEdit txt_releaseNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraEditors.TextEdit txt_itemModel;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraEditors.CheckEdit txt_modify1Flag;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraTab.XtraTabControl xtraTabControl2;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -2130,17 +2162,10 @@
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private UserControl.UCUpFile ucUpFile1;
private DevExpress.XtraEditors.TextEdit txt_slOrg;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraEditors.TextEdit txt_modify1Date;
private DevExpress.XtraEditors.TextEdit txt_modify1By;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem modify1By;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
@@ -2196,5 +2221,18 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_freceQty;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem txt_freceQty1111;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem modify1By;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
index 6a00c3f..250c7f7 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
@@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="editorButtonImageOptions4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABN0RVh0VGl0
bGUAV2ViO1dvcmxkO0V5ZQdEODoAAAONSURBVDhPVZJtTNNXFIcvoHOyLhMTt2Qsm4oMI5luEE3jZlsR
--
Gitblit v1.9.3