From b7d9f2e23cbda587d814c7d07c1664c053c83dcb Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期二, 12 八月 2025 13:58:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs | 105 +++++++++++++++++++++++++++++-----------------------
1 files changed, 58 insertions(+), 47 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs
index 49f9df9..bae9789 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs
@@ -53,6 +53,8 @@
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -67,8 +69,6 @@
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
this.split1.Panel1.SuspendLayout();
@@ -92,10 +92,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
this.SuspendLayout();
//
// split1
@@ -116,7 +116,7 @@
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1040, 511);
- this.split1.SplitterPosition = 110;
+ this.split1.SplitterPosition = 113;
this.split1.TabIndex = 1;
//
// layoutMx1
@@ -137,14 +137,14 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(310, 455, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1040, 110);
+ this.layoutMx1.Size = new System.Drawing.Size(1040, 113);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "dataLayoutControl1";
//
// comLine
//
this.comLine.IsReadly = false;
- this.comLine.Location = new System.Drawing.Point(94, 9);
+ this.comLine.Location = new System.Drawing.Point(94, 12);
this.comLine.Name = "comLine";
this.comLine.Size = new System.Drawing.Size(164, 24);
this.comLine.TabIndex = 14;
@@ -154,7 +154,7 @@
this.btnStart.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
this.btnStart.Appearance.Options.UseBackColor = true;
this.btnStart.Appearance.Options.UseFont = true;
- this.btnStart.Location = new System.Drawing.Point(512, 9);
+ this.btnStart.Location = new System.Drawing.Point(512, 12);
this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(246, 27);
this.btnStart.StyleController = this.layoutMx1;
@@ -164,7 +164,7 @@
//
// cmbSerialPortNum
//
- this.cmbSerialPortNum.Location = new System.Drawing.Point(344, 9);
+ this.cmbSerialPortNum.Location = new System.Drawing.Point(344, 12);
this.cmbSerialPortNum.Name = "cmbSerialPortNum";
this.cmbSerialPortNum.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -177,7 +177,7 @@
// cmbBaudRate
//
this.cmbBaudRate.EditValue = "9600";
- this.cmbBaudRate.Location = new System.Drawing.Point(344, 40);
+ this.cmbBaudRate.Location = new System.Drawing.Point(344, 43);
this.cmbBaudRate.Name = "cmbBaudRate";
this.cmbBaudRate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -195,19 +195,19 @@
//
// txtNum
//
- this.txtNum.Location = new System.Drawing.Point(594, 50);
+ this.txtNum.Location = new System.Drawing.Point(594, 53);
this.txtNum.Name = "txtNum";
this.txtNum.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
this.txtNum.Properties.Appearance.Options.UseFont = true;
this.txtNum.Properties.ReadOnly = true;
- this.txtNum.Size = new System.Drawing.Size(413, 36);
+ this.txtNum.Size = new System.Drawing.Size(434, 36);
this.txtNum.StyleController = this.layoutMx1;
this.txtNum.TabIndex = 8;
//
// comSjw
//
this.comSjw.EditValue = "8";
- this.comSjw.Location = new System.Drawing.Point(94, 40);
+ this.comSjw.Location = new System.Drawing.Point(94, 43);
this.comSjw.Name = "comSjw";
this.comSjw.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -225,7 +225,7 @@
// comStopBits
//
this.comStopBits.EditValue = "1";
- this.comStopBits.Location = new System.Drawing.Point(344, 71);
+ this.comStopBits.Location = new System.Drawing.Point(344, 74);
this.comStopBits.Name = "comStopBits";
this.comStopBits.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -241,7 +241,7 @@
// comParity
//
this.comParity.EditValue = "None";
- this.comParity.Location = new System.Drawing.Point(94, 71);
+ this.comParity.Location = new System.Drawing.Point(94, 74);
this.comParity.Name = "comParity";
this.comParity.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -257,9 +257,9 @@
//
// txtMsg
//
- this.txtMsg.Location = new System.Drawing.Point(344, 74);
+ this.txtMsg.Location = new System.Drawing.Point(94, 123);
this.txtMsg.Name = "txtMsg";
- this.txtMsg.Size = new System.Drawing.Size(663, 27);
+ this.txtMsg.Size = new System.Drawing.Size(414, 35);
this.txtMsg.StyleController = this.layoutMx1;
this.txtMsg.TabIndex = 15;
//
@@ -298,7 +298,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1019, 113);
+ this.Root.Size = new System.Drawing.Size(1040, 113);
this.Root.TextVisible = false;
//
// cmbBaudRate1111
@@ -363,7 +363,7 @@
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem4.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(499, 62);
+ this.layoutControlItem4.Size = new System.Drawing.Size(520, 62);
this.layoutControlItem4.Text = "閲嶉噺";
this.layoutControlItem4.TextSize = new System.Drawing.Size(70, 41);
//
@@ -375,11 +375,33 @@
this.layoutControlItem2.MinSize = new System.Drawing.Size(41, 31);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(499, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(520, 31);
this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem2.Text = "鍚姩";
this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem2.TextVisible = false;
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.comStopBits;
+ this.layoutControlItem8.Location = new System.Drawing.Point(250, 62);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(250, 31);
+ this.layoutControlItem8.Text = "鍋滄浣�";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(70, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txtMsg;
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 111);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem5.Size = new System.Drawing.Size(500, 39);
+ this.layoutControlItem5.Text = "鏀跺垪琛�";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(70, 18);
//
// gcMx1
//
@@ -387,7 +409,7 @@
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(1040, 389);
+ this.gcMx1.Size = new System.Drawing.Size(1040, 386);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -416,6 +438,7 @@
this.gridColumn1.FieldName = "flowCode";
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
this.gridColumn1.Width = 94;
@@ -426,6 +449,7 @@
this.gridColumn2.FieldName = "gdbh";
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.OptionsColumn.ReadOnly = true;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
this.gridColumn2.Width = 94;
@@ -436,6 +460,7 @@
this.gridColumn3.FieldName = "itemNo";
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 2;
this.gridColumn3.Width = 94;
@@ -446,6 +471,7 @@
this.gridColumn4.FieldName = "itemName";
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 3;
this.gridColumn4.Width = 94;
@@ -456,6 +482,7 @@
this.gridColumn5.FieldName = "itemModel";
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 4;
this.gridColumn5.Width = 94;
@@ -466,6 +493,7 @@
this.gridColumn6.FieldName = "processNo";
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 5;
this.gridColumn6.Width = 94;
@@ -476,6 +504,7 @@
this.gridColumn8.FieldName = "lineName";
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.OptionsColumn.ReadOnly = true;
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 6;
this.gridColumn8.Width = 94;
@@ -486,6 +515,7 @@
this.gridColumn9.FieldName = "createBy";
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 7;
this.gridColumn9.Width = 94;
@@ -496,6 +526,7 @@
this.gridColumn10.FieldName = "createDate";
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.OptionsColumn.ReadOnly = true;
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 8;
this.gridColumn10.Width = 94;
@@ -506,6 +537,7 @@
this.gridColumn11.FieldName = "sjWeight";
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.OptionsColumn.ReadOnly = true;
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 9;
this.gridColumn11.Width = 94;
@@ -516,6 +548,7 @@
this.gridColumn12.FieldName = "maxWeight";
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.OptionsColumn.ReadOnly = true;
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 10;
this.gridColumn12.Width = 94;
@@ -526,32 +559,10 @@
this.gridColumn13.FieldName = "minWeight";
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.OptionsColumn.ReadOnly = true;
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 11;
this.gridColumn13.Width = 94;
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txtMsg;
- this.layoutControlItem5.Location = new System.Drawing.Point(250, 62);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(749, 31);
- this.layoutControlItem5.Text = "鏀跺垪琛�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(70, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.comStopBits;
- this.layoutControlItem8.Location = new System.Drawing.Point(250, 62);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(250, 31);
- this.layoutControlItem8.Text = "鍋滄浣�";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(70, 18);
//
// Frm_Work09
//
@@ -586,10 +597,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
this.ResumeLayout(false);
}
@@ -628,7 +639,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraEditors.MemoEdit txtMsg;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
}
}
\ No newline at end of file
--
Gitblit v1.9.3