From 9a45880b3540e31030bf0648c027b17b53dc2c44 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 26 十月 2024 15:56:16 +0800
Subject: [PATCH] 检验标准
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.resx | 244 +++++++--------
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 254 ++++++++++++++++
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs | 383 +++++++++++++++----------
4 files changed, 586 insertions(+), 297 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
index b89f42d..a38eb29 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -31,15 +31,19 @@
{
this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptJSSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gvMx1fstand = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptJYSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gvMx1fdownAllow = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fcheckTool = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptJYGJ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptJYXM = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gvMx1fupAllow = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1forder = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -49,9 +53,8 @@
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_tname = new DevExpress.XtraEditors.LabelControl();
- this.txt_tname = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
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();
@@ -62,7 +65,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();
@@ -71,11 +73,9 @@
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.gv_name1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_itemNo = new DevExpress.XtraEditors.LabelControl();
- this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_memo = new DevExpress.XtraEditors.LabelControl();
this.txt_memo = new DevExpress.XtraEditors.TextEdit();
@@ -94,26 +94,32 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
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_isenabled = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_ftwoChecked = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_foneChecked = new DevExpress.XtraEditors.CheckEdit();
this.lb_itemModel = new DevExpress.XtraEditors.LabelControl();
- this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
this.labelCreateDate = new DevExpress.XtraEditors.LabelControl();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.labelUserName = new DevExpress.XtraEditors.LabelControl();
this.txt_userName = new DevExpress.XtraEditors.TextEdit();
this.lbGuid = new System.Windows.Forms.Label();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).BeginInit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tname.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.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_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -125,6 +131,9 @@
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).BeginInit();
this.SuspendLayout();
@@ -145,13 +154,22 @@
this.gvMx1facLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1facLevel.Caption = "鎺ユ敹姘村钩 ";
+ this.gvMx1facLevel.ColumnEdit = this.rptJSSP;
this.gvMx1facLevel.FieldName = "facLevel";
- this.gvMx1facLevel.MinWidth = 50;
+ this.gvMx1facLevel.MinWidth = 150;
this.gvMx1facLevel.Name = "gvMx1facLevel";
this.gvMx1facLevel.Tag = "query_a.FAC_LEVEL";
this.gvMx1facLevel.Visible = true;
- this.gvMx1facLevel.VisibleIndex = 9;
- this.gvMx1facLevel.Width = 94;
+ this.gvMx1facLevel.VisibleIndex = 8;
+ this.gvMx1facLevel.Width = 150;
+ //
+ // rptJSSP
+ //
+ this.rptJSSP.AutoHeight = false;
+ this.rptJSSP.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptJSSP.Name = "rptJSSP";
+ this.rptJSSP.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
//
// gvMx1fstand
//
@@ -159,25 +177,34 @@
this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
this.gvMx1fstand.Caption = "鏍囧噯鍊� ";
this.gvMx1fstand.FieldName = "fstand";
- this.gvMx1fstand.MinWidth = 50;
+ this.gvMx1fstand.MinWidth = 150;
this.gvMx1fstand.Name = "gvMx1fstand";
this.gvMx1fstand.Tag = "query_a.FSTAND";
this.gvMx1fstand.Visible = true;
- this.gvMx1fstand.VisibleIndex = 11;
- this.gvMx1fstand.Width = 94;
+ this.gvMx1fstand.VisibleIndex = 10;
+ this.gvMx1fstand.Width = 150;
//
// gvMx1fcheckLevel
//
this.gvMx1fcheckLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞� ";
+ this.gvMx1fcheckLevel.ColumnEdit = this.rptJYSP;
this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
- this.gvMx1fcheckLevel.MinWidth = 50;
+ this.gvMx1fcheckLevel.MinWidth = 150;
this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
this.gvMx1fcheckLevel.Tag = "query_a.FCHECK_LEVEL";
this.gvMx1fcheckLevel.Visible = true;
- this.gvMx1fcheckLevel.VisibleIndex = 8;
- this.gvMx1fcheckLevel.Width = 94;
+ this.gvMx1fcheckLevel.VisibleIndex = 7;
+ this.gvMx1fcheckLevel.Width = 150;
+ //
+ // rptJYSP
+ //
+ this.rptJYSP.AutoHeight = false;
+ this.rptJYSP.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptJYSP.Name = "rptJYSP";
+ this.rptJYSP.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
//
// gvMx1fdownAllow
//
@@ -185,51 +212,79 @@
this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fdownAllow.Caption = "涓嬮檺";
this.gvMx1fdownAllow.FieldName = "fdownAllow";
- this.gvMx1fdownAllow.MinWidth = 50;
+ this.gvMx1fdownAllow.MinWidth = 150;
this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
this.gvMx1fdownAllow.Tag = "query_a.FDOWN_ALLOW";
this.gvMx1fdownAllow.Visible = true;
- this.gvMx1fdownAllow.VisibleIndex = 12;
- this.gvMx1fdownAllow.Width = 94;
+ this.gvMx1fdownAllow.VisibleIndex = 11;
+ this.gvMx1fdownAllow.Width = 150;
//
// gvMx1fcheckTool
//
this.gvMx1fcheckTool.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏� ";
+ this.gvMx1fcheckTool.ColumnEdit = this.rptJYGJ;
this.gvMx1fcheckTool.FieldName = "fcheckTool";
- this.gvMx1fcheckTool.MinWidth = 50;
+ this.gvMx1fcheckTool.MinWidth = 150;
this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
this.gvMx1fcheckTool.Tag = "query_a.FCHECK_TOOL";
this.gvMx1fcheckTool.Visible = true;
this.gvMx1fcheckTool.VisibleIndex = 4;
- this.gvMx1fcheckTool.Width = 94;
+ this.gvMx1fcheckTool.Width = 150;
+ //
+ // rptJYGJ
+ //
+ this.rptJYGJ.AutoHeight = false;
+ this.rptJYGJ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptJYGJ.Name = "rptJYGJ";
+ this.rptJYGJ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
//
// gvMx1sampleSizeNo
//
this.gvMx1sampleSizeNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣鍑嗙紪鐮� ";
+ this.gvMx1sampleSizeNo.ColumnEdit = this.rptJYBZ;
this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
- this.gvMx1sampleSizeNo.MinWidth = 50;
+ this.gvMx1sampleSizeNo.MinWidth = 150;
this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
this.gvMx1sampleSizeNo.Tag = "query_a.SAMPLE_SIZE_NO";
this.gvMx1sampleSizeNo.Visible = true;
this.gvMx1sampleSizeNo.VisibleIndex = 5;
- this.gvMx1sampleSizeNo.Width = 94;
+ this.gvMx1sampleSizeNo.Width = 150;
+ //
+ // rptJYBZ
+ //
+ this.rptJYBZ.AutoHeight = false;
+ this.rptJYBZ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptJYBZ.Name = "rptJYBZ";
+ this.rptJYBZ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.rptJYBZ.SelectedIndexChanged += new System.EventHandler(this.rptJYBZ_SelectedIndexChanged);
//
// gvMx1fcheckItem
//
this.gvMx1fcheckItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩� ";
+ this.gvMx1fcheckItem.ColumnEdit = this.rptJYXM;
this.gvMx1fcheckItem.FieldName = "fcheckItem";
- this.gvMx1fcheckItem.MinWidth = 50;
+ this.gvMx1fcheckItem.MinWidth = 150;
this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
this.gvMx1fcheckItem.Tag = "query_a.FCHECK_ITEM";
this.gvMx1fcheckItem.Visible = true;
this.gvMx1fcheckItem.VisibleIndex = 1;
- this.gvMx1fcheckItem.Width = 94;
+ this.gvMx1fcheckItem.Width = 150;
+ //
+ // rptJYXM
+ //
+ this.rptJYXM.AutoHeight = false;
+ this.rptJYXM.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptJYXM.Name = "rptJYXM";
+ this.rptJYXM.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
//
// gvMx1fupAllow
//
@@ -237,12 +292,12 @@
this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fupAllow.Caption = "涓婇檺";
this.gvMx1fupAllow.FieldName = "fupAllow";
- this.gvMx1fupAllow.MinWidth = 50;
+ this.gvMx1fupAllow.MinWidth = 150;
this.gvMx1fupAllow.Name = "gvMx1fupAllow";
this.gvMx1fupAllow.Tag = "query_a.FUP_ALLOW";
this.gvMx1fupAllow.Visible = true;
- this.gvMx1fupAllow.VisibleIndex = 10;
- this.gvMx1fupAllow.Width = 94;
+ this.gvMx1fupAllow.VisibleIndex = 9;
+ this.gvMx1fupAllow.Width = 150;
//
// gvMx1forder
//
@@ -255,20 +310,7 @@
this.gvMx1forder.Tag = "query_a.FORDER";
this.gvMx1forder.Visible = true;
this.gvMx1forder.VisibleIndex = 0;
- this.gvMx1forder.Width = 94;
- //
- // gvMx1itemNo
- //
- this.gvMx1itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1itemNo.Caption = "鐗╂枡缂栫爜 ";
- this.gvMx1itemNo.FieldName = "itemNo";
- this.gvMx1itemNo.MinWidth = 50;
- this.gvMx1itemNo.Name = "gvMx1itemNo";
- this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
- this.gvMx1itemNo.Visible = true;
- this.gvMx1itemNo.VisibleIndex = 7;
- this.gvMx1itemNo.Width = 94;
+ this.gvMx1forder.Width = 50;
//
// gvMx1memo
//
@@ -276,12 +318,12 @@
this.gvMx1memo.AppearanceCell.Options.UseFont = true;
this.gvMx1memo.Caption = "妫�楠岄」鐩弿杩�";
this.gvMx1memo.FieldName = "memo";
- this.gvMx1memo.MinWidth = 50;
+ this.gvMx1memo.MinWidth = 150;
this.gvMx1memo.Name = "gvMx1memo";
this.gvMx1memo.Tag = "query_a.MEMO";
this.gvMx1memo.Visible = true;
this.gvMx1memo.VisibleIndex = 3;
- this.gvMx1memo.Width = 94;
+ this.gvMx1memo.Width = 150;
//
// gvMx1guid
//
@@ -298,7 +340,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 349);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 362);
this.tabMxPage1.Text = "鏄庣粏1";
//
// gcMx1
@@ -307,7 +349,13 @@
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, 349);
+ this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.rptJYXM,
+ this.rptJYGJ,
+ this.rptJYBZ,
+ this.rptJSSP,
+ this.rptJYSP});
+ this.gcMx1.Size = new System.Drawing.Size(1124, 362);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -324,7 +372,6 @@
this.gvMx1fcheckTool,
this.gvMx1sampleSizeNo,
this.gridColumn6,
- this.gvMx1itemNo,
this.gvMx1fcheckLevel,
this.gvMx1facLevel,
this.gvMx1fupAllow,
@@ -342,69 +389,60 @@
//
this.gridColumn5.Caption = "瑙勬牸瑕佹眰";
this.gridColumn5.FieldName = "fspecRequ";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 150;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 2;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 150;
//
// gridColumn6
//
this.gridColumn6.Caption = "妫�楠屾爣鍑嗗悕绉�";
this.gridColumn6.FieldName = "sampleSizeName";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 150;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 6;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 150;
//
// gridColumn7
//
this.gridColumn7.Caption = "澶囨敞";
this.gridColumn7.FieldName = "funit";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 150;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 13;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.VisibleIndex = 12;
+ this.gridColumn7.Width = 150;
//
// lb_tname
//
this.lb_tname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tname.Appearance.Options.UseFont = true;
- this.lb_tname.Location = new System.Drawing.Point(4, 59);
+ this.lb_tname.Location = new System.Drawing.Point(3, 59);
this.lb_tname.Name = "lb_tname";
- this.lb_tname.Size = new System.Drawing.Size(73, 21);
+ this.lb_tname.Size = new System.Drawing.Size(68, 21);
this.lb_tname.TabIndex = 370;
- this.lb_tname.Text = "鐗╂枡鍚嶇О ";
+ this.lb_tname.Text = "鐗╂枡缂栫爜";
//
- // txt_tname
+ // txt_itemNo
//
- this.txt_tname.Location = new System.Drawing.Point(79, 56);
- this.txt_tname.Name = "txt_tname";
- this.txt_tname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_tname.Properties.Appearance.Options.UseFont = true;
- this.txt_tname.Size = new System.Drawing.Size(142, 28);
- this.txt_tname.TabIndex = 370;
+ this.txt_itemNo.Location = new System.Drawing.Point(85, 55);
+ this.txt_itemNo.Name = "txt_itemNo";
+ this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemNo.Size = new System.Drawing.Size(266, 28);
+ this.txt_itemNo.TabIndex = 370;
//
// 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(237, 59);
+ this.lb_isenabled.Location = new System.Drawing.Point(881, 134);
this.lb_isenabled.Name = "lb_isenabled";
this.lb_isenabled.Size = new System.Drawing.Size(73, 21);
this.lb_isenabled.TabIndex = 306;
this.lb_isenabled.Text = "鏄惁鍙敤 ";
- //
- // txt_isenabled
- //
- this.txt_isenabled.Location = new System.Drawing.Point(316, 56);
- 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(61, 28);
- this.txt_isenabled.TabIndex = 306;
//
// gv_isenabled
//
@@ -424,7 +462,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(907, 20);
+ this.lb_fversion.Location = new System.Drawing.Point(915, 20);
this.lb_fversion.Name = "lb_fversion";
this.lb_fversion.Size = new System.Drawing.Size(39, 21);
this.lb_fversion.TabIndex = 298;
@@ -432,7 +470,7 @@
//
// txt_fversion
//
- this.txt_fversion.Location = new System.Drawing.Point(981, 14);
+ this.txt_fversion.Location = new System.Drawing.Point(962, 16);
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;
@@ -457,7 +495,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(632, 94);
+ this.lb_ftwoCheckdate.Location = new System.Drawing.Point(605, 94);
this.lb_ftwoCheckdate.Name = "lb_ftwoCheckdate";
this.lb_ftwoCheckdate.Size = new System.Drawing.Size(73, 21);
this.lb_ftwoCheckdate.TabIndex = 285;
@@ -465,7 +503,7 @@
//
// txt_ftwoCheckdate
//
- this.txt_ftwoCheckdate.Location = new System.Drawing.Point(707, 91);
+ this.txt_ftwoCheckdate.Location = new System.Drawing.Point(680, 90);
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;
@@ -476,7 +514,7 @@
//
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(398, 94);
+ this.lb_ftwoCheckor.Location = new System.Drawing.Point(371, 94);
this.lb_ftwoCheckor.Name = "lb_ftwoCheckor";
this.lb_ftwoCheckor.Size = new System.Drawing.Size(56, 21);
this.lb_ftwoCheckor.TabIndex = 280;
@@ -484,7 +522,7 @@
//
// txt_ftwoCheckor
//
- this.txt_ftwoCheckor.Location = new System.Drawing.Point(460, 91);
+ this.txt_ftwoCheckor.Location = new System.Drawing.Point(433, 90);
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;
@@ -509,20 +547,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(892, 94);
+ this.lb_ftwoChecked.Location = new System.Drawing.Point(881, 94);
this.lb_ftwoChecked.Name = "lb_ftwoChecked";
this.lb_ftwoChecked.Size = new System.Drawing.Size(73, 21);
this.lb_ftwoChecked.TabIndex = 273;
this.lb_ftwoChecked.Text = "鎵瑰噯鏍囪 ";
- //
- // txt_ftwoChecked
- //
- this.txt_ftwoChecked.Location = new System.Drawing.Point(981, 91);
- 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(80, 28);
- this.txt_ftwoChecked.TabIndex = 273;
//
// gv_ftwoChecked
//
@@ -542,7 +571,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(633, 63);
+ this.lb_foneCheckdate.Location = new System.Drawing.Point(606, 59);
this.lb_foneCheckdate.Name = "lb_foneCheckdate";
this.lb_foneCheckdate.Size = new System.Drawing.Size(73, 21);
this.lb_foneCheckdate.TabIndex = 267;
@@ -550,7 +579,7 @@
//
// txt_foneCheckdate
//
- this.txt_foneCheckdate.Location = new System.Drawing.Point(707, 57);
+ this.txt_foneCheckdate.Location = new System.Drawing.Point(680, 55);
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;
@@ -575,7 +604,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(400, 59);
+ this.lb_foneCheckor.Location = new System.Drawing.Point(373, 59);
this.lb_foneCheckor.Name = "lb_foneCheckor";
this.lb_foneCheckor.Size = new System.Drawing.Size(56, 21);
this.lb_foneCheckor.TabIndex = 262;
@@ -583,7 +612,7 @@
//
// txt_foneCheckor
//
- this.txt_foneCheckor.Location = new System.Drawing.Point(460, 56);
+ this.txt_foneCheckor.Location = new System.Drawing.Point(433, 55);
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;
@@ -608,20 +637,11 @@
//
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(893, 59);
+ this.lb_foneChecked.Location = new System.Drawing.Point(881, 59);
this.lb_foneChecked.Name = "lb_foneChecked";
this.lb_foneChecked.Size = new System.Drawing.Size(73, 21);
this.lb_foneChecked.TabIndex = 258;
this.lb_foneChecked.Text = "瀹℃壒鏍囪 ";
- //
- // txt_foneChecked
- //
- this.txt_foneChecked.Location = new System.Drawing.Point(981, 56);
- 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(80, 28);
- this.txt_foneChecked.TabIndex = 258;
//
// gv_foneChecked
//
@@ -657,18 +677,9 @@
this.lb_itemNo.Appearance.Options.UseFont = true;
this.lb_itemNo.Location = new System.Drawing.Point(3, 20);
this.lb_itemNo.Name = "lb_itemNo";
- this.lb_itemNo.Size = new System.Drawing.Size(73, 21);
+ this.lb_itemNo.Size = new System.Drawing.Size(68, 21);
this.lb_itemNo.TabIndex = 222;
- this.lb_itemNo.Text = "鐗╂枡缂栫爜 ";
- //
- // txt_itemNo
- //
- this.txt_itemNo.Location = new System.Drawing.Point(79, 17);
- this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(229, 28);
- this.txt_itemNo.TabIndex = 222;
+ this.lb_itemNo.Text = "閫夋嫨鐗╂枡";
//
// gv_itemNo
//
@@ -688,7 +699,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(10, 94);
+ this.lb_memo.Location = new System.Drawing.Point(385, 135);
this.lb_memo.Name = "lb_memo";
this.lb_memo.Size = new System.Drawing.Size(39, 21);
this.lb_memo.TabIndex = 219;
@@ -696,11 +707,11 @@
//
// txt_memo
//
- this.txt_memo.Location = new System.Drawing.Point(79, 91);
+ this.txt_memo.Location = new System.Drawing.Point(433, 131);
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;
- this.txt_memo.Size = new System.Drawing.Size(229, 28);
+ this.txt_memo.Size = new System.Drawing.Size(150, 28);
this.txt_memo.TabIndex = 219;
//
// gv_memo
@@ -788,6 +799,7 @@
this.gridColumn3.FieldName = "itemName";
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 4;
this.gridColumn3.Width = 94;
@@ -798,6 +810,7 @@
this.gridColumn2.FieldName = "itemModel";
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 5;
this.gridColumn2.Width = 94;
@@ -808,6 +821,7 @@
this.gridColumn4.FieldName = "createDate";
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.AllowEdit = false;
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 6;
this.gridColumn4.Width = 94;
@@ -818,6 +832,7 @@
this.gridColumn1.FieldName = "userName";
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 7;
this.gridColumn1.Width = 94;
@@ -867,10 +882,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 189);
+ this.tabMx.Location = new System.Drawing.Point(0, 176);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 381);
+ this.tabMx.Size = new System.Drawing.Size(1126, 394);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -878,17 +893,21 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.lb_itemModel);
+ 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_isenabled);
+ this.panel1.Controls.Add(this.txt_ftwoChecked);
+ this.panel1.Controls.Add(this.txt_foneChecked);
+ this.panel1.Controls.Add(this.lb_itemModel);
this.panel1.Controls.Add(this.labelCreateDate);
this.panel1.Controls.Add(this.txt_createDate);
this.panel1.Controls.Add(this.labelUserName);
this.panel1.Controls.Add(this.txt_userName);
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_tname);
- this.panel1.Controls.Add(this.txt_tname);
+ this.panel1.Controls.Add(this.txt_itemNo);
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);
@@ -896,48 +915,87 @@
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_itemNo);
- this.panel1.Controls.Add(this.txt_itemNo);
this.panel1.Controls.Add(this.lb_memo);
this.panel1.Controls.Add(this.txt_memo);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
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, 189);
+ this.panel1.Size = new System.Drawing.Size(1126, 176);
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.Name = "btnSelect";
+ this.btnSelect.Size = new System.Drawing.Size(85, 29);
+ this.btnSelect.TabIndex = 449;
+ this.btnSelect.Text = "鍘诲鍒�";
+ //
+ // txt_itemModel
+ //
+ this.txt_itemModel.Location = new System.Drawing.Point(85, 95);
+ this.txt_itemModel.Name = "txt_itemModel";
+ this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemModel.Size = new System.Drawing.Size(266, 64);
+ this.txt_itemModel.TabIndex = 381;
+ this.txt_itemModel.Tag = "itemName";
+ //
+ // 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;
+ //
+ // txt_isenabled
+ //
+ this.txt_isenabled.Location = new System.Drawing.Point(960, 132);
+ this.txt_isenabled.Name = "txt_isenabled";
+ this.txt_isenabled.Properties.Caption = "";
+ this.txt_isenabled.Size = new System.Drawing.Size(27, 24);
+ this.txt_isenabled.TabIndex = 379;
+ //
+ // txt_ftwoChecked
+ //
+ this.txt_ftwoChecked.Location = new System.Drawing.Point(962, 92);
+ 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 = 378;
+ //
+ // txt_foneChecked
+ //
+ this.txt_foneChecked.Location = new System.Drawing.Point(962, 57);
+ 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 = 377;
//
// lb_itemModel
//
this.lb_itemModel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_itemModel.Appearance.Options.UseFont = true;
- this.lb_itemModel.Location = new System.Drawing.Point(11, 139);
+ this.lb_itemModel.Location = new System.Drawing.Point(8, 96);
this.lb_itemModel.Name = "lb_itemModel";
this.lb_itemModel.Size = new System.Drawing.Size(68, 21);
this.lb_itemModel.TabIndex = 375;
this.lb_itemModel.Text = "鐗╂枡瑙勬牸";
//
- // txt_itemModel
- //
- this.txt_itemModel.Location = new System.Drawing.Point(80, 136);
- this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(530, 28);
- this.txt_itemModel.TabIndex = 376;
- //
// labelCreateDate
//
this.labelCreateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelCreateDate.Appearance.Options.UseFont = true;
- this.labelCreateDate.Location = new System.Drawing.Point(633, 17);
+ this.labelCreateDate.Location = new System.Drawing.Point(606, 20);
this.labelCreateDate.Name = "labelCreateDate";
this.labelCreateDate.Size = new System.Drawing.Size(68, 21);
this.labelCreateDate.TabIndex = 373;
@@ -945,7 +1003,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(707, 14);
+ this.txt_createDate.Location = new System.Drawing.Point(680, 16);
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;
@@ -956,7 +1014,7 @@
//
this.labelUserName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelUserName.Appearance.Options.UseFont = true;
- this.labelUserName.Location = new System.Drawing.Point(404, 17);
+ this.labelUserName.Location = new System.Drawing.Point(377, 20);
this.labelUserName.Name = "labelUserName";
this.labelUserName.Size = new System.Drawing.Size(51, 21);
this.labelUserName.TabIndex = 371;
@@ -964,7 +1022,7 @@
//
// txt_userName
//
- this.txt_userName.Location = new System.Drawing.Point(460, 13);
+ this.txt_userName.Location = new System.Drawing.Point(433, 16);
this.txt_userName.Name = "txt_userName";
this.txt_userName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_userName.Properties.Appearance.Options.UseFont = true;
@@ -987,19 +1045,20 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesQmCheckitemDt";
+ ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).EndInit();
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tname.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.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_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -1012,6 +1071,9 @@
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).EndInit();
this.ResumeLayout(false);
@@ -1040,7 +1102,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItem;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fupAllow;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1forder;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -1048,10 +1109,9 @@
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraEditors.LabelControl lb_tname;
-private DevExpress.XtraEditors.TextEdit txt_tname;
+private DevExpress.XtraEditors.TextEdit txt_itemNo;
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;
@@ -1066,7 +1126,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;
@@ -1078,12 +1137,10 @@
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.XtraGrid.Columns.GridColumn gv_name1;
private DevExpress.XtraEditors.LabelControl lb_itemNo;
-private DevExpress.XtraEditors.TextEdit txt_itemNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
private DevExpress.XtraEditors.LabelControl lb_memo;
@@ -1102,6 +1159,16 @@
private DevExpress.XtraEditors.LabelControl labelUserName;
private DevExpress.XtraEditors.TextEdit txt_userName;
private DevExpress.XtraEditors.LabelControl lb_itemModel;
- private DevExpress.XtraEditors.TextEdit txt_itemModel;
+ private DevExpress.XtraEditors.CheckEdit txt_foneChecked;
+ private DevExpress.XtraEditors.CheckEdit txt_ftwoChecked;
+ private DevExpress.XtraEditors.CheckEdit txt_isenabled;
+ private UserControl.UcLookItems txt_itemId;
+ private DevExpress.XtraEditors.MemoEdit txt_itemModel;
+ private DevExpress.XtraEditors.SimpleButton btnSelect;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYXM;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYGJ;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJSSP;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYSP;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index a731693..5a0acf7 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -6,9 +6,11 @@
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.DevFrm.QC.Models;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
+using MES.Service.Modes;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -46,6 +48,8 @@
e.Bounds.Right - 5, e.Bounds.Height - 5);
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
+ //鍒濆鍖栫墿鏂欓�夋嫨鍜屽悇绉嶄笅鎷�
+ _setIno();
}
/// <summary>
@@ -115,14 +119,14 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戠殑妫�楠屾爣鍑嗭紝纭畾鍒犻櫎鍚楋紵"))
return;
var lst = new List<dynamic>();
lst.Add(rowGuid);
@@ -139,7 +143,6 @@
UtilityHelper.JumpToTab(xtraTabControl1, 0);
getPageList(1, UtilityHelper.GetPageSize());
}
-
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
@@ -167,13 +170,12 @@
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
getModel(rowGuid, true, 1);
}
@@ -202,16 +204,44 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- //if (string.IsNullOrEmpty(txt_account.Text.Trim()))
+ string _ItemId = txt_itemId.GetId()
+; if (string.IsNullOrEmpty(_ItemId))
{
- MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
+ MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�");
// txt_account.Focus();
return;
}
- var _obj = new
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
+ var lst = new List<MesQmCheckitemDt>();
+ for (var i = 0; i < gvMx1.DataRowCount; i++)
{
- guid = lbGuid.Text.Trim() //涓诲缓
+ var row = gvMx1.GetDataRow(i);
+ if (row != null)
+ lst.Add(new MesQmCheckitemDt
+ {
+ Guid = null,
+ Forder = 1,
+ FcheckItem = row["FcheckItem"].ToString(),
+ SampleSizeNo = row["SampleSizeNo"].ToString(),
+ FcheckTool= row["FcheckTool"].ToString(),
+ FcheckLevel = row["FcheckLevel"].ToString(),
+ Fstand = row["Fstand"].ToString(),
+ FacLevel = row["FacLevel"].ToString(),
+ });
+ }
+
+ var _obj = new MesQmCheckitem
+ {
+ Guid = lbGuid.Text.Trim().Length > 0
+ ? Guid.Parse(lbGuid.Text.Trim())
+ : Guid.Empty,
+ Memo = txt_memo.Text.Trim(),
+ ItemNo =txt_itemNo.Text.Trim(),
+ IsEnabled = txt_isenabled.Checked,
+ list = lst
};
+
try
{
var strJson = UtilityHelper.HttpPost("",
@@ -337,5 +367,211 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+
+
+ #region 浠ヤ笅涓虹绉嶄笅鎷�
+
+ private void getCopyMx(string strGuid)
+ {
+ if (string.IsNullOrEmpty(strGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺澶嶅埗鐨勮锛�");
+ return;
+ }
+ var _obj = new
+ {
+ guid = strGuid
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "GetModelIQC",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn =
+ UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ var dy = _rtn.rtnData;
+ var _job = JObject.Parse(strJson);
+ var array = new JArray();
+ foreach (var a in _job["rtnData"]["list"]) array.Add(a);
+ var dt =
+ JsonConvert.DeserializeObject<DataTable>(
+ array.ToString());
+ if (dt.Rows.Count > 0)
+ {
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = dt;
+ gcMx1.ForceInitialize();
+ }
+ else
+ {
+ MsgHelper.Warning("鎻愮ず锛氭病鎵惧埌鐩稿簲鐨勬槑缁嗭紝璇烽�夋嫨鍏跺畠璇曡瘯锛�");
+ }
+ }
+ else
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ private void _setIno()
+ {
+ txt_itemId.KeyFile = "id";
+ txt_itemId.EditChanged += (s, e) =>
+ {
+ txt_itemModel.Text = this.txt_itemId.GetModel();
+ txt_itemNo.Text = this.txt_itemId.GetCode();
+ };
+ btnSelect.Click += (s, e) =>
+ {
+ var frm = new SelectCheckDt();
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var lst = new List<string>();
+ lst = ee.StringList;
+ getCopyMx(lst[0]);
+
+ };
+ frm.ShowDialog();
+ };
+ _getListJyxm();
+ _getListJygj();
+ _getListJybz();
+ _getListJssp();
+ _getListJysp();
+ }
+ /// <summary>
+ /// 璇诲彇妫�楠岄」鐩�
+ /// </summary>
+ private void _getListJyxm()
+ {
+ var json = JsonConvert.SerializeObject("QCITEM");
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "MesSysLookupTypesManager/GetItemList", json);
+ var dd = UtilityHelper.ReturnToList(strReturn);
+ var dt = dd.rtnData;
+ foreach (DataRow dr in dt.Rows)
+ {
+ rptJYXM.Items.Add(dr["lookUpName"].ToString());
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 璇诲彇妫�楠屽伐鍏�
+ /// </summary>
+ private void _getListJygj()
+ {
+ var json = JsonConvert.SerializeObject("QATOOLS");
+
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "MesSysLookupTypesManager/GetItemList", json);
+ var dd = UtilityHelper.ReturnToList(strReturn);
+ var dt = dd.rtnData;
+ foreach (DataRow dr in dt.Rows)
+ {
+ rptJYGJ.Items.Add(dr["lookUpName"].ToString());
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ /// 璇诲彇妫�楠屾爣鍑�
+ /// </summary>
+ private void _getListJybz()
+ {
+ var pgq = new PageQueryModel(1, 999999, "CREATE_DATE", "asc", "",
+ " and 1=1");
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",
+ "MesQmAql1Manager/GetListPage", json);
+ var rtn = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = rtn.rtnData.list;
+ foreach (DataRow dr in dt.Rows)
+ {
+ rptJYBZ.Items.Add(dr["SampleSizeNo"].ToString());
+ string ddddd = dr["SampleSizeName"].ToString();
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ Close();
+ Application.Exit();
+ }
+ }
+ /// <summary>
+ /// 璇诲彇鎺ュ彈姘村钩
+ /// </summary>
+ private void _getListJssp()
+ {
+ rptJSSP.Items.AddRange(new string[] {
+ "0.010---(AQL_0_0010)"
+ , "0.015---(AQL_0_0015)"
+ , "0.025---(AQL_0_0025)"
+ ,"0.04---(AQL_0_0040)"
+ ,"0.065---(AQL_0_0065)"
+ ,"0.10---(AQL_0_010)"
+ ,"0.15---(AQL_0_015)"
+ ,"0.25---(AQL_0_025)"
+ ,"0.40---(AQL_0_040)"
+ ,"0.65---(AQL_0_065)"
+ ,"1.00---(AQL_0_100)"
+ ,"1.50---(AQL_0_150)"
+ ,"2.00---(AQL_0_200)"
+ ,"2.50---(AQL_0_250)"
+ });
+ }
+ /// <summary>
+ /// 璇诲彇妫�楠屾按骞�
+ /// </summary>
+ private void _getListJysp()
+ {
+ rptJYSP.Items.AddRange(new string[] {
+ "1.涓�鑸楠屾按骞�(I)"
+ , "2.涓�鑸楠屾按骞�(II)"
+ ,"3.涓�鑸楠屾按骞�(III)"
+ ,"4.鐗规畩妫�楠屾按骞�(S1)"
+ ,"5.鐗规畩妫�楠屾按骞�(S2)"
+ ,"6.鐗规畩妫�楠屾按骞�(S3)"
+ ,"7.鐗规畩妫�楠屾按骞�(S4),"
+ });
+ }
+
+ /// <summary>
+ /// 鍏宠仈妫�楠屾爣鍑嗗悕绉�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptJYBZ_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ ComboBoxEdit comboBox = sender as ComboBoxEdit;
+ if (comboBox != null)
+ {
+ GridView myView = (gcMx1.MainView as GridView);
+ int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
+ myView.SetRowCellValue(dataIndex, "sampleSizeName", "sdf");
+ myView.SetRowCellValue(dataIndex, "gridColumn6", "sdf");
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.resx
index 4795337..d58980a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.resx
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.resx
@@ -1,134 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
- xmlns="">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
- <xsd:element name="root" msdata:IsDataSet="true">
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
<xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string"
- minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="name" use="required"
- type="xsd:string"/>
- <xsd:attribute name="type" type="xsd:string"/>
- <xsd:attribute name="mimetype" type="xsd:string"/>
- <xsd:attribute ref="xml:space"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string"/>
- <xsd:attribute name="name" type="xsd:string"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string"
- minOccurs="0" msdata:Ordinal="1"/>
- <xsd:element name="comment" type="xsd:string"
- minOccurs="0" msdata:Ordinal="2"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string"
- use="required" msdata:Ordinal="1"/>
- <xsd:attribute name="type" type="xsd:string"
- msdata:Ordinal="3"/>
- <xsd:attribute name="mimetype" type="xsd:string"
- msdata:Ordinal="4"/>
- <xsd:attribute ref="xml:space"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string"
- minOccurs="0" msdata:Ordinal="1"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string"
- use="required"/>
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
</xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms,
- Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- </value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms,
- Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- </value>
- </resheader>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
</root>
\ 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 dd025e0..7e129d7 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
@@ -10,7 +10,7 @@
/// <summary>
/// 榛樿鍊�: (newid())
/// </summary>
- public Guid Guid { get; set; }
+ public Guid? Guid { get; set; }
/// <summary>
/// 鍒涘缓浜�
--
Gitblit v1.9.3