From 01082fa59f2aeb322a8a4c0d16bb50c334609dd6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 13 十一月 2024 10:56:56 +0800
Subject: [PATCH] 条码
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 73 ++++++++++
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 297 ++++++++++++++++++------------------------
3 files changed, 201 insertions(+), 171 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index d9530ec..954b4e2 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -29,22 +29,22 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ 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.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -72,18 +72,14 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_remarks = new DevExpress.XtraEditors.LabelControl();
- this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fngDesc = new DevExpress.XtraEditors.TextEdit();
this.lb_lifnr = new DevExpress.XtraEditors.LabelControl();
this.txt_lifnr = new DevExpress.XtraEditors.TextEdit();
- this.lb_lotNo1 = new DevExpress.XtraEditors.LabelControl();
- this.txt_lotNo1 = new DevExpress.XtraEditors.TextEdit();
this.lb_fngHandle = new DevExpress.XtraEditors.LabelControl();
this.lb_checkQty = new DevExpress.XtraEditors.LabelControl();
this.txt_checkQty = new DevExpress.XtraEditors.TextEdit();
this.lb_fcheckResu = new DevExpress.XtraEditors.LabelControl();
this.txt_fcheckResu = new DevExpress.XtraEditors.TextEdit();
- this.lb_freceQty = new DevExpress.XtraEditors.LabelControl();
- this.txt_freceQty = new DevExpress.XtraEditors.TextEdit();
this.lb_fbatchQty = new DevExpress.XtraEditors.LabelControl();
this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit();
this.lb_fcheckBy = new DevExpress.XtraEditors.LabelControl();
@@ -147,7 +143,6 @@
this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
this.panel1 = new System.Windows.Forms.Panel();
this.lb_qualityAudit = new DevExpress.XtraEditors.LabelControl();
- this.txt_qualityAudit = new DevExpress.XtraEditors.TextEdit();
this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.txt_fngHandle = new DevExpress.XtraEditors.ComboBoxEdit();
@@ -160,11 +155,12 @@
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.lb_fsubmit = new DevExpress.XtraEditors.LabelControl();
- this.txt_fsubmit = new DevExpress.XtraEditors.TextEdit();
this.lb_modify1Flag = new DevExpress.XtraEditors.LabelControl();
- this.txt_modify1Flag = new DevExpress.XtraEditors.TextEdit();
this.lb_lotNo = new DevExpress.XtraEditors.LabelControl();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_modify1Flag = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_qualityAudit = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_fsubmit = new DevExpress.XtraEditors.CheckEdit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -178,12 +174,10 @@
this.groupControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckDate.Properties)).BeginInit();
@@ -203,21 +197,21 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
this.SuspendLayout();
//
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.splitContainerControl1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1340, 448);
+ this.tabMxPage1.Size = new System.Drawing.Size(1340, 460);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
//
// splitContainerControl1
@@ -236,7 +230,7 @@
//
this.splitContainerControl1.Panel2.Controls.Add(this.groupControl1);
this.splitContainerControl1.Panel2.Text = "Panel2";
- this.splitContainerControl1.Size = new System.Drawing.Size(1340, 448);
+ this.splitContainerControl1.Size = new System.Drawing.Size(1340, 460);
this.splitContainerControl1.SplitterPosition = 160;
this.splitContainerControl1.TabIndex = 3;
//
@@ -489,7 +483,7 @@
this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl1.Location = new System.Drawing.Point(0, 0);
this.groupControl1.Name = "groupControl1";
- this.groupControl1.Size = new System.Drawing.Size(1340, 276);
+ this.groupControl1.Size = new System.Drawing.Size(1340, 288);
this.groupControl1.TabIndex = 3;
this.groupControl1.Text = "鎶芥牱缁撴灉";
//
@@ -499,7 +493,7 @@
this.gcMx2.Location = new System.Drawing.Point(2, 28);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1336, 246);
+ this.gcMx2.Size = new System.Drawing.Size(1336, 258);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -550,26 +544,27 @@
//
this.lb_remarks.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remarks.Appearance.Options.UseFont = true;
- this.lb_remarks.Location = new System.Drawing.Point(884, 92);
+ this.lb_remarks.Location = new System.Drawing.Point(627, 135);
this.lb_remarks.Name = "lb_remarks";
this.lb_remarks.Size = new System.Drawing.Size(73, 21);
this.lb_remarks.TabIndex = 786;
this.lb_remarks.Text = "涓嶈壇鎻忚堪 ";
//
- // txt_remarks
+ // txt_fngDesc
//
- this.txt_remarks.Location = new System.Drawing.Point(963, 89);
- this.txt_remarks.Name = "txt_remarks";
- this.txt_remarks.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(150, 28);
- this.txt_remarks.TabIndex = 786;
+ this.txt_fngDesc.Enabled = false;
+ this.txt_fngDesc.Location = new System.Drawing.Point(706, 131);
+ this.txt_fngDesc.Name = "txt_fngDesc";
+ this.txt_fngDesc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_fngDesc.Properties.Appearance.Options.UseFont = true;
+ this.txt_fngDesc.Size = new System.Drawing.Size(150, 28);
+ this.txt_fngDesc.TabIndex = 786;
//
// lb_lifnr
//
this.lb_lifnr.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lifnr.Appearance.Options.UseFont = true;
- this.lb_lifnr.Location = new System.Drawing.Point(392, 163);
+ this.lb_lifnr.Location = new System.Drawing.Point(394, 128);
this.lb_lifnr.Name = "lb_lifnr";
this.lb_lifnr.Size = new System.Drawing.Size(56, 21);
this.lb_lifnr.TabIndex = 642;
@@ -577,37 +572,19 @@
//
// txt_lifnr
//
- this.txt_lifnr.Location = new System.Drawing.Point(452, 163);
+ this.txt_lifnr.Enabled = false;
+ this.txt_lifnr.Location = new System.Drawing.Point(452, 128);
this.txt_lifnr.Name = "txt_lifnr";
this.txt_lifnr.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lifnr.Properties.Appearance.Options.UseFont = true;
this.txt_lifnr.Size = new System.Drawing.Size(150, 28);
this.txt_lifnr.TabIndex = 642;
//
- // lb_lotNo1
- //
- this.lb_lotNo1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_lotNo1.Appearance.Options.UseFont = true;
- this.lb_lotNo1.Location = new System.Drawing.Point(377, 129);
- this.lb_lotNo1.Name = "lb_lotNo1";
- this.lb_lotNo1.Size = new System.Drawing.Size(73, 21);
- this.lb_lotNo1.TabIndex = 546;
- this.lb_lotNo1.Text = "灏忔壒娆″彿 ";
- //
- // txt_lotNo1
- //
- this.txt_lotNo1.Location = new System.Drawing.Point(452, 126);
- this.txt_lotNo1.Name = "txt_lotNo1";
- this.txt_lotNo1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_lotNo1.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo1.Size = new System.Drawing.Size(150, 28);
- this.txt_lotNo1.TabIndex = 546;
- //
// lb_fngHandle
//
this.lb_fngHandle.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fngHandle.Appearance.Options.UseFont = true;
- this.lb_fngHandle.Location = new System.Drawing.Point(884, 131);
+ this.lb_fngHandle.Location = new System.Drawing.Point(876, 93);
this.lb_fngHandle.Name = "lb_fngHandle";
this.lb_fngHandle.Size = new System.Drawing.Size(68, 21);
this.lb_fngHandle.TabIndex = 427;
@@ -617,7 +594,7 @@
//
this.lb_checkQty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_checkQty.Appearance.Options.UseFont = true;
- this.lb_checkQty.Location = new System.Drawing.Point(627, 53);
+ this.lb_checkQty.Location = new System.Drawing.Point(377, 93);
this.lb_checkQty.Name = "lb_checkQty";
this.lb_checkQty.Size = new System.Drawing.Size(73, 21);
this.lb_checkQty.TabIndex = 258;
@@ -625,7 +602,8 @@
//
// txt_checkQty
//
- this.txt_checkQty.Location = new System.Drawing.Point(706, 55);
+ this.txt_checkQty.Enabled = false;
+ this.txt_checkQty.Location = new System.Drawing.Point(452, 89);
this.txt_checkQty.Name = "txt_checkQty";
this.txt_checkQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkQty.Properties.Appearance.Options.UseFont = true;
@@ -636,7 +614,7 @@
//
this.lb_fcheckResu.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fcheckResu.Appearance.Options.UseFont = true;
- this.lb_fcheckResu.Location = new System.Drawing.Point(627, 126);
+ this.lb_fcheckResu.Location = new System.Drawing.Point(627, 93);
this.lb_fcheckResu.Name = "lb_fcheckResu";
this.lb_fcheckResu.Size = new System.Drawing.Size(73, 21);
this.lb_fcheckResu.TabIndex = 235;
@@ -644,37 +622,19 @@
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(706, 126);
+ this.txt_fcheckResu.Enabled = false;
+ this.txt_fcheckResu.Location = new System.Drawing.Point(706, 89);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcheckResu.Properties.Appearance.Options.UseFont = true;
this.txt_fcheckResu.Size = new System.Drawing.Size(150, 28);
this.txt_fcheckResu.TabIndex = 235;
//
- // lb_freceQty
- //
- this.lb_freceQty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_freceQty.Appearance.Options.UseFont = true;
- this.lb_freceQty.Location = new System.Drawing.Point(627, 96);
- this.lb_freceQty.Name = "lb_freceQty";
- this.lb_freceQty.Size = new System.Drawing.Size(73, 21);
- this.lb_freceQty.TabIndex = 226;
- this.lb_freceQty.Text = "鍒ゅ畾缁撴灉 ";
- //
- // txt_freceQty
- //
- this.txt_freceQty.Location = new System.Drawing.Point(706, 92);
- this.txt_freceQty.Name = "txt_freceQty";
- this.txt_freceQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_freceQty.Properties.Appearance.Options.UseFont = true;
- this.txt_freceQty.Size = new System.Drawing.Size(150, 28);
- this.txt_freceQty.TabIndex = 226;
- //
// lb_fbatchQty
//
this.lb_fbatchQty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fbatchQty.Appearance.Options.UseFont = true;
- this.lb_fbatchQty.Location = new System.Drawing.Point(377, 59);
+ this.lb_fbatchQty.Location = new System.Drawing.Point(377, 14);
this.lb_fbatchQty.Name = "lb_fbatchQty";
this.lb_fbatchQty.Size = new System.Drawing.Size(73, 21);
this.lb_fbatchQty.TabIndex = 222;
@@ -682,7 +642,8 @@
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(452, 55);
+ this.txt_fbatchQty.Enabled = false;
+ this.txt_fbatchQty.Location = new System.Drawing.Point(452, 10);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
@@ -701,6 +662,7 @@
//
// txt_fcheckBy
//
+ this.txt_fcheckBy.Enabled = false;
this.txt_fcheckBy.Location = new System.Drawing.Point(706, 7);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -712,7 +674,7 @@
//
this.lb_fcheckDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fcheckDate.Appearance.Options.UseFont = true;
- this.lb_fcheckDate.Location = new System.Drawing.Point(377, 14);
+ this.lb_fcheckDate.Location = new System.Drawing.Point(627, 52);
this.lb_fcheckDate.Name = "lb_fcheckDate";
this.lb_fcheckDate.Size = new System.Drawing.Size(73, 21);
this.lb_fcheckDate.TabIndex = 216;
@@ -720,7 +682,8 @@
//
// txt_fcheckDate
//
- this.txt_fcheckDate.Location = new System.Drawing.Point(452, 11);
+ this.txt_fcheckDate.Enabled = false;
+ this.txt_fcheckDate.Location = new System.Drawing.Point(706, 48);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
@@ -739,6 +702,7 @@
//
// txt_releaseNo
//
+ this.txt_releaseNo.Enabled = false;
this.txt_releaseNo.Location = new System.Drawing.Point(97, 10);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1256,10 +1220,10 @@
// xtraTabControl2
//
this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl2.Location = new System.Drawing.Point(0, 208);
+ this.xtraTabControl2.Location = new System.Drawing.Point(0, 196);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
- this.xtraTabControl2.Size = new System.Drawing.Size(1342, 480);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1342, 492);
this.xtraTabControl2.TabIndex = 2;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1379,10 +1343,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);
@@ -1400,10 +1364,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);
@@ -1421,10 +1385,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);
@@ -1441,8 +1405,10 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.lb_qualityAudit);
+ this.panel1.Controls.Add(this.txt_fsubmit);
this.panel1.Controls.Add(this.txt_qualityAudit);
+ this.panel1.Controls.Add(this.txt_modify1Flag);
+ this.panel1.Controls.Add(this.lb_qualityAudit);
this.panel1.Controls.Add(this.txt_fmrmode);
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.txt_fngHandle);
@@ -1455,24 +1421,18 @@
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_remarks);
- this.panel1.Controls.Add(this.txt_remarks);
+ this.panel1.Controls.Add(this.txt_fngDesc);
this.panel1.Controls.Add(this.lb_lifnr);
this.panel1.Controls.Add(this.txt_lifnr);
- this.panel1.Controls.Add(this.lb_lotNo1);
- this.panel1.Controls.Add(this.txt_lotNo1);
this.panel1.Controls.Add(this.lb_fngHandle);
this.panel1.Controls.Add(this.lb_fsubmit);
- this.panel1.Controls.Add(this.txt_fsubmit);
this.panel1.Controls.Add(this.lb_modify1Flag);
- this.panel1.Controls.Add(this.txt_modify1Flag);
this.panel1.Controls.Add(this.lb_lotNo);
this.panel1.Controls.Add(this.txt_lotNo);
this.panel1.Controls.Add(this.lb_checkQty);
this.panel1.Controls.Add(this.txt_checkQty);
this.panel1.Controls.Add(this.lb_fcheckResu);
this.panel1.Controls.Add(this.txt_fcheckResu);
- this.panel1.Controls.Add(this.lb_freceQty);
- this.panel1.Controls.Add(this.txt_freceQty);
this.panel1.Controls.Add(this.lb_fbatchQty);
this.panel1.Controls.Add(this.txt_fbatchQty);
this.panel1.Controls.Add(this.lb_fcheckBy);
@@ -1485,31 +1445,22 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1342, 208);
+ this.panel1.Size = new System.Drawing.Size(1342, 196);
this.panel1.TabIndex = 1;
//
// lb_qualityAudit
//
this.lb_qualityAudit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_qualityAudit.Appearance.Options.UseFont = true;
- this.lb_qualityAudit.Location = new System.Drawing.Point(1025, 53);
+ this.lb_qualityAudit.Location = new System.Drawing.Point(983, 52);
this.lb_qualityAudit.Name = "lb_qualityAudit";
this.lb_qualityAudit.Size = new System.Drawing.Size(68, 21);
this.lb_qualityAudit.TabIndex = 796;
this.lb_qualityAudit.Text = "鏄惁瀹℃牳";
//
- // txt_qualityAudit
- //
- this.txt_qualityAudit.Location = new System.Drawing.Point(1099, 46);
- this.txt_qualityAudit.Name = "txt_qualityAudit";
- this.txt_qualityAudit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_qualityAudit.Properties.Appearance.Options.UseFont = true;
- this.txt_qualityAudit.Size = new System.Drawing.Size(51, 28);
- this.txt_qualityAudit.TabIndex = 797;
- //
// txt_fmrmode
//
- this.txt_fmrmode.Location = new System.Drawing.Point(963, 163);
+ this.txt_fmrmode.Location = new System.Drawing.Point(958, 133);
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)});
@@ -1523,7 +1474,7 @@
//
this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(884, 169);
+ this.labelControl2.Location = new System.Drawing.Point(876, 135);
this.labelControl2.Name = "labelControl2";
this.labelControl2.Size = new System.Drawing.Size(68, 21);
this.labelControl2.TabIndex = 794;
@@ -1531,7 +1482,7 @@
//
// txt_fngHandle
//
- this.txt_fngHandle.Location = new System.Drawing.Point(963, 130);
+ this.txt_fngHandle.Location = new System.Drawing.Point(958, 91);
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)});
@@ -1543,21 +1494,24 @@
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(97, 127);
+ this.txt_itemModel.Enabled = false;
+ this.txt_itemModel.Location = new System.Drawing.Point(97, 128);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(266, 64);
+ this.txt_itemModel.Size = new System.Drawing.Size(266, 62);
this.txt_itemModel.TabIndex = 792;
this.txt_itemModel.Tag = "itemName";
//
// txt_itemId
//
+ this.txt_itemId.IsReadly = true;
this.txt_itemId.KeyFile = "";
- this.txt_itemId.Location = new System.Drawing.Point(97, 53);
+ this.txt_itemId.Location = new System.Drawing.Point(97, 46);
this.txt_itemId.Name = "txt_itemId";
this.txt_itemId.Size = new System.Drawing.Size(266, 33);
this.txt_itemId.TabIndex = 791;
+ this.txt_itemId.Tag = "no";
//
// lb_itemModel
//
@@ -1573,7 +1527,7 @@
//
this.lb_tname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tname.Appearance.Options.UseFont = true;
- this.lb_tname.Location = new System.Drawing.Point(20, 96);
+ this.lb_tname.Location = new System.Drawing.Point(20, 93);
this.lb_tname.Name = "lb_tname";
this.lb_tname.Size = new System.Drawing.Size(68, 21);
this.lb_tname.TabIndex = 788;
@@ -1581,7 +1535,8 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(97, 92);
+ this.txt_itemNo.Enabled = false;
+ this.txt_itemNo.Location = new System.Drawing.Point(97, 89);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
@@ -1592,7 +1547,7 @@
//
this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(20, 59);
+ this.labelControl1.Location = new System.Drawing.Point(20, 52);
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(68, 21);
this.labelControl1.TabIndex = 787;
@@ -1600,64 +1555,48 @@
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(627, 173);
+ this.labelControl11.Location = new System.Drawing.Point(405, 167);
this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl11.Name = "labelControl11";
this.labelControl11.Size = new System.Drawing.Size(45, 18);
this.labelControl11.TabIndex = 130;
this.labelControl11.Text = "涓婚敭锛�";
+ this.labelControl11.Visible = false;
//
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(678, 173);
+ this.lbGuid.Location = new System.Drawing.Point(456, 167);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
+ this.lbGuid.Visible = false;
//
// lb_fsubmit
//
this.lb_fsubmit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fsubmit.Appearance.Options.UseFont = true;
- this.lb_fsubmit.Location = new System.Drawing.Point(884, 10);
+ this.lb_fsubmit.Location = new System.Drawing.Point(871, 10);
this.lb_fsubmit.Name = "lb_fsubmit";
this.lb_fsubmit.Size = new System.Drawing.Size(73, 21);
this.lb_fsubmit.TabIndex = 360;
this.lb_fsubmit.Text = "鎻愪氦鏍囪瘑 ";
//
- // txt_fsubmit
- //
- this.txt_fsubmit.Location = new System.Drawing.Point(963, 1);
- this.txt_fsubmit.Name = "txt_fsubmit";
- this.txt_fsubmit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fsubmit.Properties.Appearance.Options.UseFont = true;
- this.txt_fsubmit.Size = new System.Drawing.Size(150, 28);
- this.txt_fsubmit.TabIndex = 360;
- //
// lb_modify1Flag
//
this.lb_modify1Flag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_modify1Flag.Appearance.Options.UseFont = true;
- this.lb_modify1Flag.Location = new System.Drawing.Point(884, 53);
+ this.lb_modify1Flag.Location = new System.Drawing.Point(876, 52);
this.lb_modify1Flag.Name = "lb_modify1Flag";
this.lb_modify1Flag.Size = new System.Drawing.Size(68, 21);
this.lb_modify1Flag.TabIndex = 306;
this.lb_modify1Flag.Text = "鏄惁缁撴";
//
- // txt_modify1Flag
- //
- this.txt_modify1Flag.Location = new System.Drawing.Point(963, 46);
- this.txt_modify1Flag.Name = "txt_modify1Flag";
- this.txt_modify1Flag.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_modify1Flag.Properties.Appearance.Options.UseFont = true;
- this.txt_modify1Flag.Size = new System.Drawing.Size(45, 28);
- this.txt_modify1Flag.TabIndex = 306;
- //
// lb_lotNo
//
this.lb_lotNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lotNo.Appearance.Options.UseFont = true;
- this.lb_lotNo.Location = new System.Drawing.Point(394, 96);
+ this.lb_lotNo.Location = new System.Drawing.Point(394, 52);
this.lb_lotNo.Name = "lb_lotNo";
this.lb_lotNo.Size = new System.Drawing.Size(56, 21);
this.lb_lotNo.TabIndex = 262;
@@ -1665,12 +1604,40 @@
//
// txt_lotNo
//
- this.txt_lotNo.Location = new System.Drawing.Point(452, 92);
+ this.txt_lotNo.Enabled = false;
+ this.txt_lotNo.Location = new System.Drawing.Point(452, 48);
this.txt_lotNo.Name = "txt_lotNo";
this.txt_lotNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
this.txt_lotNo.Size = new System.Drawing.Size(150, 28);
this.txt_lotNo.TabIndex = 262;
+ //
+ // txt_modify1Flag
+ //
+ this.txt_modify1Flag.Enabled = false;
+ this.txt_modify1Flag.Location = new System.Drawing.Point(958, 50);
+ this.txt_modify1Flag.Name = "txt_modify1Flag";
+ this.txt_modify1Flag.Properties.Caption = "";
+ this.txt_modify1Flag.Size = new System.Drawing.Size(27, 24);
+ this.txt_modify1Flag.TabIndex = 798;
+ //
+ // txt_qualityAudit
+ //
+ this.txt_qualityAudit.Enabled = false;
+ this.txt_qualityAudit.Location = new System.Drawing.Point(1057, 49);
+ this.txt_qualityAudit.Name = "txt_qualityAudit";
+ this.txt_qualityAudit.Properties.Caption = "";
+ this.txt_qualityAudit.Size = new System.Drawing.Size(53, 24);
+ this.txt_qualityAudit.TabIndex = 799;
+ //
+ // txt_fsubmit
+ //
+ this.txt_fsubmit.Enabled = false;
+ this.txt_fsubmit.Location = new System.Drawing.Point(958, 10);
+ this.txt_fsubmit.Name = "txt_fsubmit";
+ this.txt_fsubmit.Properties.Caption = "";
+ this.txt_fsubmit.Size = new System.Drawing.Size(94, 24);
+ this.txt_fsubmit.TabIndex = 800;
//
// Frm_MesQaItemsDetect01Check
//
@@ -1693,12 +1660,10 @@
this.groupControl1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckDate.Properties)).EndInit();
@@ -1719,14 +1684,14 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -1742,13 +1707,10 @@
private DevExpress.XtraTab.XtraTabControl xtraTabControl2;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraEditors.LabelControl lb_remarks;
- private DevExpress.XtraEditors.TextEdit txt_remarks;
+ private DevExpress.XtraEditors.TextEdit txt_fngDesc;
private DevExpress.XtraEditors.LabelControl lb_lifnr;
private DevExpress.XtraEditors.TextEdit txt_lifnr;
-
- private DevExpress.XtraEditors.LabelControl lb_lotNo1;
- private DevExpress.XtraEditors.TextEdit txt_lotNo1;
private DevExpress.XtraEditors.LabelControl lb_fngHandle;
@@ -1757,9 +1719,6 @@
private DevExpress.XtraEditors.LabelControl lb_fcheckResu;
private DevExpress.XtraEditors.TextEdit txt_fcheckResu;
-
- private DevExpress.XtraEditors.LabelControl lb_freceQty;
- private DevExpress.XtraEditors.TextEdit txt_freceQty;
private DevExpress.XtraEditors.LabelControl lb_fbatchQty;
private DevExpress.XtraEditors.TextEdit txt_fbatchQty;
@@ -1780,9 +1739,7 @@
private DevExpress.XtraEditors.TextEdit txt_itemNo;
private DevExpress.XtraEditors.LabelControl labelControl1;
private DevExpress.XtraEditors.LabelControl lb_fsubmit;
- private DevExpress.XtraEditors.TextEdit txt_fsubmit;
private DevExpress.XtraEditors.LabelControl lb_modify1Flag;
- private DevExpress.XtraEditors.TextEdit txt_modify1Flag;
private DevExpress.XtraEditors.LabelControl lb_lotNo;
private DevExpress.XtraEditors.TextEdit txt_lotNo;
private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
@@ -1858,8 +1815,10 @@
private DevExpress.XtraEditors.ComboBoxEdit txt_fngHandle;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraEditors.LabelControl lb_qualityAudit;
- private DevExpress.XtraEditors.TextEdit txt_qualityAudit;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
+ private DevExpress.XtraEditors.CheckEdit txt_fsubmit;
+ private DevExpress.XtraEditors.CheckEdit txt_qualityAudit;
+ private DevExpress.XtraEditors.CheckEdit txt_modify1Flag;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index 1cad83f..1d8f5aa 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -10,7 +10,6 @@
using System.Drawing;
using System.Net;
using System.Windows.Forms;
-using static DevExpress.XtraPrinting.Native.PageSizeInfo;
namespace Gs.DevApp.DevFrm.QC
{
@@ -21,6 +20,9 @@
public Frm_MesQaItemsDetect01Check()
{
InitializeComponent();
+ this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+ this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.btnZhiLiangChkClick += ToolBarMenu1_btnZhiLiangChkClick;
@@ -118,6 +120,75 @@
toolBarMenu1.guidKey = rowGuid;
}
/// <summary>
+ /// 鍙栨秷浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+ {
+ UtilityHelper.JumpToTab(xtraTabControl1, 0);
+ }
+ /// <summary>
+ /// 淇濆瓨浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.isSetBtn = false;
+ if (string.IsNullOrEmpty(txt_fngHandle.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶勭悊鏂瑰紡锛�");
+ txt_fngDesc.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(txt_fmrmode.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閫�鏂欐柟寮忥紒");
+ txt_fmrmode.Focus();
+ return;
+ }
+ var _obj = new
+ {
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ fngHandle = txt_fngHandle.Text.Trim(),
+ fmrmode = txt_fmrmode.Text.Trim(),
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ lbGuid.Text = _rtn.rtnData;
+ toolBarMenu1.isSetBtn = true;
+ UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 淇敼浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+ {
+ string rowGuid = "", rowName = "";
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1);
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ getModel(rowGuid, true, 1);
+ }
+ /// <summary>
/// 椹冲洖
/// </summary>
/// <param name="sender"></param>
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
index 4e430f1..fd7814d 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