From a0ae5d6e027bd4b1136829210f22c7ba0db565ab Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 01 十一月 2024 13:56:35 +0800
Subject: [PATCH] 小细节修改
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 91 +--
DevApp/Gs.DevApp/TestForm/XtraForm1.cs | 114 ---
DevApp/Gs.DevApp/UserControl/UcLookItems.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs | 353 ++++++------
DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs | 5
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 34
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs | 606 +++++++++++----------
DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs | 81 --
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs | 91 +-
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs | 293 +++++-----
12 files changed, 755 insertions(+), 919 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
index d7e634d..2523824 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -36,6 +36,7 @@
this.gvMx2aql00015 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2aql00010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2sampleSizeWord = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gvMx2memo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2aql1000 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2aql0650 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -53,23 +54,22 @@
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gvMx1aql1Id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1flevelIii = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1flevelIi = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1flevelI = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1flevelS4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1flevelS3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1flevelS2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1flevelS1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1lotTo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1lotFrom = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1aql1Id = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1lotFrom = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1lotTo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1flevelS1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1flevelS2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1flevelS3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1flevelS4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1flevelI = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1flevelIi = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1flevelIii = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_isenabled = new DevExpress.XtraEditors.LabelControl();
- this.txt_isenabled = new DevExpress.XtraEditors.TextEdit();
this.gv_isenabled = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fversion = new DevExpress.XtraEditors.LabelControl();
this.txt_fversion = new DevExpress.XtraEditors.TextEdit();
@@ -81,7 +81,6 @@
this.txt_ftwoCheckor = new DevExpress.XtraEditors.TextEdit();
this.gv_ftwoCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_ftwoChecked = new DevExpress.XtraEditors.LabelControl();
- this.txt_ftwoChecked = new DevExpress.XtraEditors.TextEdit();
this.gv_ftwoChecked = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_foneCheckdate = new DevExpress.XtraEditors.LabelControl();
this.txt_foneCheckdate = new DevExpress.XtraEditors.TextEdit();
@@ -90,7 +89,6 @@
this.txt_foneCheckor = new DevExpress.XtraEditors.TextEdit();
this.gv_foneCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_foneChecked = new DevExpress.XtraEditors.LabelControl();
- this.txt_foneChecked = new DevExpress.XtraEditors.TextEdit();
this.gv_foneChecked = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_memo = new DevExpress.XtraEditors.LabelControl();
this.txt_memo = new DevExpress.XtraEditors.TextEdit();
@@ -116,21 +114,22 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_ftwoChecked = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_foneChecked = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_isenabled = new DevExpress.XtraEditors.CheckEdit();
this.lbGuid = new System.Windows.Forms.Label();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fversion.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckdate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckor.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckdate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sampleSizeName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sampleSizeNo.Properties)).BeginInit();
@@ -145,6 +144,9 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).BeginInit();
this.SuspendLayout();
//
// gvMx2aql1Id
@@ -162,7 +164,7 @@
//
this.gvMx2aql00065.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2aql00065.AppearanceCell.Options.UseFont = true;
- this.gvMx2aql00065.Caption = "0.065 ";
+ this.gvMx2aql00065.Caption = "0.065";
this.gvMx2aql00065.FieldName = "aql00065";
this.gvMx2aql00065.MinWidth = 50;
this.gvMx2aql00065.Name = "gvMx2aql00065";
@@ -175,7 +177,7 @@
//
this.gvMx2aql00040.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2aql00040.AppearanceCell.Options.UseFont = true;
- this.gvMx2aql00040.Caption = "0.040 ";
+ this.gvMx2aql00040.Caption = "0.040";
this.gvMx2aql00040.FieldName = "aql00040";
this.gvMx2aql00040.MinWidth = 50;
this.gvMx2aql00040.Name = "gvMx2aql00040";
@@ -188,7 +190,7 @@
//
this.gvMx2aql00025.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2aql00025.AppearanceCell.Options.UseFont = true;
- this.gvMx2aql00025.Caption = "0.025 ";
+ this.gvMx2aql00025.Caption = "0.025";
this.gvMx2aql00025.FieldName = "aql00025";
this.gvMx2aql00025.MinWidth = 50;
this.gvMx2aql00025.Name = "gvMx2aql00025";
@@ -214,7 +216,7 @@
//
this.gvMx2aql00010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2aql00010.AppearanceCell.Options.UseFont = true;
- this.gvMx2aql00010.Caption = "0.010 ";
+ this.gvMx2aql00010.Caption = "0.010";
this.gvMx2aql00010.FieldName = "aql00010";
this.gvMx2aql00010.MinWidth = 50;
this.gvMx2aql00010.Name = "gvMx2aql00010";
@@ -227,20 +229,43 @@
//
this.gvMx2sampleSizeWord.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2sampleSizeWord.AppearanceCell.Options.UseFont = true;
- this.gvMx2sampleSizeWord.Caption = "鏍锋湰澶у皬瀛楃爜 ";
+ this.gvMx2sampleSizeWord.Caption = "鏍锋湰澶у皬瀛楃爜";
+ this.gvMx2sampleSizeWord.ColumnEdit = this.repositoryItemComboBox1;
this.gvMx2sampleSizeWord.FieldName = "sampleSizeWord";
- this.gvMx2sampleSizeWord.MinWidth = 50;
+ this.gvMx2sampleSizeWord.MinWidth = 100;
this.gvMx2sampleSizeWord.Name = "gvMx2sampleSizeWord";
this.gvMx2sampleSizeWord.Tag = "query_a.SAMPLE_SIZE_WORD";
this.gvMx2sampleSizeWord.Visible = true;
this.gvMx2sampleSizeWord.VisibleIndex = 1;
- this.gvMx2sampleSizeWord.Width = 94;
+ this.gvMx2sampleSizeWord.Width = 100;
+ //
+ // repositoryItemComboBox1
+ //
+ this.repositoryItemComboBox1.AutoHeight = false;
+ this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox1.Items.AddRange(new object[] {
+ "A",
+ "B",
+ "C",
+ "D",
+ "E",
+ "F",
+ "G",
+ "H",
+ "I",
+ "J",
+ "K",
+ "L",
+ "M",
+ "N"});
+ this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
//
// gvMx2memo
//
this.gvMx2memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2memo.AppearanceCell.Options.UseFont = true;
- this.gvMx2memo.Caption = "澶囨敞 ";
+ this.gvMx2memo.Caption = "澶囨敞";
this.gvMx2memo.FieldName = "memo";
this.gvMx2memo.MinWidth = 50;
this.gvMx2memo.Name = "gvMx2memo";
@@ -253,7 +278,7 @@
//
this.gvMx2aql1000.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2aql1000.AppearanceCell.Options.UseFont = true;
- this.gvMx2aql1000.Caption = "10 ";
+ this.gvMx2aql1000.Caption = "10";
this.gvMx2aql1000.FieldName = "aql1000";
this.gvMx2aql1000.MinWidth = 50;
this.gvMx2aql1000.Name = "gvMx2aql1000";
@@ -266,7 +291,7 @@
//
this.gvMx2aql0650.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2aql0650.AppearanceCell.Options.UseFont = true;
- this.gvMx2aql0650.Caption = "6.5 ";
+ this.gvMx2aql0650.Caption = "6.5";
this.gvMx2aql0650.FieldName = "aql0650";
this.gvMx2aql0650.MinWidth = 50;
this.gvMx2aql0650.Name = "gvMx2aql0650";
@@ -279,7 +304,7 @@
//
this.gvMx2aql0400.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2aql0400.AppearanceCell.Options.UseFont = true;
- this.gvMx2aql0400.Caption = "4.0 ";
+ this.gvMx2aql0400.Caption = "4.0";
this.gvMx2aql0400.FieldName = "aql0400";
this.gvMx2aql0400.MinWidth = 50;
this.gvMx2aql0400.Name = "gvMx2aql0400";
@@ -292,7 +317,7 @@
//
this.gvMx2aql0250.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2aql0250.AppearanceCell.Options.UseFont = true;
- this.gvMx2aql0250.Caption = "2.5 ";
+ this.gvMx2aql0250.Caption = "2.5";
this.gvMx2aql0250.FieldName = "aql0250";
this.gvMx2aql0250.MinWidth = 50;
this.gvMx2aql0250.Name = "gvMx2aql0250";
@@ -305,7 +330,7 @@
//
this.gvMx2aql0150.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2aql0150.AppearanceCell.Options.UseFont = true;
- this.gvMx2aql0150.Caption = "1.5 ";
+ this.gvMx2aql0150.Caption = "1.5";
this.gvMx2aql0150.FieldName = "aql0150";
this.gvMx2aql0150.MinWidth = 50;
this.gvMx2aql0150.Name = "gvMx2aql0150";
@@ -318,7 +343,7 @@
//
this.gvMx2aql0100.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2aql0100.AppearanceCell.Options.UseFont = true;
- this.gvMx2aql0100.Caption = "1.0 ";
+ this.gvMx2aql0100.Caption = "1.0";
this.gvMx2aql0100.FieldName = "aql0100";
this.gvMx2aql0100.MinWidth = 50;
this.gvMx2aql0100.Name = "gvMx2aql0100";
@@ -331,7 +356,7 @@
//
this.gvMx2aql0065.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2aql0065.AppearanceCell.Options.UseFont = true;
- this.gvMx2aql0065.Caption = "0.65 ";
+ this.gvMx2aql0065.Caption = "0.65";
this.gvMx2aql0065.FieldName = "aql0065";
this.gvMx2aql0065.MinWidth = 50;
this.gvMx2aql0065.Name = "gvMx2aql0065";
@@ -344,7 +369,7 @@
//
this.gvMx2aql0040.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2aql0040.AppearanceCell.Options.UseFont = true;
- this.gvMx2aql0040.Caption = "0.40 ";
+ this.gvMx2aql0040.Caption = "0.40";
this.gvMx2aql0040.FieldName = "aql0040";
this.gvMx2aql0040.MinWidth = 50;
this.gvMx2aql0040.Name = "gvMx2aql0040";
@@ -357,7 +382,7 @@
//
this.gvMx2aql0025.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2aql0025.AppearanceCell.Options.UseFont = true;
- this.gvMx2aql0025.Caption = "0.25 ";
+ this.gvMx2aql0025.Caption = "0.25";
this.gvMx2aql0025.FieldName = "aql0025";
this.gvMx2aql0025.MinWidth = 50;
this.gvMx2aql0025.Name = "gvMx2aql0025";
@@ -370,7 +395,7 @@
//
this.gvMx2aql0015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2aql0015.AppearanceCell.Options.UseFont = true;
- this.gvMx2aql0015.Caption = "0.15 ";
+ this.gvMx2aql0015.Caption = "0.15";
this.gvMx2aql0015.FieldName = "aql0015";
this.gvMx2aql0015.MinWidth = 50;
this.gvMx2aql0015.Name = "gvMx2aql0015";
@@ -383,7 +408,7 @@
//
this.gvMx2aql0010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2aql0010.AppearanceCell.Options.UseFont = true;
- this.gvMx2aql0010.Caption = "0.10 ";
+ this.gvMx2aql0010.Caption = "0.10";
this.gvMx2aql0010.FieldName = "aql0010";
this.gvMx2aql0010.MinWidth = 50;
this.gvMx2aql0010.Name = "gvMx2aql0010";
@@ -396,7 +421,7 @@
//
this.gvMx2fsampleSizeWord.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2fsampleSizeWord.AppearanceCell.Options.UseFont = true;
- this.gvMx2fsampleSizeWord.Caption = "鏍锋湰澶у皬 ";
+ this.gvMx2fsampleSizeWord.Caption = "鏍锋湰澶у皬";
this.gvMx2fsampleSizeWord.FieldName = "fsampleSizeWord";
this.gvMx2fsampleSizeWord.MinWidth = 50;
this.gvMx2fsampleSizeWord.Name = "gvMx2fsampleSizeWord";
@@ -420,7 +445,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1124, 345);
+ this.tabMxPage2.Size = new System.Drawing.Size(1124, 384);
this.tabMxPage2.Text = "鎶芥牱鏂规";
//
// gcMx2
@@ -429,7 +454,9 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1124, 345);
+ this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemComboBox1});
+ this.gcMx2.Size = new System.Drawing.Size(1124, 384);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -465,163 +492,11 @@
this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx2.OptionsView.ShowGroupPanel = false;
//
- // gvMx1aql1Id
- //
- this.gvMx1aql1Id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1aql1Id.AppearanceCell.Options.UseFont = true;
- this.gvMx1aql1Id.Caption = "AQL鎶芥牱鍩哄噯ID ";
- this.gvMx1aql1Id.FieldName = "aql1Id";
- this.gvMx1aql1Id.MinWidth = 50;
- this.gvMx1aql1Id.Name = "gvMx1aql1Id";
- this.gvMx1aql1Id.Tag = "query_a.AQL1_ID";
- this.gvMx1aql1Id.Width = 94;
- //
- // gvMx1memo
- //
- this.gvMx1memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1memo.AppearanceCell.Options.UseFont = true;
- this.gvMx1memo.Caption = "澶囨敞 ";
- this.gvMx1memo.FieldName = "memo";
- this.gvMx1memo.MinWidth = 50;
- this.gvMx1memo.Name = "gvMx1memo";
- this.gvMx1memo.Tag = "query_a.MEMO";
- this.gvMx1memo.Visible = true;
- this.gvMx1memo.VisibleIndex = 9;
- this.gvMx1memo.Width = 94;
- //
- // gvMx1flevelIii
- //
- this.gvMx1flevelIii.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1flevelIii.AppearanceCell.Options.UseFont = true;
- this.gvMx1flevelIii.Caption = "涓�鑸楠屾按骞硘III ";
- this.gvMx1flevelIii.FieldName = "flevelIii";
- this.gvMx1flevelIii.MinWidth = 50;
- this.gvMx1flevelIii.Name = "gvMx1flevelIii";
- this.gvMx1flevelIii.Tag = "query_a.FLEVEL_III";
- this.gvMx1flevelIii.Visible = true;
- this.gvMx1flevelIii.VisibleIndex = 8;
- this.gvMx1flevelIii.Width = 94;
- //
- // gvMx1flevelIi
- //
- this.gvMx1flevelIi.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1flevelIi.AppearanceCell.Options.UseFont = true;
- this.gvMx1flevelIi.Caption = "涓�鑸楠屾按骞硘II ";
- this.gvMx1flevelIi.FieldName = "flevelIi";
- this.gvMx1flevelIi.MinWidth = 50;
- this.gvMx1flevelIi.Name = "gvMx1flevelIi";
- this.gvMx1flevelIi.Tag = "query_a.FLEVEL_II";
- this.gvMx1flevelIi.Visible = true;
- this.gvMx1flevelIi.VisibleIndex = 7;
- this.gvMx1flevelIi.Width = 94;
- //
- // gvMx1flevelI
- //
- this.gvMx1flevelI.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1flevelI.AppearanceCell.Options.UseFont = true;
- this.gvMx1flevelI.Caption = "涓�鑸楠屾按骞硘I ";
- this.gvMx1flevelI.FieldName = "flevelI";
- this.gvMx1flevelI.MinWidth = 50;
- this.gvMx1flevelI.Name = "gvMx1flevelI";
- this.gvMx1flevelI.Tag = "query_a.FLEVEL_I";
- this.gvMx1flevelI.Visible = true;
- this.gvMx1flevelI.VisibleIndex = 6;
- this.gvMx1flevelI.Width = 94;
- //
- // gvMx1flevelS4
- //
- this.gvMx1flevelS4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1flevelS4.AppearanceCell.Options.UseFont = true;
- this.gvMx1flevelS4.Caption = "鐗规畩妫�楠屾按骞硘S-4 ";
- this.gvMx1flevelS4.FieldName = "flevelS4";
- this.gvMx1flevelS4.MinWidth = 50;
- this.gvMx1flevelS4.Name = "gvMx1flevelS4";
- this.gvMx1flevelS4.Tag = "query_a.FLEVEL_S4";
- this.gvMx1flevelS4.Visible = true;
- this.gvMx1flevelS4.VisibleIndex = 5;
- this.gvMx1flevelS4.Width = 94;
- //
- // gvMx1flevelS3
- //
- this.gvMx1flevelS3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1flevelS3.AppearanceCell.Options.UseFont = true;
- this.gvMx1flevelS3.Caption = "鐗规畩妫�楠屾按骞硘S-3 ";
- this.gvMx1flevelS3.FieldName = "flevelS3";
- this.gvMx1flevelS3.MinWidth = 50;
- this.gvMx1flevelS3.Name = "gvMx1flevelS3";
- this.gvMx1flevelS3.Tag = "query_a.FLEVEL_S3";
- this.gvMx1flevelS3.Visible = true;
- this.gvMx1flevelS3.VisibleIndex = 4;
- this.gvMx1flevelS3.Width = 94;
- //
- // gvMx1flevelS2
- //
- this.gvMx1flevelS2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1flevelS2.AppearanceCell.Options.UseFont = true;
- this.gvMx1flevelS2.Caption = "鐗规畩妫�楠屾按骞硘S-2 ";
- this.gvMx1flevelS2.FieldName = "flevelS2";
- this.gvMx1flevelS2.MinWidth = 50;
- this.gvMx1flevelS2.Name = "gvMx1flevelS2";
- this.gvMx1flevelS2.Tag = "query_a.FLEVEL_S2";
- this.gvMx1flevelS2.Visible = true;
- this.gvMx1flevelS2.VisibleIndex = 3;
- this.gvMx1flevelS2.Width = 94;
- //
- // gvMx1flevelS1
- //
- this.gvMx1flevelS1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1flevelS1.AppearanceCell.Options.UseFont = true;
- this.gvMx1flevelS1.Caption = "鐗规畩妫�楠屾按骞硘S-1 ";
- this.gvMx1flevelS1.FieldName = "flevelS1";
- this.gvMx1flevelS1.MinWidth = 50;
- this.gvMx1flevelS1.Name = "gvMx1flevelS1";
- this.gvMx1flevelS1.Tag = "query_a.FLEVEL_S1";
- this.gvMx1flevelS1.Visible = true;
- this.gvMx1flevelS1.VisibleIndex = 2;
- this.gvMx1flevelS1.Width = 94;
- //
- // gvMx1lotTo
- //
- this.gvMx1lotTo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1lotTo.AppearanceCell.Options.UseFont = true;
- this.gvMx1lotTo.Caption = "鎵归噺缁撴潫 ";
- this.gvMx1lotTo.FieldName = "lotTo";
- this.gvMx1lotTo.MinWidth = 50;
- this.gvMx1lotTo.Name = "gvMx1lotTo";
- this.gvMx1lotTo.Tag = "query_a.LOT_TO";
- this.gvMx1lotTo.Visible = true;
- this.gvMx1lotTo.VisibleIndex = 1;
- this.gvMx1lotTo.Width = 94;
- //
- // gvMx1lotFrom
- //
- this.gvMx1lotFrom.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1lotFrom.AppearanceCell.Options.UseFont = true;
- this.gvMx1lotFrom.Caption = "鎵归噺寮�濮� ";
- this.gvMx1lotFrom.FieldName = "lotFrom";
- this.gvMx1lotFrom.MinWidth = 50;
- this.gvMx1lotFrom.Name = "gvMx1lotFrom";
- this.gvMx1lotFrom.Tag = "query_a.LOT_FROM";
- this.gvMx1lotFrom.Visible = true;
- this.gvMx1lotFrom.VisibleIndex = 0;
- this.gvMx1lotFrom.Width = 94;
- //
- // gvMx1guid
- //
- this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1guid.AppearanceCell.Options.UseFont = true;
- this.gvMx1guid.Caption = "guid ";
- this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 50;
- this.gvMx1guid.Name = "gvMx1guid";
- this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 94;
- //
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 345);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 384);
this.tabMxPage1.Text = "鏍锋湰閲忓瓧鐮�";
//
// gcMx1
@@ -630,8 +505,8 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 345);
- this.gcMx1.TabIndex = 0;
+ this.gcMx1.Size = new System.Drawing.Size(1124, 384);
+ this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
//
@@ -657,24 +532,167 @@
this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
+ // gvMx1guid
+ //
+ this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1guid.AppearanceCell.Options.UseFont = true;
+ this.gvMx1guid.Caption = "guid ";
+ this.gvMx1guid.FieldName = "guid";
+ this.gvMx1guid.MinWidth = 50;
+ this.gvMx1guid.Name = "gvMx1guid";
+ this.gvMx1guid.Tag = "query_a.guid";
+ this.gvMx1guid.Width = 94;
+ //
+ // gvMx1aql1Id
+ //
+ this.gvMx1aql1Id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1aql1Id.AppearanceCell.Options.UseFont = true;
+ this.gvMx1aql1Id.Caption = "AQL鎶芥牱鍩哄噯ID ";
+ this.gvMx1aql1Id.FieldName = "aql1Id";
+ this.gvMx1aql1Id.MinWidth = 50;
+ this.gvMx1aql1Id.Name = "gvMx1aql1Id";
+ this.gvMx1aql1Id.Tag = "query_a.AQL1_ID";
+ this.gvMx1aql1Id.Width = 94;
+ //
+ // gvMx1lotFrom
+ //
+ this.gvMx1lotFrom.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1lotFrom.AppearanceCell.Options.UseFont = true;
+ this.gvMx1lotFrom.Caption = "鎵归噺寮�濮� ";
+ this.gvMx1lotFrom.FieldName = "lotFrom";
+ this.gvMx1lotFrom.MinWidth = 50;
+ this.gvMx1lotFrom.Name = "gvMx1lotFrom";
+ this.gvMx1lotFrom.Tag = "query_a.LOT_FROM";
+ this.gvMx1lotFrom.Visible = true;
+ this.gvMx1lotFrom.VisibleIndex = 0;
+ this.gvMx1lotFrom.Width = 94;
+ //
+ // gvMx1lotTo
+ //
+ this.gvMx1lotTo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1lotTo.AppearanceCell.Options.UseFont = true;
+ this.gvMx1lotTo.Caption = "鎵归噺缁撴潫 ";
+ this.gvMx1lotTo.FieldName = "lotTo";
+ this.gvMx1lotTo.MinWidth = 50;
+ this.gvMx1lotTo.Name = "gvMx1lotTo";
+ this.gvMx1lotTo.Tag = "query_a.LOT_TO";
+ this.gvMx1lotTo.Visible = true;
+ this.gvMx1lotTo.VisibleIndex = 1;
+ this.gvMx1lotTo.Width = 94;
+ //
+ // gvMx1flevelS1
+ //
+ this.gvMx1flevelS1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1flevelS1.AppearanceCell.Options.UseFont = true;
+ this.gvMx1flevelS1.Caption = "鐗规畩妫�楠屾按骞硘S-1 ";
+ this.gvMx1flevelS1.FieldName = "flevelS1";
+ this.gvMx1flevelS1.MinWidth = 50;
+ this.gvMx1flevelS1.Name = "gvMx1flevelS1";
+ this.gvMx1flevelS1.Tag = "query_a.FLEVEL_S1";
+ this.gvMx1flevelS1.Visible = true;
+ this.gvMx1flevelS1.VisibleIndex = 2;
+ this.gvMx1flevelS1.Width = 94;
+ //
+ // gvMx1flevelS2
+ //
+ this.gvMx1flevelS2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1flevelS2.AppearanceCell.Options.UseFont = true;
+ this.gvMx1flevelS2.Caption = "鐗规畩妫�楠屾按骞硘S-2 ";
+ this.gvMx1flevelS2.FieldName = "flevelS2";
+ this.gvMx1flevelS2.MinWidth = 50;
+ this.gvMx1flevelS2.Name = "gvMx1flevelS2";
+ this.gvMx1flevelS2.Tag = "query_a.FLEVEL_S2";
+ this.gvMx1flevelS2.Visible = true;
+ this.gvMx1flevelS2.VisibleIndex = 3;
+ this.gvMx1flevelS2.Width = 94;
+ //
+ // gvMx1flevelS3
+ //
+ this.gvMx1flevelS3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1flevelS3.AppearanceCell.Options.UseFont = true;
+ this.gvMx1flevelS3.Caption = "鐗规畩妫�楠屾按骞硘S-3 ";
+ this.gvMx1flevelS3.FieldName = "flevelS3";
+ this.gvMx1flevelS3.MinWidth = 50;
+ this.gvMx1flevelS3.Name = "gvMx1flevelS3";
+ this.gvMx1flevelS3.Tag = "query_a.FLEVEL_S3";
+ this.gvMx1flevelS3.Visible = true;
+ this.gvMx1flevelS3.VisibleIndex = 4;
+ this.gvMx1flevelS3.Width = 94;
+ //
+ // gvMx1flevelS4
+ //
+ this.gvMx1flevelS4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1flevelS4.AppearanceCell.Options.UseFont = true;
+ this.gvMx1flevelS4.Caption = "鐗规畩妫�楠屾按骞硘S-4 ";
+ this.gvMx1flevelS4.FieldName = "flevelS4";
+ this.gvMx1flevelS4.MinWidth = 50;
+ this.gvMx1flevelS4.Name = "gvMx1flevelS4";
+ this.gvMx1flevelS4.Tag = "query_a.FLEVEL_S4";
+ this.gvMx1flevelS4.Visible = true;
+ this.gvMx1flevelS4.VisibleIndex = 5;
+ this.gvMx1flevelS4.Width = 94;
+ //
+ // gvMx1flevelI
+ //
+ this.gvMx1flevelI.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1flevelI.AppearanceCell.Options.UseFont = true;
+ this.gvMx1flevelI.Caption = "涓�鑸楠屾按骞硘I ";
+ this.gvMx1flevelI.FieldName = "flevelI";
+ this.gvMx1flevelI.MinWidth = 50;
+ this.gvMx1flevelI.Name = "gvMx1flevelI";
+ this.gvMx1flevelI.Tag = "query_a.FLEVEL_I";
+ this.gvMx1flevelI.Visible = true;
+ this.gvMx1flevelI.VisibleIndex = 6;
+ this.gvMx1flevelI.Width = 94;
+ //
+ // gvMx1flevelIi
+ //
+ this.gvMx1flevelIi.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1flevelIi.AppearanceCell.Options.UseFont = true;
+ this.gvMx1flevelIi.Caption = "涓�鑸楠屾按骞硘II ";
+ this.gvMx1flevelIi.FieldName = "flevelIi";
+ this.gvMx1flevelIi.MinWidth = 50;
+ this.gvMx1flevelIi.Name = "gvMx1flevelIi";
+ this.gvMx1flevelIi.Tag = "query_a.FLEVEL_II";
+ this.gvMx1flevelIi.Visible = true;
+ this.gvMx1flevelIi.VisibleIndex = 7;
+ this.gvMx1flevelIi.Width = 94;
+ //
+ // gvMx1flevelIii
+ //
+ this.gvMx1flevelIii.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1flevelIii.AppearanceCell.Options.UseFont = true;
+ this.gvMx1flevelIii.Caption = "涓�鑸楠屾按骞硘III ";
+ this.gvMx1flevelIii.FieldName = "flevelIii";
+ this.gvMx1flevelIii.MinWidth = 50;
+ this.gvMx1flevelIii.Name = "gvMx1flevelIii";
+ this.gvMx1flevelIii.Tag = "query_a.FLEVEL_III";
+ this.gvMx1flevelIii.Visible = true;
+ this.gvMx1flevelIii.VisibleIndex = 8;
+ this.gvMx1flevelIii.Width = 94;
+ //
+ // gvMx1memo
+ //
+ this.gvMx1memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1memo.AppearanceCell.Options.UseFont = true;
+ this.gvMx1memo.Caption = "澶囨敞 ";
+ this.gvMx1memo.FieldName = "memo";
+ this.gvMx1memo.MinWidth = 50;
+ this.gvMx1memo.Name = "gvMx1memo";
+ this.gvMx1memo.Tag = "query_a.MEMO";
+ this.gvMx1memo.Visible = true;
+ this.gvMx1memo.VisibleIndex = 9;
+ this.gvMx1memo.Width = 94;
+ //
// lb_isenabled
//
this.lb_isenabled.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_isenabled.Appearance.Options.UseFont = true;
- this.lb_isenabled.Location = new System.Drawing.Point(796, 65);
+ this.lb_isenabled.Location = new System.Drawing.Point(11, 120);
this.lb_isenabled.Name = "lb_isenabled";
this.lb_isenabled.Size = new System.Drawing.Size(73, 21);
this.lb_isenabled.TabIndex = 280;
this.lb_isenabled.Text = "鏄惁鍙敤 ";
- //
- // txt_isenabled
- //
- this.txt_isenabled.Location = new System.Drawing.Point(875, 62);
- this.txt_isenabled.Name = "txt_isenabled";
- this.txt_isenabled.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_isenabled.Properties.Appearance.Options.UseFont = true;
- this.txt_isenabled.Size = new System.Drawing.Size(150, 28);
- this.txt_isenabled.TabIndex = 280;
//
// gv_isenabled
//
@@ -694,7 +712,7 @@
//
this.lb_fversion.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fversion.Appearance.Options.UseFont = true;
- this.lb_fversion.Location = new System.Drawing.Point(796, 23);
+ this.lb_fversion.Location = new System.Drawing.Point(281, 88);
this.lb_fversion.Name = "lb_fversion";
this.lb_fversion.Size = new System.Drawing.Size(56, 21);
this.lb_fversion.TabIndex = 273;
@@ -702,7 +720,7 @@
//
// txt_fversion
//
- this.txt_fversion.Location = new System.Drawing.Point(875, 20);
+ this.txt_fversion.Location = new System.Drawing.Point(344, 84);
this.txt_fversion.Name = "txt_fversion";
this.txt_fversion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fversion.Properties.Appearance.Options.UseFont = true;
@@ -713,7 +731,7 @@
//
this.gv_fversion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fversion.AppearanceCell.Options.UseFont = true;
- this.gv_fversion.Caption = "鐗堟湰鍙� ";
+ this.gv_fversion.Caption = "鐗堟湰鍙�";
this.gv_fversion.FieldName = "fversion";
this.gv_fversion.MinWidth = 50;
this.gv_fversion.Name = "gv_fversion";
@@ -727,7 +745,7 @@
//
this.lb_ftwoCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftwoCheckdate.Appearance.Options.UseFont = true;
- this.lb_ftwoCheckdate.Location = new System.Drawing.Point(536, 108);
+ this.lb_ftwoCheckdate.Location = new System.Drawing.Point(515, 88);
this.lb_ftwoCheckdate.Name = "lb_ftwoCheckdate";
this.lb_ftwoCheckdate.Size = new System.Drawing.Size(73, 21);
this.lb_ftwoCheckdate.TabIndex = 262;
@@ -735,7 +753,8 @@
//
// txt_ftwoCheckdate
//
- this.txt_ftwoCheckdate.Location = new System.Drawing.Point(624, 105);
+ this.txt_ftwoCheckdate.Enabled = false;
+ this.txt_ftwoCheckdate.Location = new System.Drawing.Point(594, 84);
this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate";
this.txt_ftwoCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true;
@@ -748,19 +767,19 @@
this.gv_ftwoCheckdate.AppearanceCell.Options.UseFont = true;
this.gv_ftwoCheckdate.Caption = "鎵瑰噯鏃ユ湡";
this.gv_ftwoCheckdate.FieldName = "ftwoCheckdate";
- this.gv_ftwoCheckdate.MinWidth = 50;
+ this.gv_ftwoCheckdate.MinWidth = 200;
this.gv_ftwoCheckdate.Name = "gv_ftwoCheckdate";
this.gv_ftwoCheckdate.OptionsColumn.AllowEdit = false;
this.gv_ftwoCheckdate.Tag = "query_a.FTWO_CHECKDATE";
this.gv_ftwoCheckdate.Visible = true;
this.gv_ftwoCheckdate.VisibleIndex = 10;
- this.gv_ftwoCheckdate.Width = 94;
+ this.gv_ftwoCheckdate.Width = 200;
//
// lb_ftwoCheckor
//
this.lb_ftwoCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftwoCheckor.Appearance.Options.UseFont = true;
- this.lb_ftwoCheckor.Location = new System.Drawing.Point(270, 108);
+ this.lb_ftwoCheckor.Location = new System.Drawing.Point(532, 54);
this.lb_ftwoCheckor.Name = "lb_ftwoCheckor";
this.lb_ftwoCheckor.Size = new System.Drawing.Size(56, 21);
this.lb_ftwoCheckor.TabIndex = 258;
@@ -768,7 +787,8 @@
//
// txt_ftwoCheckor
//
- this.txt_ftwoCheckor.Location = new System.Drawing.Point(360, 105);
+ this.txt_ftwoCheckor.Enabled = false;
+ this.txt_ftwoCheckor.Location = new System.Drawing.Point(594, 50);
this.txt_ftwoCheckor.Name = "txt_ftwoCheckor";
this.txt_ftwoCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true;
@@ -793,21 +813,11 @@
//
this.lb_ftwoChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftwoChecked.Appearance.Options.UseFont = true;
- this.lb_ftwoChecked.Location = new System.Drawing.Point(796, 147);
+ this.lb_ftwoChecked.Location = new System.Drawing.Point(515, 20);
this.lb_ftwoChecked.Name = "lb_ftwoChecked";
this.lb_ftwoChecked.Size = new System.Drawing.Size(73, 21);
this.lb_ftwoChecked.TabIndex = 252;
this.lb_ftwoChecked.Text = "鎵瑰噯鏍囪 ";
- //
- // txt_ftwoChecked
- //
- this.txt_ftwoChecked.Enabled = false;
- this.txt_ftwoChecked.Location = new System.Drawing.Point(875, 144);
- this.txt_ftwoChecked.Name = "txt_ftwoChecked";
- this.txt_ftwoChecked.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_ftwoChecked.Properties.Appearance.Options.UseFont = true;
- this.txt_ftwoChecked.Size = new System.Drawing.Size(150, 28);
- this.txt_ftwoChecked.TabIndex = 252;
//
// gv_ftwoChecked
//
@@ -827,7 +837,7 @@
//
this.lb_foneCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_foneCheckdate.Appearance.Options.UseFont = true;
- this.lb_foneCheckdate.Location = new System.Drawing.Point(536, 65);
+ this.lb_foneCheckdate.Location = new System.Drawing.Point(761, 88);
this.lb_foneCheckdate.Name = "lb_foneCheckdate";
this.lb_foneCheckdate.Size = new System.Drawing.Size(73, 21);
this.lb_foneCheckdate.TabIndex = 247;
@@ -835,7 +845,8 @@
//
// txt_foneCheckdate
//
- this.txt_foneCheckdate.Location = new System.Drawing.Point(624, 62);
+ this.txt_foneCheckdate.Enabled = false;
+ this.txt_foneCheckdate.Location = new System.Drawing.Point(837, 84);
this.txt_foneCheckdate.Name = "txt_foneCheckdate";
this.txt_foneCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
@@ -846,21 +857,21 @@
//
this.gv_foneCheckdate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_foneCheckdate.AppearanceCell.Options.UseFont = true;
- this.gv_foneCheckdate.Caption = "瀹℃壒鏃ユ湡 ";
+ this.gv_foneCheckdate.Caption = "瀹℃牳鏃ユ湡";
this.gv_foneCheckdate.FieldName = "foneCheckdate";
- this.gv_foneCheckdate.MinWidth = 50;
+ this.gv_foneCheckdate.MinWidth = 200;
this.gv_foneCheckdate.Name = "gv_foneCheckdate";
this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
this.gv_foneCheckdate.Visible = true;
this.gv_foneCheckdate.VisibleIndex = 8;
- this.gv_foneCheckdate.Width = 94;
+ this.gv_foneCheckdate.Width = 200;
//
// lb_foneCheckor
//
this.lb_foneCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_foneCheckor.Appearance.Options.UseFont = true;
- this.lb_foneCheckor.Location = new System.Drawing.Point(270, 65);
+ this.lb_foneCheckor.Location = new System.Drawing.Point(778, 54);
this.lb_foneCheckor.Name = "lb_foneCheckor";
this.lb_foneCheckor.Size = new System.Drawing.Size(56, 21);
this.lb_foneCheckor.TabIndex = 243;
@@ -868,7 +879,8 @@
//
// txt_foneCheckor
//
- this.txt_foneCheckor.Location = new System.Drawing.Point(360, 62);
+ this.txt_foneCheckor.Enabled = false;
+ this.txt_foneCheckor.Location = new System.Drawing.Point(837, 50);
this.txt_foneCheckor.Name = "txt_foneCheckor";
this.txt_foneCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
@@ -879,7 +891,7 @@
//
this.gv_foneCheckor.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_foneCheckor.AppearanceCell.Options.UseFont = true;
- this.gv_foneCheckor.Caption = "瀹℃壒浜� ";
+ this.gv_foneCheckor.Caption = "瀹℃牳浜�";
this.gv_foneCheckor.FieldName = "foneCheckor";
this.gv_foneCheckor.MinWidth = 50;
this.gv_foneCheckor.Name = "gv_foneCheckor";
@@ -893,27 +905,17 @@
//
this.lb_foneChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_foneChecked.Appearance.Options.UseFont = true;
- this.lb_foneChecked.Location = new System.Drawing.Point(796, 108);
+ this.lb_foneChecked.Location = new System.Drawing.Point(761, 20);
this.lb_foneChecked.Name = "lb_foneChecked";
this.lb_foneChecked.Size = new System.Drawing.Size(73, 21);
this.lb_foneChecked.TabIndex = 240;
this.lb_foneChecked.Text = "瀹℃壒鏍囪 ";
//
- // txt_foneChecked
- //
- this.txt_foneChecked.Enabled = false;
- this.txt_foneChecked.Location = new System.Drawing.Point(875, 101);
- this.txt_foneChecked.Name = "txt_foneChecked";
- this.txt_foneChecked.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_foneChecked.Properties.Appearance.Options.UseFont = true;
- this.txt_foneChecked.Size = new System.Drawing.Size(150, 28);
- this.txt_foneChecked.TabIndex = 240;
- //
// gv_foneChecked
//
this.gv_foneChecked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_foneChecked.AppearanceCell.Options.UseFont = true;
- this.gv_foneChecked.Caption = "瀹℃壒鏍囪 ";
+ this.gv_foneChecked.Caption = "瀹℃牳鏍囪";
this.gv_foneChecked.FieldName = "foneChecked";
this.gv_foneChecked.MinWidth = 50;
this.gv_foneChecked.Name = "gv_foneChecked";
@@ -927,7 +929,7 @@
//
this.lb_memo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_memo.Appearance.Options.UseFont = true;
- this.lb_memo.Location = new System.Drawing.Point(11, 116);
+ this.lb_memo.Location = new System.Drawing.Point(11, 88);
this.lb_memo.Name = "lb_memo";
this.lb_memo.Size = new System.Drawing.Size(73, 21);
this.lb_memo.TabIndex = 231;
@@ -935,7 +937,7 @@
//
// txt_memo
//
- this.txt_memo.Location = new System.Drawing.Point(90, 109);
+ this.txt_memo.Location = new System.Drawing.Point(90, 84);
this.txt_memo.Name = "txt_memo";
this.txt_memo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_memo.Properties.Appearance.Options.UseFont = true;
@@ -946,7 +948,7 @@
//
this.gv_memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_memo.AppearanceCell.Options.UseFont = true;
- this.gv_memo.Caption = "澶囨敞淇℃伅 ";
+ this.gv_memo.Caption = "澶囨敞淇℃伅";
this.gv_memo.FieldName = "memo";
this.gv_memo.MinWidth = 50;
this.gv_memo.Name = "gv_memo";
@@ -960,7 +962,7 @@
//
this.lb_sampleSizeName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_sampleSizeName.Appearance.Options.UseFont = true;
- this.lb_sampleSizeName.Location = new System.Drawing.Point(11, 65);
+ this.lb_sampleSizeName.Location = new System.Drawing.Point(11, 54);
this.lb_sampleSizeName.Name = "lb_sampleSizeName";
this.lb_sampleSizeName.Size = new System.Drawing.Size(73, 21);
this.lb_sampleSizeName.TabIndex = 228;
@@ -968,7 +970,7 @@
//
// txt_sampleSizeName
//
- this.txt_sampleSizeName.Location = new System.Drawing.Point(90, 62);
+ this.txt_sampleSizeName.Location = new System.Drawing.Point(90, 50);
this.txt_sampleSizeName.Name = "txt_sampleSizeName";
this.txt_sampleSizeName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_sampleSizeName.Properties.Appearance.Options.UseFont = true;
@@ -979,7 +981,7 @@
//
this.gv_sampleSizeName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_sampleSizeName.AppearanceCell.Options.UseFont = true;
- this.gv_sampleSizeName.Caption = "鏍囧噯鍚嶇О ";
+ this.gv_sampleSizeName.Caption = "鏍囧噯鍚嶇О";
this.gv_sampleSizeName.FieldName = "sampleSizeName";
this.gv_sampleSizeName.MinWidth = 50;
this.gv_sampleSizeName.Name = "gv_sampleSizeName";
@@ -1001,7 +1003,7 @@
//
// txt_sampleSizeNo
//
- this.txt_sampleSizeNo.Location = new System.Drawing.Point(90, 17);
+ this.txt_sampleSizeNo.Location = new System.Drawing.Point(90, 16);
this.txt_sampleSizeNo.Name = "txt_sampleSizeNo";
this.txt_sampleSizeNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_sampleSizeNo.Properties.Appearance.Options.UseFont = true;
@@ -1012,21 +1014,21 @@
//
this.gv_sampleSizeNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_sampleSizeNo.AppearanceCell.Options.UseFont = true;
- this.gv_sampleSizeNo.Caption = "鏍囧噯缂栫爜 ";
+ this.gv_sampleSizeNo.Caption = "鏍囧噯缂栫爜";
this.gv_sampleSizeNo.FieldName = "sampleSizeNo";
- this.gv_sampleSizeNo.MinWidth = 50;
+ this.gv_sampleSizeNo.MinWidth = 150;
this.gv_sampleSizeNo.Name = "gv_sampleSizeNo";
this.gv_sampleSizeNo.OptionsColumn.AllowEdit = false;
this.gv_sampleSizeNo.Tag = "query_a.SAMPLE_SIZE_NO";
this.gv_sampleSizeNo.Visible = true;
this.gv_sampleSizeNo.VisibleIndex = 4;
- this.gv_sampleSizeNo.Width = 94;
+ this.gv_sampleSizeNo.Width = 150;
//
// lb_createDate
//
this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createDate.Appearance.Options.UseFont = true;
- this.lb_createDate.Location = new System.Drawing.Point(536, 23);
+ this.lb_createDate.Location = new System.Drawing.Point(264, 54);
this.lb_createDate.Name = "lb_createDate";
this.lb_createDate.Size = new System.Drawing.Size(73, 21);
this.lb_createDate.TabIndex = 216;
@@ -1034,7 +1036,8 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(624, 20);
+ this.txt_createDate.Enabled = false;
+ this.txt_createDate.Location = new System.Drawing.Point(344, 50);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
@@ -1045,7 +1048,7 @@
//
this.lb_createName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createName.Appearance.Options.UseFont = true;
- this.lb_createName.Location = new System.Drawing.Point(264, 20);
+ this.lb_createName.Location = new System.Drawing.Point(252, 20);
this.lb_createName.Name = "lb_createName";
this.lb_createName.Size = new System.Drawing.Size(85, 21);
this.lb_createName.TabIndex = 213;
@@ -1053,18 +1056,20 @@
//
// txt_createName
//
- this.txt_createName.Location = new System.Drawing.Point(360, 20);
+ this.txt_createName.Enabled = false;
+ this.txt_createName.Location = new System.Drawing.Point(344, 16);
this.txt_createName.Name = "txt_createName";
this.txt_createName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createName.Properties.Appearance.Options.UseFont = true;
this.txt_createName.Size = new System.Drawing.Size(150, 28);
this.txt_createName.TabIndex = 213;
+
//
// gv_createName
//
this.gv_createName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_createName.AppearanceCell.Options.UseFont = true;
- this.gv_createName.Caption = "鍒朵綔浜哄鍚� ";
+ this.gv_createName.Caption = "鍒朵綔浜哄鍚�";
this.gv_createName.FieldName = "createName";
this.gv_createName.MinWidth = 50;
this.gv_createName.Name = "gv_createName";
@@ -1182,10 +1187,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 193);
+ this.tabMx.Location = new System.Drawing.Point(0, 154);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 377);
+ this.tabMx.Size = new System.Drawing.Size(1126, 416);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1194,9 +1199,11 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_ftwoChecked);
+ this.panel1.Controls.Add(this.txt_foneChecked);
+ this.panel1.Controls.Add(this.txt_isenabled);
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_isenabled);
- this.panel1.Controls.Add(this.txt_isenabled);
this.panel1.Controls.Add(this.lb_fversion);
this.panel1.Controls.Add(this.txt_fversion);
this.panel1.Controls.Add(this.lb_ftwoCheckdate);
@@ -1204,13 +1211,11 @@
this.panel1.Controls.Add(this.lb_ftwoCheckor);
this.panel1.Controls.Add(this.txt_ftwoCheckor);
this.panel1.Controls.Add(this.lb_ftwoChecked);
- this.panel1.Controls.Add(this.txt_ftwoChecked);
this.panel1.Controls.Add(this.lb_foneCheckdate);
this.panel1.Controls.Add(this.txt_foneCheckdate);
this.panel1.Controls.Add(this.lb_foneCheckor);
this.panel1.Controls.Add(this.txt_foneCheckor);
this.panel1.Controls.Add(this.lb_foneChecked);
- this.panel1.Controls.Add(this.txt_foneChecked);
this.panel1.Controls.Add(this.lb_memo);
this.panel1.Controls.Add(this.txt_memo);
this.panel1.Controls.Add(this.lb_sampleSizeName);
@@ -1225,8 +1230,34 @@
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(1126, 193);
+ this.panel1.Size = new System.Drawing.Size(1126, 154);
this.panel1.TabIndex = 1;
+ //
+ // txt_ftwoChecked
+ //
+ this.txt_ftwoChecked.Enabled = false;
+ this.txt_ftwoChecked.Location = new System.Drawing.Point(594, 18);
+ this.txt_ftwoChecked.Name = "txt_ftwoChecked";
+ this.txt_ftwoChecked.Properties.Caption = "";
+ this.txt_ftwoChecked.Size = new System.Drawing.Size(94, 24);
+ this.txt_ftwoChecked.TabIndex = 283;
+ //
+ // txt_foneChecked
+ //
+ this.txt_foneChecked.Enabled = false;
+ this.txt_foneChecked.Location = new System.Drawing.Point(837, 18);
+ this.txt_foneChecked.Name = "txt_foneChecked";
+ this.txt_foneChecked.Properties.Caption = "";
+ this.txt_foneChecked.Size = new System.Drawing.Size(94, 24);
+ this.txt_foneChecked.TabIndex = 282;
+ //
+ // txt_isenabled
+ //
+ this.txt_isenabled.Location = new System.Drawing.Point(90, 120);
+ this.txt_isenabled.Name = "txt_isenabled";
+ this.txt_isenabled.Properties.Caption = "";
+ this.txt_isenabled.Size = new System.Drawing.Size(94, 24);
+ this.txt_isenabled.TabIndex = 281;
//
// lbGuid
//
@@ -1244,20 +1275,18 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesQmAql1";
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fversion.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckdate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckor.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckdate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sampleSizeName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sampleSizeNo.Properties)).EndInit();
@@ -1273,6 +1302,9 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -1313,24 +1345,9 @@
private DevExpress.XtraTab.XtraTabPage tabMxPage2;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1aql1Id;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelIii;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelIi;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelI;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelS4;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelS3;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelS2;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelS1;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotTo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotFrom;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraEditors.LabelControl lb_isenabled;
- private DevExpress.XtraEditors.TextEdit txt_isenabled;
private DevExpress.XtraGrid.Columns.GridColumn gv_isenabled;
private DevExpress.XtraEditors.LabelControl lb_fversion;
@@ -1346,7 +1363,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_ftwoCheckor;
private DevExpress.XtraEditors.LabelControl lb_ftwoChecked;
- private DevExpress.XtraEditors.TextEdit txt_ftwoChecked;
private DevExpress.XtraGrid.Columns.GridColumn gv_ftwoChecked;
private DevExpress.XtraEditors.LabelControl lb_foneCheckdate;
@@ -1358,7 +1374,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_foneCheckor;
private DevExpress.XtraEditors.LabelControl lb_foneChecked;
- private DevExpress.XtraEditors.TextEdit txt_foneChecked;
private DevExpress.XtraGrid.Columns.GridColumn gv_foneChecked;
private DevExpress.XtraEditors.LabelControl lb_memo;
@@ -1380,6 +1395,23 @@
private DevExpress.XtraEditors.TextEdit txt_createName;
private DevExpress.XtraGrid.Columns.GridColumn gv_createName;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
-
+ private DevExpress.XtraEditors.CheckEdit txt_isenabled;
+ private DevExpress.XtraEditors.CheckEdit txt_foneChecked;
+ private DevExpress.XtraEditors.CheckEdit txt_ftwoChecked;
+ private DevExpress.XtraGrid.GridControl gcMx1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1aql1Id;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotFrom;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotTo;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelS1;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelS2;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelS3;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelS4;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelI;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelIi;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelIii;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index 129ea9d..c57c9f3 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -1,5 +1,4 @@
using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.DevFrm.QC.Models;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -26,11 +25,9 @@
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
- this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
-
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
getPageList(1, UtilityHelper.GetPageSize());
pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -49,14 +46,16 @@
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
}
-
+ /// <summary>
+ /// 鎵瑰噯
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e)
{
- //鎵瑰噯
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
lbGuid, txt_sampleSizeNo, gridView1);
-
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "Approval", JsonConvert.SerializeObject(rowGuid));
@@ -72,7 +71,6 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
/// <summary>
@@ -125,17 +123,6 @@
getPageList(curPage, pageSize);
}
/// <summary>
- /// 鏌ヨ浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
- {
- Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
- }
- /// <summary>
/// 鏌ヨ鍥炶皟
/// </summary>
/// <param name="sender"></param>
@@ -164,7 +151,7 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -210,7 +197,7 @@
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -227,29 +214,13 @@
{
UtilityHelper.JumpToTab(xtraTabControl1, 1);
lbGuid.Text = "";
-
List<GridView> gridViews = new List<GridView>();
gridViews.Add(gvMx1);
+ gridViews.Add(gvMx2);
UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
- UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
-
+ UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
txt_createDate.Text = DateTime.Now.ToString("G");
- txt_createDate.Enabled = false;
-
- txt_ftwoChecked.Text = "False";
- txt_ftwoChecked.Enabled = false;
- txt_isenabled.Text = "False";
- txt_isenabled.Enabled = false;
- txt_foneChecked.Text = "False";
- txt_foneChecked.Enabled = false;
-
- txt_createName.Enabled = false;
- txt_foneCheckor.Enabled = false;
- txt_ftwoCheckor.Enabled = false;
-
- txt_ftwoCheckdate.Enabled = false;
- txt_foneCheckdate.Enabled = false;
-
txt_fversion.Text = "1";
}
/// <summary>
@@ -273,13 +244,10 @@
txt_sampleSizeName.Focus();
return;
}
-
gvMx1.CloseEditor();
gvMx1.UpdateCurrentRow();
-
gvMx2.CloseEditor();
gvMx2.UpdateCurrentRow();
-
var qmaql2 = new List<MesQmAql2>();
for (var i = 0; i < gvMx1.DataRowCount; i++)
{
@@ -288,19 +256,18 @@
qmaql2.Add(new MesQmAql2
{
Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
- LotFrom = Convert.ToInt32(row["LotFrom"].ToString()),
- LotTo = Convert.ToInt32(row["LotTo"].ToString()),
- FlevelS1 = row["FlevelS1"].ToString(),
- FlevelS2 = row["FlevelS2"].ToString(),
- FlevelS3 = row["FlevelS3"].ToString(),
- FlevelS4 = row["FlevelS4"].ToString(),
- FlevelI = row["FlevelI"].ToString(),
+ LotFrom = Convert.ToInt32(row["LotFrom"].ToString()),
+ LotTo = Convert.ToInt32(row["LotTo"].ToString()),
+ FlevelS1 = row["FlevelS1"].ToString(),
+ FlevelS2 = row["FlevelS2"].ToString(),
+ FlevelS3 = row["FlevelS3"].ToString(),
+ FlevelS4 = row["FlevelS4"].ToString(),
+ FlevelI = row["FlevelI"].ToString(),
FlevelIi = row["FlevelIi"].ToString(),
FlevelIii = row["FlevelIii"].ToString(),
Memo = row["Memo"].ToString()
});
}
-
var qmaql3 = new List<MesQmAql3>();
for (var i = 0; i < gvMx2.DataRowCount; i++)
{
@@ -310,7 +277,7 @@
{
Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
FsampleSizeWord = Convert.ToInt32(row["FsampleSizeWord"].ToString()),
- SampleSizeWord = row["SampleSizeWord"].ToString(),
+ SampleSizeWord = row["SampleSizeWord"].ToString(),
Aql00010 = Convert.ToInt32(row["Aql00010"].ToString()),
Aql00015 = Convert.ToInt32(row["Aql00015"].ToString()),
Aql00025 = Convert.ToInt32(row["Aql00025"].ToString()),
@@ -330,7 +297,16 @@
Memo = row["Memo"].ToString()
});
}
-
+ if (qmaql2.Count <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鏍锋湰閲忓瓙鐮佷笉鑳戒负绌猴紒");
+ return;
+ }
+ if (qmaql3.Count <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥牱鏂规涓嶈兘涓虹┖锛�");
+ return;
+ }
var _obj = new MesQmAql1
{
Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
@@ -341,7 +317,7 @@
FtwoChecked = false,
Isenabled = false,
FoneChecked = false,
- Fversion = Convert.ToInt32(txt_fversion.Text.Trim()),
+ Fversion = Convert.ToInt32(txt_fversion.Text.Trim()),
MesQmAql2s = qmaql2,
MesQmAql3s = qmaql3
};
@@ -354,7 +330,10 @@
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ List<GridView> gridViews = new List<GridView>();
+ gridViews.Add(gvMx1);
+ gridViews.Add(gvMx2);
+ UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gridViews);
}
}
catch (Exception ex)
@@ -435,7 +414,6 @@
{
array.Add(a);
}
-
DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
if (dt.Rows.Count > 0)
{
@@ -464,8 +442,6 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
}
-
-
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -476,5 +452,6 @@
}
}
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
index bc4cdde..070fd60 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -51,7 +51,6 @@
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_tname = new DevExpress.XtraEditors.LabelControl();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.lb_isenabled = new DevExpress.XtraEditors.LabelControl();
@@ -96,7 +95,7 @@
this.panel1 = new System.Windows.Forms.Panel();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
- this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
+ this.txt_ItemId = new Gs.DevApp.UserControl.UcLookItems();
this.txt_isenabled = new DevExpress.XtraEditors.CheckEdit();
this.txt_ftwoChecked = new DevExpress.XtraEditors.CheckEdit();
this.txt_foneChecked = new DevExpress.XtraEditors.CheckEdit();
@@ -340,7 +339,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 362);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 371);
this.tabMxPage1.Text = "鏄庣粏1";
//
// gcMx1
@@ -355,7 +354,7 @@
this.rptJYBZ,
this.rptJSSP,
this.rptJYSP});
- this.gcMx1.Size = new System.Drawing.Size(1124, 362);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 371);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -376,8 +375,7 @@
this.gvMx1facLevel,
this.gvMx1fupAllow,
this.gvMx1fstand,
- this.gvMx1fdownAllow,
- this.gridColumn7});
+ this.gvMx1fdownAllow});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -405,16 +403,6 @@
this.gridColumn6.VisibleIndex = 6;
this.gridColumn6.Width = 150;
//
- // gridColumn7
- //
- this.gridColumn7.Caption = "澶囨敞";
- this.gridColumn7.FieldName = "funit";
- this.gridColumn7.MinWidth = 150;
- this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 12;
- this.gridColumn7.Width = 150;
- //
// lb_tname
//
this.lb_tname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -438,7 +426,7 @@
//
this.lb_isenabled.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_isenabled.Appearance.Options.UseFont = true;
- this.lb_isenabled.Location = new System.Drawing.Point(881, 134);
+ this.lb_isenabled.Location = new System.Drawing.Point(601, 131);
this.lb_isenabled.Name = "lb_isenabled";
this.lb_isenabled.Size = new System.Drawing.Size(73, 21);
this.lb_isenabled.TabIndex = 306;
@@ -462,7 +450,7 @@
//
this.lb_fversion.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fversion.Appearance.Options.UseFont = true;
- this.lb_fversion.Location = new System.Drawing.Point(915, 20);
+ this.lb_fversion.Location = new System.Drawing.Point(389, 131);
this.lb_fversion.Name = "lb_fversion";
this.lb_fversion.Size = new System.Drawing.Size(39, 21);
this.lb_fversion.TabIndex = 298;
@@ -470,11 +458,11 @@
//
// txt_fversion
//
- this.txt_fversion.Location = new System.Drawing.Point(962, 16);
+ this.txt_fversion.Location = new System.Drawing.Point(433, 127);
this.txt_fversion.Name = "txt_fversion";
this.txt_fversion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fversion.Properties.Appearance.Options.UseFont = true;
- this.txt_fversion.Size = new System.Drawing.Size(80, 28);
+ this.txt_fversion.Size = new System.Drawing.Size(150, 28);
this.txt_fversion.TabIndex = 298;
//
// gv_fversion
@@ -495,7 +483,7 @@
//
this.lb_ftwoCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftwoCheckdate.Appearance.Options.UseFont = true;
- this.lb_ftwoCheckdate.Location = new System.Drawing.Point(605, 94);
+ this.lb_ftwoCheckdate.Location = new System.Drawing.Point(601, 53);
this.lb_ftwoCheckdate.Name = "lb_ftwoCheckdate";
this.lb_ftwoCheckdate.Size = new System.Drawing.Size(73, 21);
this.lb_ftwoCheckdate.TabIndex = 285;
@@ -503,18 +491,18 @@
//
// txt_ftwoCheckdate
//
- this.txt_ftwoCheckdate.Location = new System.Drawing.Point(680, 90);
+ this.txt_ftwoCheckdate.Location = new System.Drawing.Point(674, 49);
this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate";
this.txt_ftwoCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true;
- this.txt_ftwoCheckdate.Size = new System.Drawing.Size(178, 28);
+ this.txt_ftwoCheckdate.Size = new System.Drawing.Size(150, 28);
this.txt_ftwoCheckdate.TabIndex = 285;
//
// lb_ftwoCheckor
//
this.lb_ftwoCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftwoCheckor.Appearance.Options.UseFont = true;
- this.lb_ftwoCheckor.Location = new System.Drawing.Point(371, 94);
+ this.lb_ftwoCheckor.Location = new System.Drawing.Point(618, 19);
this.lb_ftwoCheckor.Name = "lb_ftwoCheckor";
this.lb_ftwoCheckor.Size = new System.Drawing.Size(56, 21);
this.lb_ftwoCheckor.TabIndex = 280;
@@ -522,7 +510,7 @@
//
// txt_ftwoCheckor
//
- this.txt_ftwoCheckor.Location = new System.Drawing.Point(433, 90);
+ this.txt_ftwoCheckor.Location = new System.Drawing.Point(674, 15);
this.txt_ftwoCheckor.Name = "txt_ftwoCheckor";
this.txt_ftwoCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true;
@@ -547,7 +535,7 @@
//
this.lb_ftwoChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftwoChecked.Appearance.Options.UseFont = true;
- this.lb_ftwoChecked.Location = new System.Drawing.Point(881, 94);
+ this.lb_ftwoChecked.Location = new System.Drawing.Point(601, 93);
this.lb_ftwoChecked.Name = "lb_ftwoChecked";
this.lb_ftwoChecked.Size = new System.Drawing.Size(73, 21);
this.lb_ftwoChecked.TabIndex = 273;
@@ -571,7 +559,7 @@
//
this.lb_foneCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_foneCheckdate.Appearance.Options.UseFont = true;
- this.lb_foneCheckdate.Location = new System.Drawing.Point(606, 59);
+ this.lb_foneCheckdate.Location = new System.Drawing.Point(838, 53);
this.lb_foneCheckdate.Name = "lb_foneCheckdate";
this.lb_foneCheckdate.Size = new System.Drawing.Size(73, 21);
this.lb_foneCheckdate.TabIndex = 267;
@@ -579,7 +567,7 @@
//
// txt_foneCheckdate
//
- this.txt_foneCheckdate.Location = new System.Drawing.Point(680, 55);
+ this.txt_foneCheckdate.Location = new System.Drawing.Point(917, 49);
this.txt_foneCheckdate.Name = "txt_foneCheckdate";
this.txt_foneCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
@@ -604,7 +592,7 @@
//
this.lb_foneCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_foneCheckor.Appearance.Options.UseFont = true;
- this.lb_foneCheckor.Location = new System.Drawing.Point(373, 59);
+ this.lb_foneCheckor.Location = new System.Drawing.Point(855, 19);
this.lb_foneCheckor.Name = "lb_foneCheckor";
this.lb_foneCheckor.Size = new System.Drawing.Size(56, 21);
this.lb_foneCheckor.TabIndex = 262;
@@ -612,7 +600,7 @@
//
// txt_foneCheckor
//
- this.txt_foneCheckor.Location = new System.Drawing.Point(433, 55);
+ this.txt_foneCheckor.Location = new System.Drawing.Point(917, 15);
this.txt_foneCheckor.Name = "txt_foneCheckor";
this.txt_foneCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
@@ -637,7 +625,7 @@
//
this.lb_foneChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_foneChecked.Appearance.Options.UseFont = true;
- this.lb_foneChecked.Location = new System.Drawing.Point(881, 59);
+ this.lb_foneChecked.Location = new System.Drawing.Point(838, 93);
this.lb_foneChecked.Name = "lb_foneChecked";
this.lb_foneChecked.Size = new System.Drawing.Size(73, 21);
this.lb_foneChecked.TabIndex = 258;
@@ -699,7 +687,7 @@
//
this.lb_memo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_memo.Appearance.Options.UseFont = true;
- this.lb_memo.Location = new System.Drawing.Point(385, 135);
+ this.lb_memo.Location = new System.Drawing.Point(389, 93);
this.lb_memo.Name = "lb_memo";
this.lb_memo.Size = new System.Drawing.Size(39, 21);
this.lb_memo.TabIndex = 219;
@@ -707,7 +695,7 @@
//
// txt_memo
//
- this.txt_memo.Location = new System.Drawing.Point(433, 131);
+ this.txt_memo.Location = new System.Drawing.Point(433, 89);
this.txt_memo.Name = "txt_memo";
this.txt_memo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_memo.Properties.Appearance.Options.UseFont = true;
@@ -882,10 +870,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 176);
+ this.tabMx.Location = new System.Drawing.Point(0, 167);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 394);
+ this.tabMx.Size = new System.Drawing.Size(1126, 403);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -895,7 +883,7 @@
this.panel1.BackColor = System.Drawing.Color.White;
this.panel1.Controls.Add(this.btnSelect);
this.panel1.Controls.Add(this.txt_itemModel);
- this.panel1.Controls.Add(this.txt_itemId);
+ this.panel1.Controls.Add(this.txt_ItemId);
this.panel1.Controls.Add(this.txt_isenabled);
this.panel1.Controls.Add(this.txt_ftwoChecked);
this.panel1.Controls.Add(this.txt_foneChecked);
@@ -927,13 +915,13 @@
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(1126, 176);
+ this.panel1.Size = new System.Drawing.Size(1126, 167);
this.panel1.TabIndex = 1;
//
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(606, 131);
+ this.btnSelect.Location = new System.Drawing.Point(722, 126);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(85, 29);
this.btnSelect.TabIndex = 449;
@@ -949,17 +937,17 @@
this.txt_itemModel.TabIndex = 381;
this.txt_itemModel.Tag = "itemName";
//
- // txt_itemId
+ // txt_ItemId
//
- this.txt_itemId.KeyFile = "";
- this.txt_itemId.Location = new System.Drawing.Point(85, 14);
- this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Size = new System.Drawing.Size(262, 33);
- this.txt_itemId.TabIndex = 380;
+ this.txt_ItemId.KeyFile = "";
+ this.txt_ItemId.Location = new System.Drawing.Point(85, 14);
+ this.txt_ItemId.Name = "txt_ItemId";
+ this.txt_ItemId.Size = new System.Drawing.Size(262, 33);
+ this.txt_ItemId.TabIndex = 380;
//
// txt_isenabled
//
- this.txt_isenabled.Location = new System.Drawing.Point(960, 132);
+ this.txt_isenabled.Location = new System.Drawing.Point(674, 129);
this.txt_isenabled.Name = "txt_isenabled";
this.txt_isenabled.Properties.Caption = "";
this.txt_isenabled.Size = new System.Drawing.Size(27, 24);
@@ -967,7 +955,7 @@
//
// txt_ftwoChecked
//
- this.txt_ftwoChecked.Location = new System.Drawing.Point(962, 92);
+ this.txt_ftwoChecked.Location = new System.Drawing.Point(674, 91);
this.txt_ftwoChecked.Name = "txt_ftwoChecked";
this.txt_ftwoChecked.Properties.Caption = "";
this.txt_ftwoChecked.Size = new System.Drawing.Size(94, 24);
@@ -975,7 +963,7 @@
//
// txt_foneChecked
//
- this.txt_foneChecked.Location = new System.Drawing.Point(962, 57);
+ this.txt_foneChecked.Location = new System.Drawing.Point(917, 91);
this.txt_foneChecked.Name = "txt_foneChecked";
this.txt_foneChecked.Properties.Caption = "";
this.txt_foneChecked.Size = new System.Drawing.Size(94, 24);
@@ -995,7 +983,7 @@
//
this.labelCreateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelCreateDate.Appearance.Options.UseFont = true;
- this.labelCreateDate.Location = new System.Drawing.Point(606, 20);
+ this.labelCreateDate.Location = new System.Drawing.Point(360, 59);
this.labelCreateDate.Name = "labelCreateDate";
this.labelCreateDate.Size = new System.Drawing.Size(68, 21);
this.labelCreateDate.TabIndex = 373;
@@ -1003,11 +991,11 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(680, 16);
+ this.txt_createDate.Location = new System.Drawing.Point(433, 55);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(178, 28);
+ this.txt_createDate.Size = new System.Drawing.Size(150, 28);
this.txt_createDate.TabIndex = 374;
//
// labelUserName
@@ -1153,7 +1141,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraEditors.LabelControl labelCreateDate;
private DevExpress.XtraEditors.TextEdit txt_createDate;
private DevExpress.XtraEditors.LabelControl labelUserName;
@@ -1162,7 +1149,7 @@
private DevExpress.XtraEditors.CheckEdit txt_foneChecked;
private DevExpress.XtraEditors.CheckEdit txt_ftwoChecked;
private DevExpress.XtraEditors.CheckEdit txt_isenabled;
- private UserControl.UcLookItems txt_itemId;
+ private UserControl.UcLookItems txt_ItemId;
private DevExpress.XtraEditors.MemoEdit txt_itemModel;
private DevExpress.XtraEditors.SimpleButton btnSelect;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYXM;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index 70105df..77c006b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -204,11 +204,11 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- string _ItemId = txt_itemId.GetId()
-; if (string.IsNullOrEmpty(_ItemId))
+ string _ItemId = txt_ItemId.GetId()
+; if (string.IsNullOrEmpty(_ItemId))
{
MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�");
- // txt_account.Focus();
+ txt_ItemId.Focus();
return;
}
gvMx1.CloseEditor();
@@ -220,7 +220,7 @@
if (row != null)
lst.Add(new MesQmCheckitemDt
{
- Guid = null,
+ Guid = UtilityHelper.ToGuid(row["guid"].ToString()),
Forder = 1,
FcheckItem = row["FcheckItem"].ToString(),
SampleSizeNo = row["SampleSizeNo"].ToString(),
@@ -228,18 +228,22 @@
FcheckLevel = row["FcheckLevel"].ToString(),
Fstand = row["Fstand"].ToString(),
FacLevel = row["FacLevel"].ToString(),
+ FspecRequ = row["FspecRequ"].ToString(),
+ Memo = row["memo"].ToString(),
+ FupAllow = row["FupAllow"].ToString(),
+ FdownAllow = row["FdownAllow"].ToString(),
});
}
var _obj = new MesQmCheckitem
{
Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
+ ItemId= long.Parse( _ItemId),
Memo = txt_memo.Text.Trim(),
ItemNo = txt_itemNo.Text.Trim(),
- IsEnabled = txt_isenabled.Checked,
+ Isenabled = txt_isenabled.Checked,
list = lst
};
-
try
{
var strJson = UtilityHelper.HttpPost("",
@@ -282,7 +286,8 @@
try
{
var strReturn = UtilityHelper.HttpPost("",
- _webServiceName + "GetListPageIQC", json);
+ // _webServiceName + "GetListPageIQC", json);
+ _webServiceName + "GetListPage", json);
var dd =
UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
@@ -325,7 +330,8 @@
try
{
var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "GetModelIQC",
+ // _webServiceName + "GetModelIQC",
+ _webServiceName + "GetModel",
JsonConvert.SerializeObject(_obj));
var _rtn =
UtilityHelper.ReturnToDynamic(strJson);
@@ -423,11 +429,11 @@
private void _setIno()
{
- txt_itemId.KeyFile = "id";
- txt_itemId.EditChanged += (s, e) =>
+ txt_ItemId.KeyFile = "id";
+ txt_ItemId.EditChanged += (s, e) =>
{
- txt_itemModel.Text = this.txt_itemId.GetModel();
- txt_itemNo.Text = this.txt_itemId.GetCode();
+ txt_itemModel.Text = this.txt_ItemId.GetModel();
+ txt_itemNo.Text = this.txt_ItemId.GetCode();
};
btnSelect.Click += (s, e) =>
{
@@ -577,8 +583,8 @@
}
}
+
#endregion
-
-
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs
index 61f370f..4060c69 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs
@@ -1,191 +1,186 @@
锘縰sing System;
using System.Collections.Generic;
-
-namespace Gs.DevApp.DevFrm.QC.Models
+
+namespace MES.Service.Modes
{
/// <summary>
- /// IQC銆丱QC妫�楠岄」鐩�
- /// </summary>
+ /// IQC銆丱QC妫�楠岄」鐩�
+ ///</summary>
+
public class MesQmCheckitem
{
/// <summary>
- /// 榛樿鍊�: (newid())
- /// </summary>
- public Guid Guid { get; set; }
-
+ ///
+ /// 榛樿鍊�: (newid())
+ ///</summary>
+
+ public Guid Guid { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- public string CreateBy { get; set; }
-
+ /// 鍒涘缓浜�
+ ///</summary>
+
+ public string CreateBy { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- public DateTime? CreateDate { get; set; }
-
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
+
+ public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- public string LastUpdateBy { get; set; }
-
+ /// 鏈�鍚庢洿鏂颁汉
+ ///</summary>
+
+ public string LastupdateBy { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- public DateTime? LastupdateDate { get; set; }
-
+ /// 鏈�鍚庢洿鏂版椂闂�
+ ///</summary>
+
+ public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 澶囨敞
- /// </summary>
- public string Memo { get; set; }
-
+ /// 澶囨敞
+ ///</summary>
+
+ public string Memo { get; set; }
/// <summary>
- /// 鐗╂枡浜у搧缂栫爜
- /// </summary>
- public string ItemNo { get; set; }
-
+ /// 鐗╂枡浜у搧缂栫爜
+ ///</summary>
+
+ public string ItemNo { get; set; }
/// <summary>
- /// 鍒嗙被
- /// </summary>
- public string Ftype { get; set; }
-
+ /// 鍒嗙被
+ ///</summary>
+
+ public string Ftype { get; set; }
/// <summary>
- /// 椤圭洰鍒嗙被(1:鎶芥 2:宸℃ 3:瀹屽伐妫�楠�)
- /// </summary>
- public string CheckType { get; set; }
-
+ /// 椤圭洰鍒嗙被(1:鎶芥 2:宸℃ 3:瀹屽伐妫�楠�)
+ ///</summary>
+
+ public string CheckType { get; set; }
/// <summary>
- /// 瀹㈡埛鍚嶇О
- /// </summary>
- public string Name1 { get; set; }
-
+ /// 瀹㈡埛鍚嶇О
+ ///</summary>
+
+ public string Name1 { get; set; }
/// <summary>
- /// 鐗规畩瑙勬牸鐗╂枡
- /// </summary>
- public long? FspecialItem { get; set; }
-
+ /// 鐗规畩瑙勬牸鐗╂枡
+ ///</summary>
+
+ public long? FspecialItem { get; set; }
/// <summary>
- /// 鎵�灞炲伐鍘�
- /// </summary>
- public string Factory { get; set; }
-
+ /// 鎵�灞炲伐鍘�
+ ///</summary>
+
+ public string Factory { get; set; }
/// <summary>
- /// 妫�楠屾按鍑�
- /// </summary>
- public string FInspectionLevel { get; set; }
-
+ /// 妫�楠屾按鍑�
+ ///</summary>
+
+ public string FinspectionLevel { get; set; }
/// <summary>
- /// 妫�楠屾按骞�
- /// </summary>
- public string FcheckLevel { get; set; }
-
+ /// 妫�楠屾按骞�
+ ///</summary>
+
+ public string FcheckLevel { get; set; }
/// <summary>
- /// 鎺ユ敹姘村钩
- /// </summary>
- public string FreceivingLevel { get; set; }
-
+ /// 鎺ユ敹姘村钩
+ ///</summary>
+
+ public string FreceivingLevel { get; set; }
/// <summary>
- /// 瀹℃壒鏍囪
- /// 榛樿鍊�: ((0))
- /// </summary>
- public bool? FOneChecked { get; set; }
-
+ /// 瀹℃壒鏍囪
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
+ public bool? FoneChecked { get; set; }
/// <summary>
- /// 瀹℃壒浜�
- /// </summary>
- public string FOneCheckor { get; set; }
-
+ /// 瀹℃壒浜�
+ ///</summary>
+
+ public string FoneCheckor { get; set; }
/// <summary>
- /// 瀹℃壒鏃ユ湡
- /// </summary>
- public DateTime? FOneCheckDate { get; set; }
-
+ /// 瀹℃壒鏃ユ湡
+ ///</summary>
+
+ public DateTime? FoneCheckdate { get; set; }
/// <summary>
- /// 鎵瑰噯鏍囪
- /// 榛樿鍊�: ((0))
- /// </summary>
- public bool? FTwoChecked { get; set; }
-
+ /// 鎵瑰噯鏍囪
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
+ public bool? FtwoChecked { get; set; }
/// <summary>
- /// 鎵瑰噯浜�
- /// </summary>
- public string FTwoCheckor { get; set; }
-
+ /// 鎵瑰噯浜�
+ ///</summary>
+
+ public string FtwoCheckor { get; set; }
/// <summary>
- /// 鎵瑰噯鏃ユ湡
- /// </summary>
- public DateTime? FTwoCheckDate { get; set; }
-
+ /// 鎵瑰噯鏃ユ湡
+ ///</summary>
+
+ public DateTime? FtwoCheckdate { get; set; }
/// <summary>
- /// 淇敼/ 鏂板鐘舵��
- /// 榛樿鍊�: ((0))
- /// </summary>
- public bool? EditStatus { get; set; }
-
+ /// 淇敼/ 鏂板鐘舵��
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
+ public bool? EditStatus { get; set; }
/// <summary>
- /// 鐗堟湰
- /// 榛樿鍊�: ((0))
- /// </summary>
- public long? FVersion { get; set; }
-
+ /// 鐗堟湰
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
+ public long? Fversion { get; set; }
/// <summary>
- /// 鏄惁鍙敤
- /// 榛樿鍊�: ((0))
- /// </summary>
- public bool? IsEnabled { get; set; }
-
+ /// 鏄惁鍙敤
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
+ public bool? Isenabled { get; set; }
/// <summary>
- /// </summary>
- public string Company { get; set; }
-
+ ///
+ ///</summary>
+
+ public string Company { get; set; }
/// <summary>
- /// 瀹㈡埛缂栫爜
- /// </summary>
- public string Kunnr { get; set; }
-
+ /// 瀹㈡埛缂栫爜
+ ///</summary>
+
+ public string Kunnr { get; set; }
/// <summary>
- /// 鏈�澶ф娊妫�鏁�
- /// </summary>
- public long? MaxCheckQty { get; set; }
-
+ /// 鏈�澶ф娊妫�鏁�
+ ///</summary>
+
+ public long? MaxCheckQty { get; set; }
/// <summary>
- /// 鎻愰啋娆℃暟
- /// </summary>
- public long? RemQty { get; set; }
-
+ /// 鎻愰啋娆℃暟
+ ///</summary>
+
+ public long? RemQty { get; set; }
/// <summary>
- /// 鏈璇佺墿鏂�
- /// </summary>
- public bool? Otherflag { get; set; }
-
+ /// 鏈璇佺墿鏂�
+ ///</summary>
+
+ public bool? Otherflag { get; set; }
/// <summary>
- /// 鎴愬搧鐢垫睜绫诲瀷锛氬姩鍔�/ 鍌ㄨ兘
- /// </summary>
- public string Battype { get; set; }
-
+ /// 鎴愬搧鐢垫睜绫诲瀷锛氬姩鍔�/ 鍌ㄨ兘
+ ///</summary>
+
+ public string Battype { get; set; }
/// <summary>
- /// 椤圭洰鍚嶇О
- /// </summary>
- public string ProjectName { get; set; }
-
+ /// 椤圭洰鍚嶇О
+ ///</summary>
+
+ public string ProjectName { get; set; }
/// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string Tname { get; set; }
-
+ /// 鐗╂枡鍚嶇О
+ ///</summary>
+
+ public string Tname { get; set; }
/// <summary>
- /// 鐗╂枡ID
- /// </summary>
- public long? ItemId { get; set; }
-
- public string UserName { get; set; }
- public string LastName { get; set; }
-
-
- public string FInspectionLevelName { get; set; }
-
- public string ItemModel { get; set; }
- public string ItemName { get; set; }
+ /// 鐗╂枡ID
+ ///</summary>
+
+ public long? ItemId { get; set; }
public List<MesQmCheckitemDt> list { get; set; }
}
-}
\ No newline at end of file
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
index 7e129d7..a16e7e3 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
@@ -1,221 +1,226 @@
锘縰sing System;
-
-namespace Gs.DevApp.DevFrm.QC.Models
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MES.Service.Modes
{
/// <summary>
- /// 妫�楠岄」鐩粠琛�
- /// </summary>
+ /// 妫�楠岄」鐩粠琛�
+ ///</summary>
+
public class MesQmCheckitemDt
{
/// <summary>
- /// 榛樿鍊�: (newid())
- /// </summary>
- public Guid? Guid { get; set; }
-
+ ///
+ /// 榛樿鍊�: (newid())
+ ///</summary>
+
+ public Guid? Guid { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- public string CreateBy { get; set; }
-
+ /// 鍒涘缓浜�
+ ///</summary>
+
+ public string CreateBy { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- public DateTime? CreateDate { get; set; }
-
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
+
+ public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- public string LastupdateBy { get; set; }
-
+ /// 鏈�鍚庢洿鏂颁汉
+ ///</summary>
+
+ public string LastupdateBy { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- public DateTime? LastupdateDate { get; set; }
-
+ /// 鏈�鍚庢洿鏂版椂闂�
+ ///</summary>
+
+ public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 澶囨敞
- /// </summary>
- public string Memo { get; set; }
-
+ /// 澶囨敞
+ ///</summary>
+
+ public string Memo { get; set; }
/// <summary>
- /// 鐗╂枡浜у搧缂栫爜
- /// </summary>
- public string ItemNo { get; set; }
-
+ /// 鐗╂枡浜у搧缂栫爜
+ ///</summary>
+
+ public string ItemNo { get; set; }
/// <summary>
- /// 椤哄簭
- /// </summary>
- public long? Forder { get; set; }
-
+ /// 椤哄簭
+ ///</summary>
+
+ public long? Forder { get; set; }
/// <summary>
- /// 涓婂叕宸�
- /// </summary>
- public string FupAllow { get; set; }
-
+ /// 涓婂叕宸�
+ ///</summary>
+
+ public string FupAllow { get; set; }
/// <summary>
- /// 妫�楠岄」鐩�
- /// </summary>
- public string FcheckItem { get; set; }
-
+ /// 妫�楠岄」鐩�
+ ///</summary>
+
+ public string FcheckItem { get; set; }
/// <summary>
- /// 鐗规畩鐗规�х被鍒�
- /// </summary>
- public string FspecType { get; set; }
-
+ /// 鐗规畩鐗规�х被鍒�
+ ///</summary>
+
+ public string FspecType { get; set; }
/// <summary>
- /// 澶囩敤
- /// </summary>
- public long? WorkshopCenterCode { get; set; }
-
+ /// 澶囩敤
+ ///</summary>
+
+ public long? WorkshopCenterCode { get; set; }
/// <summary>
- /// 宸ュ簭
- /// </summary>
- public string ProcNo { get; set; }
-
+ /// 宸ュ簭
+ ///</summary>
+
+ public string ProcNo { get; set; }
/// <summary>
- /// 妫�楠屾按鍑嗙紪鐮�
- /// </summary>
- public string SampleSizeNo { get; set; }
-
+ /// 妫�楠屾按鍑嗙紪鐮�
+ ///</summary>
+
+ public string SampleSizeNo { get; set; }
/// <summary>
- /// 妫�楠屽伐鍏�
- /// </summary>
- public string FcheckTool { get; set; }
-
+ /// 妫�楠屽伐鍏�
+ ///</summary>
+
+ public string FcheckTool { get; set; }
/// <summary>
- /// 涓嬪叕宸�
- /// </summary>
- public string FdownAllow { get; set; }
-
+ /// 涓嬪叕宸�
+ ///</summary>
+
+ public string FdownAllow { get; set; }
/// <summary>
- /// 妫�楠屾按骞�
- /// </summary>
- public string FcheckLevel { get; set; }
-
+ /// 妫�楠屾按骞�
+ ///</summary>
+
+ public string FcheckLevel { get; set; }
/// <summary>
- /// 鏍囧噯鍊�
- /// </summary>
- public string Fstand { get; set; }
-
+ /// 鏍囧噯鍊�
+ ///</summary>
+
+ public string Fstand { get; set; }
/// <summary>
- /// 鎺ユ敹姘村钩
- /// </summary>
- public string FacLevel { get; set; }
-
+ /// 鎺ユ敹姘村钩
+ ///</summary>
+
+ public string FacLevel { get; set; }
/// <summary>
- /// 澶囩敤
- /// </summary>
- public string FeatuProc { get; set; }
-
+ /// 澶囩敤
+ ///</summary>
+
+ public string FeatuProc { get; set; }
/// <summary>
- /// 澶囩敤
- /// </summary>
- public string FeatuProd { get; set; }
-
+ /// 澶囩敤
+ ///</summary>
+
+ public string FeatuProd { get; set; }
/// <summary>
- /// 澶囩敤
- /// </summary>
- public string Aql1Id { get; set; }
-
+ /// 澶囩敤
+ ///</summary>
+
+ public string Aql1Id { get; set; }
/// <summary>
- /// 澶囩敤
- /// </summary>
- public string FqaType { get; set; }
-
+ /// 澶囩敤
+ ///</summary>
+
+ public string FqaType { get; set; }
/// <summary>
- /// 鏄惁妗ｄ綅
- /// 榛樿鍊�: ((0))
- /// </summary>
- public bool? Isdanwei { get; set; }
-
+ /// 鏄惁妗ｄ綅
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
+ public bool? Isdanwei { get; set; }
/// <summary>
- /// 榛樿鐢ㄤ簬鍦ㄥ簱閲嶆
- /// 榛樿鍊�: ((1))
- /// </summary>
- public long? Ftype { get; set; }
-
+ /// 榛樿鐢ㄤ簬鍦ㄥ簱閲嶆
+ /// 榛樿鍊�: ((1))
+ ///</summary>
+
+ public long? Ftype { get; set; }
/// <summary>
- /// 淇敼/ 鏂板鐘舵��
- /// 榛樿鍊�: ((0))
- /// </summary>
- public bool? EditStatus { get; set; }
-
+ /// 淇敼/ 鏂板鐘舵��
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
+ public bool? EditStatus { get; set; }
/// <summary>
- /// 鎶芥鏁伴噺
- /// </summary>
- public long? CheckQty { get; set; }
-
+ /// 鎶芥鏁伴噺
+ ///</summary>
+
+ public long? CheckQty { get; set; }
/// <summary>
- /// 鍏佹敹鏁伴噺
- /// 榛樿鍊�: ((0))
- /// </summary>
- public long? FacQty { get; set; }
-
+ /// 鍏佹敹鏁伴噺
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
+ public long? FacQty { get; set; }
/// <summary>
- /// </summary>
- public string Company { get; set; }
-
+ ///
+ ///</summary>
+
+ public string Company { get; set; }
/// <summary>
- /// </summary>
- public string Factory { get; set; }
-
+ ///
+ ///</summary>
+
+ public string Factory { get; set; }
/// <summary>
- /// 棰戞
- /// </summary>
- public string Frequency { get; set; }
-
+ /// 棰戞
+ ///</summary>
+
+ public string Frequency { get; set; }
/// <summary>
- /// 瑙勬牸瑕佹眰
- /// </summary>
- public string FspecRequ { get; set; }
-
+ /// 瑙勬牸瑕佹眰
+ ///</summary>
+
+ public string FspecRequ { get; set; }
/// <summary>
- /// 椤圭洰绫诲埆
- /// </summary>
- public string FcheckType { get; set; }
-
+ /// 椤圭洰绫诲埆
+ ///</summary>
+
+ public string FcheckType { get; set; }
/// <summary>
- /// 鍗曚綅
- /// </summary>
- public string Funit { get; set; }
-
+ /// 鍗曚綅
+ ///</summary>
+
+ public string Funit { get; set; }
/// <summary>
- /// 鎶ヨ〃閫夋嫨
- /// 榛樿鍊�: ((0))
- /// </summary>
- public bool? ReporfCheck { get; set; }
-
+ /// 鎶ヨ〃閫夋嫨
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
+ public bool? ReporfCheck { get; set; }
/// <summary>
- /// 鐗瑰畾淇敼
- /// 榛樿鍊�: ((0))
- /// </summary>
- public bool? GivenModify { get; set; }
-
+ /// 鐗瑰畾淇敼
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
+ public bool? GivenModify { get; set; }
/// <summary>
- /// UCL_X璁惧畾鍊�
- /// </summary>
- public decimal? Fucl { get; set; }
-
+ /// UCL_X璁惧畾鍊�
+ ///</summary>
+
+ public decimal? Fucl { get; set; }
/// <summary>
- /// LCL_X璁惧畾鍊�
- /// </summary>
- public decimal? Flcl { get; set; }
-
+ /// LCL_X璁惧畾鍊�
+ ///</summary>
+
+ public decimal? Flcl { get; set; }
/// <summary>
- /// UCL_R璁惧畾鍊�
- /// </summary>
- public decimal? Frucl { get; set; }
-
+ /// UCL_R璁惧畾鍊�
+ ///</summary>
+
+ public decimal? Frucl { get; set; }
/// <summary>
- /// 鐗╂枡ID
- /// </summary>
- public long? ItemId { get; set; }
-
+ /// 鐗╂枡ID
+ ///</summary>
+
+ public long? ItemId { get; set; }
/// <summary>
- /// </summary>
- public Guid? Pid { get; set; }
-
-
- public string SampleSizeName { get; set; }
+ ///
+ ///</summary>
+
+ public Guid? Pid { get; set; }
}
-}
\ No newline at end of file
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index 0cf9684..7833104 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -343,7 +343,7 @@
var dataTable = new DataTable();
dataTable.Columns.Add("docCode", typeof(string));
dataTable.Rows.Add("DH(閲囪喘鍒拌揣鍗�)");
- dataTable.Rows.Add("DH(閲囪喘妫�楠屽崟)");
+ dataTable.Rows.Add("JY(妫�楠岀敵璇峰崟)");
//dataTable.Rows.Add("QO(鎶ヤ环鍗�)");
//dataTable.Rows.Add("PO(閲囪喘璁㈠崟)");
//dataTable.Rows.Add("IA(搴撳瓨璋冩暣)");
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
index 4578fa6..765d0ff 100644
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
@@ -28,94 +28,31 @@
/// </summary>
private void InitializeComponent()
{
- this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
- this.richTextBox1 = new System.Windows.Forms.RichTextBox();
- this.xtraUserControl11 = new Gs.DevApp.UserControl.XtraUserControl1();
- this.simpleButton2 = new DevExpress.XtraEditors.SimpleButton();
- this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
- this.splitContainerControl1.SuspendLayout();
+ this.txt_ItemId = new Gs.DevApp.UserControl.UcLookItems();
this.SuspendLayout();
//
- // simpleButton1
+ // txt_ItemId
//
- this.simpleButton1.Location = new System.Drawing.Point(327, 203);
- this.simpleButton1.Name = "simpleButton1";
- this.simpleButton1.Size = new System.Drawing.Size(94, 29);
- this.simpleButton1.TabIndex = 0;
- this.simpleButton1.Text = "simpleButton1";
- this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click_1);
- //
- // richTextBox1
- //
- this.richTextBox1.Location = new System.Drawing.Point(247, 37);
- this.richTextBox1.Name = "richTextBox1";
- this.richTextBox1.Size = new System.Drawing.Size(250, 96);
- this.richTextBox1.TabIndex = 1;
- this.richTextBox1.Text = "";
- //
- // xtraUserControl11
- //
- this.xtraUserControl11.Location = new System.Drawing.Point(59, 82);
- this.xtraUserControl11.Name = "xtraUserControl11";
- this.xtraUserControl11.Size = new System.Drawing.Size(150, 150);
- this.xtraUserControl11.TabIndex = 2;
- //
- // simpleButton2
- //
- this.simpleButton2.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.sortandfilter_16x16;
- this.simpleButton2.Location = new System.Drawing.Point(590, 203);
- this.simpleButton2.Name = "simpleButton2";
- this.simpleButton2.Size = new System.Drawing.Size(94, 29);
- this.simpleButton2.TabIndex = 3;
- this.simpleButton2.Text = "simpleButton2";
- this.simpleButton2.Click += new System.EventHandler(this.simpleButton2_Click);
- //
- // splitContainerControl1
- //
- this.splitContainerControl1.Horizontal = false;
- this.splitContainerControl1.Location = new System.Drawing.Point(247, 276);
- this.splitContainerControl1.Name = "splitContainerControl1";
- //
- // splitContainerControl1.Panel1
- //
- this.splitContainerControl1.Panel1.Text = "Panel1";
- //
- // splitContainerControl1.Panel2
- //
- this.splitContainerControl1.Panel2.Text = "Panel2";
- this.splitContainerControl1.Size = new System.Drawing.Size(200, 158);
- this.splitContainerControl1.SplitterPosition = 70;
- this.splitContainerControl1.TabIndex = 4;
+ this.txt_ItemId.KeyFile = "";
+ this.txt_ItemId.Location = new System.Drawing.Point(253, 102);
+ this.txt_ItemId.Name = "txt_ItemId";
+ this.txt_ItemId.Size = new System.Drawing.Size(266, 33);
+ this.txt_ItemId.TabIndex = 0;
//
// XtraForm1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1009, 612);
- this.Controls.Add(this.splitContainerControl1);
- this.Controls.Add(this.simpleButton2);
- this.Controls.Add(this.xtraUserControl11);
- this.Controls.Add(this.richTextBox1);
- this.Controls.Add(this.simpleButton1);
+ this.Controls.Add(this.txt_ItemId);
this.Name = "XtraForm1";
this.Text = "XtraForm1";
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
- this.splitContainerControl1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
- private DevExpress.XtraEditors.SimpleButton simpleButton1;
- private System.Windows.Forms.RichTextBox richTextBox1;
- private UserControl.XtraUserControl1 xtraUserControl11;
- private DevExpress.XtraEditors.SimpleButton simpleButton2;
- private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
+ private UserControl.UcLookItems txt_ItemId;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
index 01a727d..86d2922 100644
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
@@ -25,118 +25,10 @@
public XtraForm1()
{
InitializeComponent();
- //dddddddd();
-
- //await Task.Run(() =>
- //{
-
- //});
+ txt_ItemId.KeyFile = "id";
+ txt_ItemId.SetIdOrCode("287976");
}
- private async void dddddddd() {
-
-
- UcLoading _loading = new UcLoading();
- var pgq = new PageQueryModel(1, 999999, "item_name", "asc", "",
- " and fforbidstatus='A'");
- var json = JsonConvert.SerializeObject(pgq);
- try
- {
- //var strReturn = await UtilityHelper.HttpPostAsync("",
- // "MesItemsManager/GetListPageByLook", json);
- //var rtn = UtilityHelper.ReturnToList(strReturn);
- //var dt = rtn.rtnData;
-
- await csd();
-
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- _loading.Stop();
- }
-
- private async Task<int> csd()
- {
- int c = 0;
- //await Task.Delay(1000);
- await Task.Run(() =>
- {
- for (int i = 0; i < 10000; i++)
- {
- c = c + i;
- if (richTextBox1.InvokeRequired)
- {
- richTextBox1.BeginInvoke(new Action(() =>
- {
- richTextBox1.Text = c.ToString();
- }));
- }
- else
- {
- richTextBox1.Text = c.ToString();
- }
- }
-
- });
- return c;
-
- }
- private void simpleButton1_Click_1(object sender, EventArgs e)
- {
- dddddddd();
- }
-
-
- private async void simpleButton2_Click(object sender, EventArgs e)
- {
- UcLoading _loading = new UcLoading();
- string url = "http://localhost:5263/";
- try
- {
- string result = await GetHttpResponseAsync(url);
- Console.WriteLine(result);
- richTextBox1.Text = result;
- }
- catch (WebException ex)
- {
- richTextBox1.Text = ex.Message;
- }
- _loading.Stop();
- }
-
- private static async Task<string> GetHttpResponseAsync(string url)
- {
- string param = "{}";
- HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
-
- request.Method = "POST";
- request.ContentType = "application/json";
- //request.Headers.Add("token", GetBasicAuthTicket());
- request.Accept = "*/*";
- request.Timeout = 15000;
- request.AllowAutoRedirect = false;
-
-
- //StreamWriter requestStream = null;
- //requestStream = new StreamWriter(request.GetRequestStream());
- //requestStream.Write(param);
- //requestStream.Close();
-
- using (Stream requestStream = await request.GetRequestStreamAsync())
- {
- byte[] dataBytes = Encoding.UTF8.GetBytes(param);
- await requestStream.WriteAsync(dataBytes, 0, dataBytes.Length);
- }
-
-
- using (WebResponse response = await request.GetResponseAsync())
- using (Stream responseStream = response.GetResponseStream())
- using (StreamReader reader = new StreamReader(responseStream, Encoding.UTF8))
- {
- return await reader.ReadToEndAsync();
- }
- }
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs
index e8434b3..0d50e11 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs
@@ -72,7 +72,7 @@
this.gridColumn1.FieldName = "id";
this.gridColumn1.MaxWidth = 80;
this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.UnboundDataType = typeof(short);
+ this.gridColumn1.UnboundDataType = typeof(long);
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
this.gridColumn1.Width = 42;
@@ -82,11 +82,12 @@
this.gridColumn2.Caption = "鐗╂枡缂栧彿";
this.gridColumn2.FieldName = "itemNo";
this.gridColumn2.MaxWidth = 80;
+ this.gridColumn2.MinWidth = 80;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.UnboundDataType = typeof(string);
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
- this.gridColumn2.Width = 68;
+ this.gridColumn2.Width = 80;
//
// gridColumn3
//
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
index 4bb2bf3..5a5f814 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
@@ -114,7 +114,9 @@
return;
}
if (KeyFile == "id")
+ {
lookSearchSupplier.EditValue = Int64.Parse((Code.ToString().Trim()));
+ }
else
lookSearchSupplier.EditValue = ((Code.ToString().Trim()));
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 7392181..5b1867d 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -415,6 +415,8 @@
lst.Add(btnFjianYan.Name);
lst.Add(btnOut.Name);
lst.Add(btnIn.Name);
+ lst.Add(btnLog.Name);
+ lst.Add(btnPiZhun.Name);
_enabledBtn(lst);
if (btnEscClick != null) btnEscClick(this, e);
}
--
Gitblit v1.9.3