diff --git a/ProductionSystem/Forms/HomeForm.cs b/ProductionSystem/Forms/HomeForm.cs index e7972a8..4f1908b 100644 --- a/ProductionSystem/Forms/HomeForm.cs +++ b/ProductionSystem/Forms/HomeForm.cs @@ -190,7 +190,10 @@ namespace ProductionSystem.Forms var selectedItem = cmbProductType.SelectedItem as ListItem; if (selectedItem == null || string.IsNullOrEmpty(selectedItem.Value)) { - CustomMessageBoxHelper.AlertShow(this, "产品型号为空!"); + if(selectedItem.Text != "--请选择--") + { + CustomMessageBoxHelper.AlertShow(this, "产品型号为空!"); + } return; } Program.ProductType = selectedItem.Value;//选中的产品型号 diff --git a/ProductionSystem_UserControl/ExtendedControls/MyParaControl.Designer.cs b/ProductionSystem_UserControl/ExtendedControls/MyParaControl.Designer.cs index 52a87bc..05110a4 100644 --- a/ProductionSystem_UserControl/ExtendedControls/MyParaControl.Designer.cs +++ b/ProductionSystem_UserControl/ExtendedControls/MyParaControl.Designer.cs @@ -108,7 +108,7 @@ this.txtMaxVal.Location = new System.Drawing.Point(148, 5); this.txtMaxVal.Name = "txtMaxVal"; this.txtMaxVal.Properties.AutoHeight = false; - this.txtMaxVal.Properties.NullValuePrompt = "电流上限"; + this.txtMaxVal.Properties.NullValuePrompt = "上限"; this.txtMaxVal.Size = new System.Drawing.Size(77, 27); this.txtMaxVal.StyleController = this.layoutControl1; this.txtMaxVal.TabIndex = 5; @@ -118,7 +118,7 @@ this.txtMinVal.Location = new System.Drawing.Point(235, 5); this.txtMinVal.Name = "txtMinVal"; this.txtMinVal.Properties.AutoHeight = false; - this.txtMinVal.Properties.NullValuePrompt = "电流下限"; + this.txtMinVal.Properties.NullValuePrompt = "下限"; this.txtMinVal.Size = new System.Drawing.Size(77, 27); this.txtMinVal.StyleController = this.layoutControl1; this.txtMinVal.TabIndex = 6;