From f4d5aa97370f698c63b0b9f185f06e7bae56975c Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期二, 19 八月 2025 08:15:50 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs | 326 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 210 insertions(+), 116 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
index 07225ae..af362ec 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -67,8 +67,6 @@
this.layoutMx1 = new DevExpress.XtraDataLayout.DataLayoutControl();
this.btnCopy = new DevExpress.XtraEditors.SimpleButton();
this.lbGuid = new System.Windows.Forms.Label();
- this.txt_fSubsidiary = new Gs.DevApp.UserControl.UcLookOrg();
- this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
this.txt_foneCheckdate = new DevExpress.XtraEditors.TextEdit();
this.txt_foneCheckor = new DevExpress.XtraEditors.TextEdit();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
@@ -77,19 +75,23 @@
this.txt_foneChecked = new DevExpress.XtraEditors.CheckEdit();
this.txt_ftype = new DevExpress.XtraEditors.TextEdit();
this.txt_isenabled = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_itemId = new DevExpress.XtraEditors.ButtonEdit();
+ this.txt_mc = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fSubsidiary = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -117,8 +119,13 @@
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptStation = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptGroup = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -148,19 +155,23 @@
((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftype.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mc.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -174,6 +185,8 @@
((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptStation)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptGroup)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
@@ -309,8 +322,6 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.AllowEdit = false;
this.gridColumn7.Tag = "query_a.ITEM_ID";
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 1;
this.gridColumn7.Width = 94;
//
// gv_itemNo
@@ -323,7 +334,7 @@
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_b.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 2;
+ this.gv_itemNo.VisibleIndex = 1;
this.gv_itemNo.Width = 150;
//
// gridColumn3
@@ -335,7 +346,7 @@
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.Tag = "query_b.item_name";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.VisibleIndex = 2;
this.gridColumn3.Width = 250;
//
// gridColumn2
@@ -348,7 +359,7 @@
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Tag = "query_b.item_model";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 4;
+ this.gridColumn2.VisibleIndex = 3;
this.gridColumn2.Width = 100;
//
// gv_foneCheckor
@@ -361,7 +372,7 @@
this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR";
this.gv_foneCheckor.Visible = true;
- this.gv_foneCheckor.VisibleIndex = 5;
+ this.gv_foneCheckor.VisibleIndex = 4;
this.gv_foneCheckor.Width = 94;
//
// gv_foneCheckdate
@@ -374,7 +385,7 @@
this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
this.gv_foneCheckdate.Visible = true;
- this.gv_foneCheckdate.VisibleIndex = 6;
+ this.gv_foneCheckdate.VisibleIndex = 5;
this.gv_foneCheckdate.Width = 120;
//
// gridColumn1
@@ -386,7 +397,7 @@
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Tag = "query_a.CREATE_BY";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 7;
+ this.gridColumn1.VisibleIndex = 6;
this.gridColumn1.Width = 94;
//
// gridColumn4
@@ -398,7 +409,7 @@
this.gridColumn4.OptionsColumn.AllowEdit = false;
this.gridColumn4.Tag = "query_a.CREATE_DATE";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 8;
+ this.gridColumn4.VisibleIndex = 7;
this.gridColumn4.Width = 180;
//
// gv_memo
@@ -411,7 +422,7 @@
this.gv_memo.OptionsColumn.AllowEdit = false;
this.gv_memo.Tag = "query_a.MEMO";
this.gv_memo.Visible = true;
- this.gv_memo.VisibleIndex = 9;
+ this.gv_memo.VisibleIndex = 8;
this.gv_memo.Width = 150;
//
// gridColumn16
@@ -431,7 +442,7 @@
this.gridColumn8.OptionsColumn.AllowEdit = false;
this.gridColumn8.Tag = "org.fnumber";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 10;
+ this.gridColumn8.VisibleIndex = 9;
this.gridColumn8.Width = 250;
//
// gridColumn18
@@ -441,7 +452,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 11;
+ this.gridColumn18.VisibleIndex = 10;
this.gridColumn18.Width = 94;
//
// pageBar1
@@ -488,8 +499,6 @@
//
this.layoutMx1.Controls.Add(this.btnCopy);
this.layoutMx1.Controls.Add(this.lbGuid);
- this.layoutMx1.Controls.Add(this.txt_fSubsidiary);
- this.layoutMx1.Controls.Add(this.txt_itemId);
this.layoutMx1.Controls.Add(this.txt_foneCheckdate);
this.layoutMx1.Controls.Add(this.txt_foneCheckor);
this.layoutMx1.Controls.Add(this.txt_itemNo);
@@ -498,6 +507,9 @@
this.layoutMx1.Controls.Add(this.txt_foneChecked);
this.layoutMx1.Controls.Add(this.txt_ftype);
this.layoutMx1.Controls.Add(this.txt_isenabled);
+ this.layoutMx1.Controls.Add(this.txt_itemId);
+ this.layoutMx1.Controls.Add(this.txt_mc);
+ this.layoutMx1.Controls.Add(this.txt_fSubsidiary);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem13});
@@ -527,23 +539,6 @@
this.lbGuid.Size = new System.Drawing.Size(269, 28);
this.lbGuid.TabIndex = 387;
this.lbGuid.Text = "label1";
- //
- // txt_fSubsidiary
- //
- this.txt_fSubsidiary.IsReadly = false;
- this.txt_fSubsidiary.Location = new System.Drawing.Point(84, 12);
- this.txt_fSubsidiary.Name = "txt_fSubsidiary";
- this.txt_fSubsidiary.Size = new System.Drawing.Size(200, 24);
- this.txt_fSubsidiary.TabIndex = 383;
- //
- // txt_itemId
- //
- this.txt_itemId.IsReadly = false;
- this.txt_itemId.Location = new System.Drawing.Point(84, 43);
- this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Size = new System.Drawing.Size(200, 24);
- this.txt_itemId.TabIndex = 380;
- this.txt_itemId.Tag = "no";
//
// txt_foneCheckdate
//
@@ -577,10 +572,10 @@
//
// txt_memo
//
- this.txt_memo.Location = new System.Drawing.Point(84, 74);
+ this.txt_memo.Location = new System.Drawing.Point(360, 74);
this.txt_memo.Name = "txt_memo";
this.txt_memo.Properties.Appearance.Options.UseFont = true;
- this.txt_memo.Size = new System.Drawing.Size(477, 24);
+ this.txt_memo.Size = new System.Drawing.Size(201, 24);
this.txt_memo.StyleController = this.layoutMx1;
this.txt_memo.TabIndex = 219;
//
@@ -622,6 +617,34 @@
this.txt_isenabled.TabIndex = 390;
this.txt_isenabled.Tag = "readOnly";
//
+ // txt_itemId
+ //
+ this.txt_itemId.Location = new System.Drawing.Point(84, 12);
+ this.txt_itemId.Name = "txt_itemId";
+ this.txt_itemId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.txt_itemId.Size = new System.Drawing.Size(200, 24);
+ this.txt_itemId.StyleController = this.layoutMx1;
+ this.txt_itemId.TabIndex = 391;
+ //
+ // txt_mc
+ //
+ this.txt_mc.Location = new System.Drawing.Point(84, 43);
+ this.txt_mc.Name = "txt_mc";
+ this.txt_mc.Size = new System.Drawing.Size(200, 24);
+ this.txt_mc.StyleController = this.layoutMx1;
+ this.txt_mc.TabIndex = 392;
+ this.txt_mc.Tag = "readOnly";
+ //
+ // txt_fSubsidiary
+ //
+ this.txt_fSubsidiary.Location = new System.Drawing.Point(84, 74);
+ this.txt_fSubsidiary.Name = "txt_fSubsidiary";
+ this.txt_fSubsidiary.Size = new System.Drawing.Size(200, 24);
+ this.txt_fSubsidiary.StyleController = this.layoutMx1;
+ this.txt_fSubsidiary.TabIndex = 393;
+ this.txt_fSubsidiary.Tag = "readOnly";
+ //
// layoutControlItem13
//
this.layoutControlItem13.Control = this.lbGuid;
@@ -639,17 +662,18 @@
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem1,
- this.layoutControlItem4,
- this.layoutControlItem2,
this.layoutControlItem10,
this.layoutControlItem11,
this.layoutControlItem12,
this.layoutControlItem14,
this.layoutControlItem3,
this.layoutControlItem7,
+ this.layoutControlItem5,
+ this.layoutControlItem1,
this.layoutControlItem8,
- this.layoutControlItem5});
+ this.layoutControlItem2,
+ this.layoutControlItem4,
+ this.layoutControlItem6});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -677,36 +701,6 @@
rowDefinition3});
this.Root.Size = new System.Drawing.Size(1127, 113);
this.Root.TextVisible = false;
- //
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.txt_fSubsidiary;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
- this.layoutControlItem1.Text = "閫夋嫨缁勭粐";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_itemId;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
- this.layoutControlItem4.Text = "閫夋嫨鐗╂枡";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_memo;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 62);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(553, 31);
- this.layoutControlItem2.Text = "澶囨敞";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
@@ -776,17 +770,6 @@
this.layoutControlItem7.Text = "鐗╂枡缂栫爜";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_gg;
- this.layoutControlItem8.Location = new System.Drawing.Point(276, 31);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(277, 31);
- this.layoutControlItem8.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
- //
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_isenabled;
@@ -798,6 +781,57 @@
this.layoutControlItem5.Text = "鍙敤鏍囪瘑";
this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem5.TextVisible = false;
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_itemId;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem1.Text = "閫夋嫨鐗╂枡";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_gg;
+ this.layoutControlItem8.Location = new System.Drawing.Point(276, 31);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem8.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem8.Text = "鐗╂枡瑙勬牸";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_memo;
+ this.layoutControlItem2.Location = new System.Drawing.Point(276, 62);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem2.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem2.Text = "澶囨敞";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_mc;
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_fSubsidiary;
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem6.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem6.Text = "浣跨敤缁勭粐";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// tabMx
//
@@ -831,7 +865,9 @@
this.rptJYSP,
this.repositoryItemButtonEdit1,
this.rptShunXui,
- this.rptStation});
+ this.rptStation,
+ this.repositoryItemCheckEdit1,
+ this.rptGroup});
this.gcMx1.Size = new System.Drawing.Size(1125, 413);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -856,7 +892,10 @@
this.gvMx1fdownAllow,
this.gridColumn19,
this.gvMxDel,
- this.gridColumn6});
+ this.gridColumn11,
+ this.gridColumn6,
+ this.gridColumn9,
+ this.gridColumn10});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -870,6 +909,7 @@
this.gvMx1guid.Caption = "瀛愯〃涓婚敭GUID";
this.gvMx1guid.FieldName = "guid";
this.gvMx1guid.Name = "gvMx1guid";
+ this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
this.gvMx1guid.Width = 94;
//
@@ -879,6 +919,7 @@
this.gvMx1pid.Caption = "涓昏〃涓婚敭GUID";
this.gvMx1pid.FieldName = "pid";
this.gvMx1pid.Name = "gvMx1pid";
+ this.gvMx1pid.OptionsColumn.ReadOnly = true;
this.gvMx1pid.Tag = "query_a.pid";
this.gvMx1pid.Width = 94;
//
@@ -891,7 +932,7 @@
this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
this.gvMx1fcheckItem.Tag = "edit";
this.gvMx1fcheckItem.Visible = true;
- this.gvMx1fcheckItem.VisibleIndex = 0;
+ this.gvMx1fcheckItem.VisibleIndex = 1;
this.gvMx1fcheckItem.Width = 150;
//
// rptJYXM
@@ -910,7 +951,7 @@
this.gvMx1forder.Name = "gvMx1forder";
this.gvMx1forder.Tag = "yz_quantity_0_edit";
this.gvMx1forder.Visible = true;
- this.gvMx1forder.VisibleIndex = 1;
+ this.gvMx1forder.VisibleIndex = 0;
this.gvMx1forder.Width = 50;
//
// rptShunXui
@@ -953,8 +994,6 @@
this.gvMx1memo.FieldName = "memo";
this.gvMx1memo.Name = "gvMx1memo";
this.gvMx1memo.Tag = "edit";
- this.gvMx1memo.Visible = true;
- this.gvMx1memo.VisibleIndex = 3;
this.gvMx1memo.Width = 150;
//
// gvMx1fcheckTool
@@ -966,7 +1005,7 @@
this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
this.gvMx1fcheckTool.Tag = "edit";
this.gvMx1fcheckTool.Visible = true;
- this.gvMx1fcheckTool.VisibleIndex = 4;
+ this.gvMx1fcheckTool.VisibleIndex = 3;
this.gvMx1fcheckTool.Width = 150;
//
// rptJYGJ
@@ -985,7 +1024,7 @@
this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
this.gvMx1sampleSizeNo.Tag = "edit";
this.gvMx1sampleSizeNo.Visible = true;
- this.gvMx1sampleSizeNo.VisibleIndex = 5;
+ this.gvMx1sampleSizeNo.VisibleIndex = 4;
this.gvMx1sampleSizeNo.Width = 150;
//
// rptJYBZ
@@ -1004,8 +1043,6 @@
this.sampleSizeName.Name = "sampleSizeName";
this.sampleSizeName.OptionsColumn.ReadOnly = true;
this.sampleSizeName.Tag = "edit";
- this.sampleSizeName.Visible = true;
- this.sampleSizeName.VisibleIndex = 6;
this.sampleSizeName.Width = 150;
//
// gvMx1fcheckLevel
@@ -1017,7 +1054,7 @@
this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
this.gvMx1fcheckLevel.Tag = "edit";
this.gvMx1fcheckLevel.Visible = true;
- this.gvMx1fcheckLevel.VisibleIndex = 7;
+ this.gvMx1fcheckLevel.VisibleIndex = 5;
this.gvMx1fcheckLevel.Width = 200;
//
// rptJYSP
@@ -1037,7 +1074,7 @@
this.gvMx1facLevel.Name = "gvMx1facLevel";
this.gvMx1facLevel.Tag = "edit";
this.gvMx1facLevel.Visible = true;
- this.gvMx1facLevel.VisibleIndex = 8;
+ this.gvMx1facLevel.VisibleIndex = 6;
this.gvMx1facLevel.Width = 150;
//
// rptJSSP
@@ -1056,7 +1093,7 @@
this.gvMx1fupAllow.Name = "gvMx1fupAllow";
this.gvMx1fupAllow.Tag = "yz_quantity_0_edit";
this.gvMx1fupAllow.Visible = true;
- this.gvMx1fupAllow.VisibleIndex = 9;
+ this.gvMx1fupAllow.VisibleIndex = 7;
this.gvMx1fupAllow.Width = 60;
//
// gvMx1fstand
@@ -1067,7 +1104,7 @@
this.gvMx1fstand.Name = "gvMx1fstand";
this.gvMx1fstand.Tag = "yz_quantity_0_edit";
this.gvMx1fstand.Visible = true;
- this.gvMx1fstand.VisibleIndex = 10;
+ this.gvMx1fstand.VisibleIndex = 8;
this.gvMx1fstand.Width = 60;
//
// gvMx1fdownAllow
@@ -1078,7 +1115,7 @@
this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
this.gvMx1fdownAllow.Tag = "yz_quantity_0_edit";
this.gvMx1fdownAllow.Visible = true;
- this.gvMx1fdownAllow.VisibleIndex = 11;
+ this.gvMx1fdownAllow.VisibleIndex = 9;
this.gvMx1fdownAllow.Width = 60;
//
// gridColumn19
@@ -1088,7 +1125,7 @@
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Tag = "edit";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 12;
+ this.gridColumn19.VisibleIndex = 10;
this.gridColumn19.Width = 94;
//
// gvMxDel
@@ -1098,7 +1135,7 @@
this.gvMxDel.MinWidth = 50;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 14;
+ this.gvMxDel.VisibleIndex = 13;
this.gvMxDel.Width = 100;
//
// repositoryItemButtonEdit1
@@ -1112,6 +1149,15 @@
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "鍗曚綅";
+ this.gridColumn11.FieldName = "funit";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Tag = "edit";
+ this.gridColumn11.Width = 94;
+ //
// gridColumn6
//
this.gridColumn6.Caption = "宸ヤ綅";
@@ -1121,7 +1167,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Tag = "edit";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 13;
+ this.gridColumn6.VisibleIndex = 11;
this.gridColumn6.Width = 94;
//
// rptStation
@@ -1131,6 +1177,41 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.rptStation.Name = "rptStation";
this.rptStation.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "鏄惁棣栨璁よ瘉";
+ this.gridColumn9.ColumnEdit = this.repositoryItemCheckEdit1;
+ this.gridColumn9.FieldName = "isRzxx";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Tag = "edit";
+ this.gridColumn9.UnboundDataType = typeof(bool);
+ this.gridColumn9.Width = 94;
+ //
+ // repositoryItemCheckEdit1
+ //
+ this.repositoryItemCheckEdit1.AutoHeight = false;
+ this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "鎵�灞炲ぇ绫�";
+ this.gridColumn10.ColumnEdit = this.rptGroup;
+ this.gridColumn10.FieldName = "fcheckType";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Tag = "edit";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 12;
+ this.gridColumn10.Width = 94;
+ //
+ // rptGroup
+ //
+ this.rptGroup.AutoHeight = false;
+ this.rptGroup.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptGroup.Name = "rptGroup";
//
// picCheckBox
//
@@ -1179,19 +1260,23 @@
((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftype.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mc.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1205,6 +1290,8 @@
((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptStation)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptGroup)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -1234,14 +1321,10 @@
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraDataLayout.DataLayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private UserControl.UcLookOrg txt_fSubsidiary;
- private UserControl.UcLookItems txt_itemId;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
private DevExpress.XtraEditors.TextEdit txt_foneCheckdate;
private DevExpress.XtraEditors.TextEdit txt_foneCheckor;
private DevExpress.XtraEditors.TextEdit txt_memo;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraEditors.TextEdit txt_gg;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.CheckEdit txt_foneChecked;
@@ -1272,7 +1355,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
@@ -1286,9 +1368,21 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptStation;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
+ private DevExpress.XtraEditors.ButtonEdit txt_itemId;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraEditors.TextEdit txt_mc;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraEditors.TextEdit txt_fSubsidiary;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptGroup;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
}
}
\ No newline at end of file
--
Gitblit v1.9.3