|
@@ -29,7 +29,6 @@
|
|
|
private void InitializeComponent()
|
|
|
{
|
|
|
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
|
|
|
- this.label1 = new System.Windows.Forms.Label();
|
|
|
this.txt_PLCCode = new DevExpress.XtraEditors.TextEdit();
|
|
|
this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
|
|
|
this.txt_Color = new DevExpress.XtraEditors.TextEdit();
|
|
@@ -41,12 +40,15 @@
|
|
|
this.btn_getRecentRemark = new DevExpress.XtraEditors.SimpleButton();
|
|
|
this.btn_Add = new DevExpress.XtraEditors.SimpleButton();
|
|
|
this.btn_Save = new DevExpress.XtraEditors.SimpleButton();
|
|
|
+ this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
|
|
|
+ this.chk_NeedShelf = new DevExpress.XtraEditors.CheckEdit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
|
|
|
this.panelControl1.SuspendLayout();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.txt_PLCCode.Properties)).BeginInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.txt_Color.Properties)).BeginInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.txt_ProType.Properties)).BeginInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).BeginInit();
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.chk_NeedShelf.Properties)).BeginInit();
|
|
|
this.SuspendLayout();
|
|
|
//
|
|
|
// panelControl1
|
|
@@ -54,7 +56,8 @@
|
|
|
this.panelControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
|
|
| System.Windows.Forms.AnchorStyles.Left)
|
|
|
| System.Windows.Forms.AnchorStyles.Right)));
|
|
|
- this.panelControl1.Controls.Add(this.label1);
|
|
|
+ this.panelControl1.Controls.Add(this.chk_NeedShelf);
|
|
|
+ this.panelControl1.Controls.Add(this.labelControl1);
|
|
|
this.panelControl1.Controls.Add(this.txt_PLCCode);
|
|
|
this.panelControl1.Controls.Add(this.labelControl4);
|
|
|
this.panelControl1.Controls.Add(this.txt_Color);
|
|
@@ -67,138 +70,130 @@
|
|
|
this.panelControl1.Controls.Add(this.btn_Add);
|
|
|
this.panelControl1.Controls.Add(this.btn_Save);
|
|
|
this.panelControl1.Location = new System.Drawing.Point(0, 0);
|
|
|
- this.panelControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
|
|
this.panelControl1.Name = "panelControl1";
|
|
|
- this.panelControl1.Size = new System.Drawing.Size(526, 402);
|
|
|
+ this.panelControl1.Size = new System.Drawing.Size(368, 256);
|
|
|
this.panelControl1.TabIndex = 0;
|
|
|
//
|
|
|
- // label1
|
|
|
- //
|
|
|
- this.label1.AutoSize = true;
|
|
|
- this.label1.ForeColor = System.Drawing.Color.Red;
|
|
|
- this.label1.Location = new System.Drawing.Point(61, 342);
|
|
|
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
|
|
- this.label1.Name = "label1";
|
|
|
- this.label1.Size = new System.Drawing.Size(244, 22);
|
|
|
- this.label1.TabIndex = 31;
|
|
|
- this.label1.Text = "注:备注可简化、最少三个字";
|
|
|
- //
|
|
|
// txt_PLCCode
|
|
|
//
|
|
|
- this.txt_PLCCode.Location = new System.Drawing.Point(224, 213);
|
|
|
- this.txt_PLCCode.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.txt_PLCCode.Location = new System.Drawing.Point(157, 136);
|
|
|
this.txt_PLCCode.Name = "txt_PLCCode";
|
|
|
this.txt_PLCCode.Properties.Mask.AutoComplete = DevExpress.XtraEditors.Mask.AutoCompleteType.None;
|
|
|
this.txt_PLCCode.Properties.Mask.EditMask = "d";
|
|
|
this.txt_PLCCode.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.Numeric;
|
|
|
this.txt_PLCCode.Properties.Mask.ShowPlaceHolders = false;
|
|
|
- this.txt_PLCCode.Size = new System.Drawing.Size(234, 28);
|
|
|
+ this.txt_PLCCode.Size = new System.Drawing.Size(164, 20);
|
|
|
this.txt_PLCCode.TabIndex = 6;
|
|
|
//
|
|
|
// labelControl4
|
|
|
//
|
|
|
- this.labelControl4.Location = new System.Drawing.Point(71, 216);
|
|
|
- this.labelControl4.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.labelControl4.Location = new System.Drawing.Point(50, 137);
|
|
|
this.labelControl4.Name = "labelControl4";
|
|
|
- this.labelControl4.Size = new System.Drawing.Size(102, 22);
|
|
|
+ this.labelControl4.Size = new System.Drawing.Size(68, 14);
|
|
|
this.labelControl4.TabIndex = 27;
|
|
|
this.labelControl4.Text = "PLC程序号:";
|
|
|
//
|
|
|
// txt_Color
|
|
|
//
|
|
|
- this.txt_Color.Location = new System.Drawing.Point(224, 158);
|
|
|
- this.txt_Color.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.txt_Color.Location = new System.Drawing.Point(157, 101);
|
|
|
this.txt_Color.Name = "txt_Color";
|
|
|
- this.txt_Color.Size = new System.Drawing.Size(234, 28);
|
|
|
+ this.txt_Color.Size = new System.Drawing.Size(164, 20);
|
|
|
this.txt_Color.TabIndex = 30;
|
|
|
//
|
|
|
// labelControl3
|
|
|
//
|
|
|
this.labelControl3.Appearance.ForeColor = System.Drawing.Color.Silver;
|
|
|
this.labelControl3.Appearance.Options.UseForeColor = true;
|
|
|
- this.labelControl3.Location = new System.Drawing.Point(71, 161);
|
|
|
- this.labelControl3.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.labelControl3.Location = new System.Drawing.Point(50, 102);
|
|
|
this.labelControl3.Name = "labelControl3";
|
|
|
- this.labelControl3.Size = new System.Drawing.Size(54, 22);
|
|
|
+ this.labelControl3.Size = new System.Drawing.Size(36, 14);
|
|
|
this.labelControl3.TabIndex = 27;
|
|
|
this.labelControl3.Text = "颜色:";
|
|
|
//
|
|
|
// txt_ProType
|
|
|
//
|
|
|
- this.txt_ProType.Location = new System.Drawing.Point(224, 104);
|
|
|
- this.txt_ProType.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.txt_ProType.Location = new System.Drawing.Point(157, 66);
|
|
|
this.txt_ProType.Name = "txt_ProType";
|
|
|
- this.txt_ProType.Size = new System.Drawing.Size(234, 28);
|
|
|
+ this.txt_ProType.Size = new System.Drawing.Size(164, 20);
|
|
|
this.txt_ProType.TabIndex = 29;
|
|
|
//
|
|
|
// txt_Remark
|
|
|
//
|
|
|
this.txt_Remark.EditValue = "";
|
|
|
- this.txt_Remark.Location = new System.Drawing.Point(224, 51);
|
|
|
- this.txt_Remark.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.txt_Remark.Location = new System.Drawing.Point(157, 32);
|
|
|
this.txt_Remark.Name = "txt_Remark";
|
|
|
- this.txt_Remark.Size = new System.Drawing.Size(234, 28);
|
|
|
+ this.txt_Remark.Size = new System.Drawing.Size(164, 20);
|
|
|
this.txt_Remark.TabIndex = 28;
|
|
|
//
|
|
|
// btn_Cancel
|
|
|
//
|
|
|
- this.btn_Cancel.Location = new System.Drawing.Point(385, 285);
|
|
|
- this.btn_Cancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
|
|
+ this.btn_Cancel.Location = new System.Drawing.Point(271, 213);
|
|
|
this.btn_Cancel.Name = "btn_Cancel";
|
|
|
- this.btn_Cancel.Size = new System.Drawing.Size(72, 37);
|
|
|
+ this.btn_Cancel.Size = new System.Drawing.Size(50, 24);
|
|
|
this.btn_Cancel.TabIndex = 12;
|
|
|
this.btn_Cancel.Text = "取消";
|
|
|
this.btn_Cancel.Click += new System.EventHandler(this.btn_Cancel_Click);
|
|
|
//
|
|
|
// btn_getRecentSRIT
|
|
|
//
|
|
|
- this.btn_getRecentSRIT.Location = new System.Drawing.Point(65, 100);
|
|
|
- this.btn_getRecentSRIT.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
|
|
+ this.btn_getRecentSRIT.Location = new System.Drawing.Point(45, 64);
|
|
|
this.btn_getRecentSRIT.Name = "btn_getRecentSRIT";
|
|
|
- this.btn_getRecentSRIT.Size = new System.Drawing.Size(111, 37);
|
|
|
+ this.btn_getRecentSRIT.Size = new System.Drawing.Size(78, 24);
|
|
|
this.btn_getRecentSRIT.TabIndex = 4;
|
|
|
this.btn_getRecentSRIT.Text = "图号/获取:";
|
|
|
this.btn_getRecentSRIT.Click += new System.EventHandler(this.btn_getRecentSRIT_Click);
|
|
|
//
|
|
|
// btn_getRecentRemark
|
|
|
//
|
|
|
- this.btn_getRecentRemark.Location = new System.Drawing.Point(65, 48);
|
|
|
- this.btn_getRecentRemark.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
|
|
+ this.btn_getRecentRemark.Location = new System.Drawing.Point(45, 31);
|
|
|
this.btn_getRecentRemark.Name = "btn_getRecentRemark";
|
|
|
- this.btn_getRecentRemark.Size = new System.Drawing.Size(111, 37);
|
|
|
+ this.btn_getRecentRemark.Size = new System.Drawing.Size(78, 24);
|
|
|
this.btn_getRecentRemark.TabIndex = 2;
|
|
|
this.btn_getRecentRemark.Text = "备注/获取:";
|
|
|
this.btn_getRecentRemark.Click += new System.EventHandler(this.btn_getRecentRemark_Click);
|
|
|
//
|
|
|
// btn_Add
|
|
|
//
|
|
|
- this.btn_Add.Location = new System.Drawing.Point(65, 285);
|
|
|
- this.btn_Add.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
|
|
+ this.btn_Add.Location = new System.Drawing.Point(47, 213);
|
|
|
this.btn_Add.Name = "btn_Add";
|
|
|
- this.btn_Add.Size = new System.Drawing.Size(72, 37);
|
|
|
+ this.btn_Add.Size = new System.Drawing.Size(50, 24);
|
|
|
this.btn_Add.TabIndex = 8;
|
|
|
this.btn_Add.Text = "添加";
|
|
|
this.btn_Add.Click += new System.EventHandler(this.btn_Add_Click);
|
|
|
//
|
|
|
// btn_Save
|
|
|
//
|
|
|
- this.btn_Save.Location = new System.Drawing.Point(225, 285);
|
|
|
- this.btn_Save.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
|
|
+ this.btn_Save.Location = new System.Drawing.Point(159, 213);
|
|
|
this.btn_Save.Name = "btn_Save";
|
|
|
- this.btn_Save.Size = new System.Drawing.Size(72, 37);
|
|
|
+ this.btn_Save.Size = new System.Drawing.Size(50, 24);
|
|
|
this.btn_Save.TabIndex = 10;
|
|
|
this.btn_Save.Text = "保存";
|
|
|
this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click);
|
|
|
//
|
|
|
+ // labelControl1
|
|
|
+ //
|
|
|
+ this.labelControl1.Location = new System.Drawing.Point(50, 174);
|
|
|
+ this.labelControl1.Name = "labelControl1";
|
|
|
+ this.labelControl1.Size = new System.Drawing.Size(60, 14);
|
|
|
+ this.labelControl1.TabIndex = 27;
|
|
|
+ this.labelControl1.Text = "是否配盘:";
|
|
|
+ //
|
|
|
+ // chk_NeedShelf
|
|
|
+ //
|
|
|
+ this.chk_NeedShelf.Location = new System.Drawing.Point(157, 171);
|
|
|
+ this.chk_NeedShelf.Name = "chk_NeedShelf";
|
|
|
+ this.chk_NeedShelf.Properties.Caption = "";
|
|
|
+ this.chk_NeedShelf.Size = new System.Drawing.Size(75, 20);
|
|
|
+ this.chk_NeedShelf.TabIndex = 31;
|
|
|
+ //
|
|
|
// FormEditPlcFormula
|
|
|
//
|
|
|
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
|
|
|
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
|
|
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
|
|
- this.ClientSize = new System.Drawing.Size(528, 402);
|
|
|
+ this.ClientSize = new System.Drawing.Size(372, 258);
|
|
|
this.ControlBox = false;
|
|
|
this.Controls.Add(this.panelControl1);
|
|
|
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
|
|
|
- this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
|
|
this.MaximizeBox = false;
|
|
|
this.MinimizeBox = false;
|
|
|
this.Name = "FormEditPlcFormula";
|
|
@@ -211,6 +206,7 @@
|
|
|
((System.ComponentModel.ISupportInitialize)(this.txt_Color.Properties)).EndInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.txt_ProType.Properties)).EndInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).EndInit();
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.chk_NeedShelf.Properties)).EndInit();
|
|
|
this.ResumeLayout(false);
|
|
|
|
|
|
}
|
|
@@ -229,6 +225,7 @@
|
|
|
private DevExpress.XtraEditors.TextEdit txt_Remark;
|
|
|
private DevExpress.XtraEditors.SimpleButton btn_getRecentRemark;
|
|
|
private DevExpress.XtraEditors.SimpleButton btn_getRecentSRIT;
|
|
|
- private System.Windows.Forms.Label label1;
|
|
|
+ private DevExpress.XtraEditors.LabelControl labelControl1;
|
|
|
+ private DevExpress.XtraEditors.CheckEdit chk_NeedShelf;
|
|
|
}
|
|
|
}
|