From 90e299b80de5fc94740edc36169f1dc6fc782578 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 07 五月 2025 07:50:46 +0800
Subject: [PATCH] 工单
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs | 6
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs | 580 ++++++++++++++++++++++++++++-----------------------------
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs | 1
3 files changed, 291 insertions(+), 296 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs
index 2312bd6..26d3554 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs
@@ -45,7 +45,6 @@
/// </summary>
private void _getListJyxm()
{
-
var pgq = new PageQueryModel(1, 999999, "a.processNo", "asc", "", "");
var json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
index f017fa1..9f8dcb8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
@@ -32,6 +32,7 @@
DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
@@ -81,33 +82,32 @@
this.txt_isCheck = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
- this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa005 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -161,26 +161,26 @@
((System.ComponentModel.ISupportInitialize)(this.txt_isCheck.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -217,7 +217,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(504, 38);
+ this.pageBar1.Size = new System.Drawing.Size(516, 38);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
@@ -254,9 +254,10 @@
// split1.Panel2
//
this.split1.Panel2.Controls.Add(this.splitMx1);
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1236, 632);
- this.split1.SplitterPosition = 504;
+ this.split1.SplitterPosition = 516;
this.split1.TabIndex = 0;
//
// gcMain1
@@ -265,7 +266,7 @@
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(504, 594);
+ this.gcMain1.Size = new System.Drawing.Size(516, 594);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -361,7 +362,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -372,8 +373,9 @@
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
- this.splitMx1.Size = new System.Drawing.Size(720, 632);
- this.splitMx1.SplitterPosition = 170;
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Size = new System.Drawing.Size(708, 632);
+ this.splitMx1.SplitterPosition = 189;
this.splitMx1.TabIndex = 1;
//
// layoutMx1
@@ -402,12 +404,13 @@
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem16,
- this.layoutControlItem24});
+ this.layoutControlItem24,
+ this.layoutControlItem2});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(72, 11, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(39, 252, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(720, 170);
+ this.layoutMx1.Size = new System.Drawing.Size(708, 189);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -422,80 +425,80 @@
//
// txt_fMaxWeight
//
- this.txt_fMaxWeight.Location = new System.Drawing.Point(438, 74);
+ this.txt_fMaxWeight.Location = new System.Drawing.Point(498, 12);
this.txt_fMaxWeight.Name = "txt_fMaxWeight";
this.txt_fMaxWeight.Properties.Appearance.Options.UseFont = true;
- this.txt_fMaxWeight.Size = new System.Drawing.Size(79, 24);
+ this.txt_fMaxWeight.Size = new System.Drawing.Size(62, 24);
this.txt_fMaxWeight.StyleController = this.layoutMx1;
this.txt_fMaxWeight.TabIndex = 378;
this.txt_fMaxWeight.Tag = "fissueType";
//
// txt_fMinWeight
//
- this.txt_fMinWeight.Location = new System.Drawing.Point(438, 105);
+ this.txt_fMinWeight.Location = new System.Drawing.Point(498, 43);
this.txt_fMinWeight.Name = "txt_fMinWeight";
this.txt_fMinWeight.Properties.Appearance.Options.UseFont = true;
- this.txt_fMinWeight.Size = new System.Drawing.Size(79, 24);
+ this.txt_fMinWeight.Size = new System.Drawing.Size(62, 24);
this.txt_fMinWeight.StyleController = this.layoutMx1;
this.txt_fMinWeight.TabIndex = 370;
this.txt_fMinWeight.Tag = "finishRate";
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(99, 74);
+ this.txt_itemName.Location = new System.Drawing.Point(84, 74);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(78, 27);
+ this.txt_itemName.Size = new System.Drawing.Size(200, 27);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 216;
this.txt_itemName.Tag = "readonly";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(99, 105);
+ this.txt_itemModel.Location = new System.Drawing.Point(99, 108);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(78, 27);
+ this.txt_itemModel.Size = new System.Drawing.Size(215, 28);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 219;
this.txt_itemModel.Tag = "readonly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(99, 43);
+ this.txt_itemNo.Location = new System.Drawing.Point(84, 43);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(78, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(200, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 213;
this.txt_itemNo.Tag = "readonly";
//
// txt_fSumPeople
//
- this.txt_fSumPeople.Location = new System.Drawing.Point(268, 74);
+ this.txt_fSumPeople.Location = new System.Drawing.Point(360, 74);
this.txt_fSumPeople.Name = "txt_fSumPeople";
this.txt_fSumPeople.Properties.Appearance.Options.UseFont = true;
- this.txt_fSumPeople.Size = new System.Drawing.Size(79, 24);
+ this.txt_fSumPeople.Size = new System.Drawing.Size(62, 24);
this.txt_fSumPeople.StyleController = this.layoutMx1;
this.txt_fSumPeople.TabIndex = 231;
this.txt_fSumPeople.Tag = "itemVersion";
//
// txt_fCapacity
//
- this.txt_fCapacity.Location = new System.Drawing.Point(268, 105);
+ this.txt_fCapacity.Location = new System.Drawing.Point(498, 74);
this.txt_fCapacity.Name = "txt_fCapacity";
this.txt_fCapacity.Properties.Appearance.Options.UseFont = true;
- this.txt_fCapacity.Size = new System.Drawing.Size(79, 24);
+ this.txt_fCapacity.Size = new System.Drawing.Size(62, 24);
this.txt_fCapacity.StyleController = this.layoutMx1;
this.txt_fCapacity.TabIndex = 319;
this.txt_fCapacity.Tag = "bomNo";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(268, 136);
+ this.txt_remark.Location = new System.Drawing.Point(84, 105);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(419, 24);
+ this.txt_remark.Size = new System.Drawing.Size(200, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 258;
this.txt_remark.Tag = "lowLimt";
@@ -503,7 +506,7 @@
// txt_fJingDu
//
this.txt_fJingDu.EditValue = "PSC娴�";
- this.txt_fJingDu.Location = new System.Drawing.Point(268, 43);
+ this.txt_fJingDu.Location = new System.Drawing.Point(360, 43);
this.txt_fJingDu.Name = "txt_fJingDu";
this.txt_fJingDu.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -511,41 +514,41 @@
"PSC娴�",
"LOT娴�"});
this.txt_fJingDu.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fJingDu.Size = new System.Drawing.Size(79, 24);
+ this.txt_fJingDu.Size = new System.Drawing.Size(62, 24);
this.txt_fJingDu.StyleController = this.layoutMx1;
this.txt_fJingDu.TabIndex = 413;
//
// txt_fBegDate
//
this.txt_fBegDate.EditValue = null;
- this.txt_fBegDate.Location = new System.Drawing.Point(438, 12);
+ this.txt_fBegDate.Location = new System.Drawing.Point(360, 105);
this.txt_fBegDate.Name = "txt_fBegDate";
this.txt_fBegDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fBegDate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_fBegDate.Size = new System.Drawing.Size(79, 24);
+ this.txt_fBegDate.Size = new System.Drawing.Size(200, 24);
this.txt_fBegDate.StyleController = this.layoutMx1;
this.txt_fBegDate.TabIndex = 414;
//
// txt_fEndDate
//
this.txt_fEndDate.EditValue = null;
- this.txt_fEndDate.Location = new System.Drawing.Point(438, 43);
+ this.txt_fEndDate.Location = new System.Drawing.Point(360, 136);
this.txt_fEndDate.Name = "txt_fEndDate";
this.txt_fEndDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fEndDate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_fEndDate.Size = new System.Drawing.Size(79, 24);
+ this.txt_fEndDate.Size = new System.Drawing.Size(200, 24);
this.txt_fEndDate.StyleController = this.layoutMx1;
this.txt_fEndDate.TabIndex = 415;
//
// txt_orgName
//
- this.txt_orgName.Location = new System.Drawing.Point(99, 12);
+ this.txt_orgName.Location = new System.Drawing.Point(84, 12);
this.txt_orgName.Name = "txt_orgName";
- this.txt_orgName.Size = new System.Drawing.Size(78, 24);
+ this.txt_orgName.Size = new System.Drawing.Size(200, 24);
this.txt_orgName.StyleController = this.layoutMx1;
this.txt_orgName.TabIndex = 417;
this.txt_orgName.Tag = "readonly";
@@ -553,7 +556,7 @@
// txt_fType
//
this.txt_fType.EditValue = "-璇烽�夋嫨-";
- this.txt_fType.Location = new System.Drawing.Point(268, 12);
+ this.txt_fType.Location = new System.Drawing.Point(360, 12);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -562,7 +565,7 @@
"F-閲忎骇",
"S-璇曚綔"});
this.txt_fType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fType.Size = new System.Drawing.Size(79, 24);
+ this.txt_fType.Size = new System.Drawing.Size(62, 24);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 418;
//
@@ -588,46 +591,46 @@
//
// txt_lastUpdateBy
//
- this.txt_lastUpdateBy.Location = new System.Drawing.Point(608, 12);
+ this.txt_lastUpdateBy.Location = new System.Drawing.Point(636, 12);
this.txt_lastUpdateBy.Name = "txt_lastUpdateBy";
- this.txt_lastUpdateBy.Size = new System.Drawing.Size(79, 24);
+ this.txt_lastUpdateBy.Size = new System.Drawing.Size(62, 24);
this.txt_lastUpdateBy.StyleController = this.layoutMx1;
this.txt_lastUpdateBy.TabIndex = 421;
this.txt_lastUpdateBy.Tag = "readonly";
//
// txt_lastUpdateDate
//
- this.txt_lastUpdateDate.Location = new System.Drawing.Point(608, 43);
+ this.txt_lastUpdateDate.Location = new System.Drawing.Point(636, 43);
this.txt_lastUpdateDate.Name = "txt_lastUpdateDate";
- this.txt_lastUpdateDate.Size = new System.Drawing.Size(79, 24);
+ this.txt_lastUpdateDate.Size = new System.Drawing.Size(62, 24);
this.txt_lastUpdateDate.StyleController = this.layoutMx1;
this.txt_lastUpdateDate.TabIndex = 422;
this.txt_lastUpdateDate.Tag = "readonly";
//
// txt_checkBy
//
- this.txt_checkBy.Location = new System.Drawing.Point(608, 74);
+ this.txt_checkBy.Location = new System.Drawing.Point(636, 74);
this.txt_checkBy.Name = "txt_checkBy";
- this.txt_checkBy.Size = new System.Drawing.Size(79, 24);
+ this.txt_checkBy.Size = new System.Drawing.Size(62, 24);
this.txt_checkBy.StyleController = this.layoutMx1;
this.txt_checkBy.TabIndex = 423;
this.txt_checkBy.Tag = "readonly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(608, 105);
+ this.txt_checkDate.Location = new System.Drawing.Point(636, 105);
this.txt_checkDate.Name = "txt_checkDate";
- this.txt_checkDate.Size = new System.Drawing.Size(79, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(62, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 424;
this.txt_checkDate.Tag = "readonly";
//
// txt_isCheck
//
- this.txt_isCheck.Location = new System.Drawing.Point(521, 136);
+ this.txt_isCheck.Location = new System.Drawing.Point(564, 136);
this.txt_isCheck.Name = "txt_isCheck";
this.txt_isCheck.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_isCheck.Size = new System.Drawing.Size(166, 24);
+ this.txt_isCheck.Size = new System.Drawing.Size(134, 24);
this.txt_isCheck.StyleController = this.layoutMx1;
this.txt_isCheck.TabIndex = 425;
this.txt_isCheck.Tag = "readonly";
@@ -655,30 +658,40 @@
this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem24.TextVisible = false;
//
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_itemModel;
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem2.Size = new System.Drawing.Size(306, 32);
+ this.layoutControlItem2.Text = "瑙勬牸鍨嬪彿";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem4,
- this.layoutControlItem9,
- this.layoutControlItem18,
- this.layoutControlItem19,
- this.layoutControlItem8,
- this.layoutControlItem7,
- this.layoutControlItem3,
- this.layoutControlItem2,
this.layoutControlItem1,
this.layoutControlItem5,
this.layoutControlItem14,
- this.layoutControlItem6,
this.layoutControlItem20,
this.layoutControlItem21,
- this.layoutControlItem22,
- this.layoutControlItem23,
+ this.layoutControlItem6,
+ this.layoutControlItem3,
+ this.layoutControlItem7,
this.layoutControlItem25,
- this.layoutControlItem15,
- this.layoutControlItem12});
+ this.layoutControlItem18,
+ this.layoutControlItem19,
+ this.layoutControlItem23,
+ this.layoutControlItem22,
+ this.layoutControlItem8,
+ this.layoutControlItem9,
+ this.layoutControlItem4,
+ this.layoutControlItem12,
+ this.layoutControlItem15});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -689,11 +702,14 @@
columnDefinition3.Width = 100D;
columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition1,
columnDefinition2,
columnDefinition3,
- columnDefinition4});
+ columnDefinition4,
+ columnDefinition5});
rowDefinition1.Height = 100D;
rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition2.Height = 100D;
@@ -710,189 +726,196 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(699, 175);
+ this.Root.Size = new System.Drawing.Size(710, 175);
this.Root.TextVisible = false;
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_fBegDate;
- this.layoutControlItem4.Location = new System.Drawing.Point(339, 0);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(170, 31);
- this.layoutControlItem4.Text = "鐢熸晥鏃ユ湡";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_fEndDate;
- this.layoutControlItem9.Location = new System.Drawing.Point(339, 31);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(170, 31);
- this.layoutControlItem9.Text = "澶辨晥鏃ユ湡";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem18
- //
- this.layoutControlItem18.Control = this.txt_fMaxWeight;
- this.layoutControlItem18.Location = new System.Drawing.Point(339, 62);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem18.Size = new System.Drawing.Size(170, 31);
- this.layoutControlItem18.Text = "閲嶉噺涓婇檺";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem19
- //
- this.layoutControlItem19.Control = this.txt_fMinWeight;
- this.layoutControlItem19.Location = new System.Drawing.Point(339, 93);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem19.Size = new System.Drawing.Size(170, 31);
- this.layoutControlItem19.Text = "閲嶉噺涓嬮檺";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_fCapacity;
- this.layoutControlItem8.CustomizationFormText = "鏍囧噯浜ц兘(PCS?H)";
- this.layoutControlItem8.Location = new System.Drawing.Point(169, 93);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(170, 31);
- this.layoutControlItem8.Text = "鏍囧噯浜ц兘";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_fSumPeople;
- this.layoutControlItem7.Location = new System.Drawing.Point(169, 62);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(170, 31);
- this.layoutControlItem7.Text = "鎬诲畾鍛�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_fJingDu;
- this.layoutControlItem3.Location = new System.Drawing.Point(169, 31);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(170, 31);
- this.layoutControlItem3.Text = "绠＄悊绮惧害";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_itemModel;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 93);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem2.Size = new System.Drawing.Size(169, 31);
- this.layoutControlItem2.Text = "瑙勬牸鍨嬪彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_itemName;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem1.Size = new System.Drawing.Size(169, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem1.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo;
this.layoutControlItem5.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(169, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_orgName;
this.layoutControlItem14.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.Size = new System.Drawing.Size(169, 31);
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem14.Text = "浣跨敤缁勭粐";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_fType;
- this.layoutControlItem6.Location = new System.Drawing.Point(169, 0);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(170, 31);
- this.layoutControlItem6.Text = "鐢熶骇绫诲瀷";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_lastUpdateBy;
- this.layoutControlItem20.Location = new System.Drawing.Point(509, 0);
+ this.layoutControlItem20.CustomizationFormText = "鏇存柊浜哄憳";
+ this.layoutControlItem20.Location = new System.Drawing.Point(552, 0);
this.layoutControlItem20.Name = "layoutControlItem20";
- this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(170, 31);
- this.layoutControlItem20.Text = "鏈�鍚庢洿鏂颁汉";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem20.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem20.Text = "鏇存柊浜哄憳";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_lastUpdateDate;
- this.layoutControlItem21.Location = new System.Drawing.Point(509, 31);
+ this.layoutControlItem21.Location = new System.Drawing.Point(552, 31);
this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 4;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(170, 31);
+ this.layoutControlItem21.Size = new System.Drawing.Size(138, 31);
this.layoutControlItem21.Text = "鏇存柊鏃堕棿";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem22
+ // layoutControlItem6
//
- this.layoutControlItem22.Control = this.txt_checkBy;
- this.layoutControlItem22.Location = new System.Drawing.Point(509, 62);
- this.layoutControlItem22.Name = "layoutControlItem22";
- this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(170, 31);
- this.layoutControlItem22.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem6.Control = this.txt_fType;
+ this.layoutControlItem6.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem6.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem6.Text = "鐢熶骇绫诲瀷";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem23
+ // layoutControlItem3
//
- this.layoutControlItem23.Control = this.txt_checkDate;
- this.layoutControlItem23.Location = new System.Drawing.Point(509, 93);
- this.layoutControlItem23.Name = "layoutControlItem23";
- this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(170, 31);
- this.layoutControlItem23.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem3.Control = this.txt_fJingDu;
+ this.layoutControlItem3.Location = new System.Drawing.Point(276, 31);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem3.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem3.Text = "绠＄悊绮惧害";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_fSumPeople;
+ this.layoutControlItem7.Location = new System.Drawing.Point(276, 62);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem7.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem7.Text = "鎬诲畾鍛�";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_isCheck;
- this.layoutControlItem25.Location = new System.Drawing.Point(509, 124);
+ this.layoutControlItem25.Location = new System.Drawing.Point(552, 124);
this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 4;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem25.Size = new System.Drawing.Size(170, 31);
+ this.layoutControlItem25.Size = new System.Drawing.Size(138, 31);
this.layoutControlItem25.Text = "瀹℃牳鐘舵��";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txt_fMaxWeight;
+ this.layoutControlItem18.Location = new System.Drawing.Point(414, 0);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem18.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem18.Text = "閲嶉噺涓婇檺";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_fMinWeight;
+ this.layoutControlItem19.Location = new System.Drawing.Point(414, 31);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem19.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem19.Text = "閲嶉噺涓嬮檺";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.txt_checkDate;
+ this.layoutControlItem23.Location = new System.Drawing.Point(552, 93);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem23.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem23.Text = "瀹℃牳鏃堕棿";
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem22
+ //
+ this.layoutControlItem22.Control = this.txt_checkBy;
+ this.layoutControlItem22.Location = new System.Drawing.Point(552, 62);
+ this.layoutControlItem22.Name = "layoutControlItem22";
+ this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem22.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem22.Text = "瀹℃牳浜哄憳";
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_fCapacity;
+ this.layoutControlItem8.CustomizationFormText = "鏍囧噯浜ц兘(PCS?H)";
+ this.layoutControlItem8.Location = new System.Drawing.Point(414, 62);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem8.Text = "鏍囧噯浜ц兘";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_fEndDate;
+ this.layoutControlItem9.Location = new System.Drawing.Point(276, 124);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem9.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem9.Text = "澶辨晥鏃ユ湡";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_fBegDate;
+ this.layoutControlItem4.Location = new System.Drawing.Point(276, 93);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem4.Text = "鐢熸晥鏃ユ湡";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_remark;
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 93);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem12.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem12.Text = "娴佺▼鎻忚堪";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
@@ -902,23 +925,11 @@
this.layoutControlItem15.MinSize = new System.Drawing.Size(90, 31);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem15.Size = new System.Drawing.Size(169, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(138, 31);
this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem15.Text = "閫夋嫨宸ュ簭";
this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem15.TextVisible = false;
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_remark;
- this.layoutControlItem12.Location = new System.Drawing.Point(169, 124);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 3;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem12.Size = new System.Drawing.Size(510, 31);
- this.layoutControlItem12.Text = "娴佺▼鎻忚堪";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
//
// tabMx
//
@@ -926,7 +937,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(720, 450);
+ this.tabMx.Size = new System.Drawing.Size(708, 431);
this.tabMx.TabIndex = 4;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -935,7 +946,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(718, 418);
+ this.tabMxPage1.Size = new System.Drawing.Size(706, 399);
this.tabMxPage1.Text = "宸ュ簭淇℃伅";
//
// gcMx1
@@ -952,7 +963,7 @@
this.repositoryItemComboBox1,
this.repositoryItemComboBox2,
this.rptGx});
- this.gcMx1.Size = new System.Drawing.Size(718, 418);
+ this.gcMx1.Size = new System.Drawing.Size(706, 399);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -965,7 +976,6 @@
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1daa002,
this.gvMx1daa010,
- this.gvMx1daa005,
this.gvMx1daa003,
this.gridColumn1,
this.gvMx1daa004,
@@ -993,12 +1003,12 @@
this.gvMx1daa002.Tag = "edit";
this.gvMx1daa002.Visible = true;
this.gvMx1daa002.VisibleIndex = 0;
- this.gvMx1daa002.Width = 50;
+ this.gvMx1daa002.Width = 54;
//
// gvMx1daa010
//
this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa010.Caption = "宸ュ簭浠ｇ爜";
+ this.gvMx1daa010.Caption = "宸ュ簭浠ｇ爜:鍚嶇О";
this.gvMx1daa010.FieldName = "processNo";
this.gvMx1daa010.MinWidth = 50;
this.gvMx1daa010.Name = "gvMx1daa010";
@@ -1006,20 +1016,7 @@
this.gvMx1daa010.Tag = "query_a.daa010";
this.gvMx1daa010.Visible = true;
this.gvMx1daa010.VisibleIndex = 1;
- this.gvMx1daa010.Width = 72;
- //
- // gvMx1daa005
- //
- this.gvMx1daa005.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa005.Caption = "宸ュ簭鍚嶇О";
- this.gvMx1daa005.FieldName = "processName";
- this.gvMx1daa005.MinWidth = 50;
- this.gvMx1daa005.Name = "gvMx1daa005";
- this.gvMx1daa005.OptionsColumn.ReadOnly = true;
- this.gvMx1daa005.Tag = "query_a.daa005";
- this.gvMx1daa005.Visible = true;
- this.gvMx1daa005.VisibleIndex = 2;
- this.gvMx1daa005.Width = 72;
+ this.gvMx1daa010.Width = 129;
//
// gvMx1daa003
//
@@ -1036,8 +1033,8 @@
this.gvMx1daa003.OptionsColumn.ReadOnly = true;
this.gvMx1daa003.Tag = "edit";
this.gvMx1daa003.Visible = true;
- this.gvMx1daa003.VisibleIndex = 3;
- this.gvMx1daa003.Width = 117;
+ this.gvMx1daa003.VisibleIndex = 2;
+ this.gvMx1daa003.Width = 114;
//
// repositoryItemComboBox1
//
@@ -1064,8 +1061,8 @@
this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Tag = "edit";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.Width = 92;
//
// repositoryItemComboBox2
//
@@ -1092,13 +1089,13 @@
this.gvMx1daa004.Caption = "涓婂伐搴忕紪鍙�";
this.gvMx1daa004.ColumnEdit = this.rptGx;
this.gvMx1daa004.FieldName = "frontProcessNo";
- this.gvMx1daa004.MinWidth = 50;
+ this.gvMx1daa004.MinWidth = 150;
this.gvMx1daa004.Name = "gvMx1daa004";
this.gvMx1daa004.OptionsColumn.ReadOnly = true;
this.gvMx1daa004.Tag = "edit";
this.gvMx1daa004.Visible = true;
- this.gvMx1daa004.VisibleIndex = 5;
- this.gvMx1daa004.Width = 87;
+ this.gvMx1daa004.VisibleIndex = 4;
+ this.gvMx1daa004.Width = 150;
//
// rptGx
//
@@ -1122,8 +1119,8 @@
this.gvMx1reporttime.OptionsColumn.ReadOnly = true;
this.gvMx1reporttime.Tag = "edit";
this.gvMx1reporttime.Visible = true;
- this.gvMx1reporttime.VisibleIndex = 6;
- this.gvMx1reporttime.Width = 102;
+ this.gvMx1reporttime.VisibleIndex = 5;
+ this.gvMx1reporttime.Width = 89;
//
// gvMxDel
//
@@ -1133,8 +1130,8 @@
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.OptionsColumn.ReadOnly = true;
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 7;
- this.gvMxDel.Width = 94;
+ this.gvMxDel.VisibleIndex = 6;
+ this.gvMxDel.Width = 65;
//
// repositoryItemButtonEdit1
//
@@ -1158,7 +1155,7 @@
// picCheckBox
//
this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
- this.picCheckBox.Location = new System.Drawing.Point(1006, 55);
+ this.picCheckBox.Location = new System.Drawing.Point(1093, 30);
this.picCheckBox.Name = "picCheckBox";
this.picCheckBox.Size = new System.Drawing.Size(100, 50);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -1218,26 +1215,26 @@
((System.ComponentModel.ISupportInitialize)(this.txt_isCheck.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1282,7 +1279,6 @@
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa002;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa010;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa005;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa003;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1reporttime;
@@ -1290,20 +1286,12 @@
private DevExpress.XtraEditors.ComboBoxEdit txt_fJingDu;
private DevExpress.XtraEditors.DateEdit txt_fBegDate;
private DevExpress.XtraEditors.DateEdit txt_fEndDate;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.XtraEditors.TextEdit txt_orgName;
private DevExpress.XtraEditors.ComboBoxEdit txt_fType;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.SimpleButton btnSelect;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
@@ -1317,15 +1305,23 @@
private DevExpress.XtraEditors.TextEdit txt_checkBy;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.CheckEdit txt_isCheck;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private System.Windows.Forms.PictureBox picCheckBox;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptGx;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
index fe9c91c..dfac085 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
@@ -62,8 +62,8 @@
_row["fSeq"] = dym.fSeq;
_row["statStatus"] = "Y-鏄�";
_row["collectionName"] = "绌�";
- _row["processNo"] = dym.processNo;
- _row["processName"] = dym.processName;
+ _row["processNo"] = dym.processNo+":"+ dym.processName;
+ //_row["processName"] = dym.processName;
_Table.Rows.Add(_row);
}
gcMx1.BindingContext = new BindingContext();
@@ -515,7 +515,7 @@
rptGx.Items.Add("绌�");
foreach (DataRow dr in dt.Rows)
{
- rptGx.Items.Add(dr["processNo"].ToString());
+ rptGx.Items.Add(dr["processNo"].ToString()+":"+ dr["processName"].ToString());
}
}
catch (Exception ex)
--
Gitblit v1.9.3