修改问题

ProductionSystem/Forms/HomeForm.cs

@@ -546,7 +546,8 @@ namespace ProductionSystem.Forms
                 }
                 if (readM248.val.Length == 0)
                 {
-                    txtProductCode.Text = "暂无条码";
+                    UpdateControlContent(txtProductCode, "暂无条码");
+                    
                 }
                 
 

ProductionSystem/Forms/SystemSetting/EditParaColForm.Designer.cs

@@ -94,7 +94,6 @@
             this.测试步骤 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Loading = new DevExpress.XtraSplashScreen.SplashScreenManager(this, typeof(global::ProductionSystem.Forms.CommonForms.WaitForm1), true, true);
             this.waiterTime = new DevExpress.XtraLayout.LayoutControlItem();
-            this.comboBoxEdit1 = new DevExpress.XtraEditors.ComboBoxEdit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.testStepEdit.Properties)).BeginInit();
@@ -148,7 +147,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.测试步骤)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.waiterTime)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -1053,15 +1051,6 @@
             this.waiterTime.Text = "等待时间取自PLC地址";
             this.waiterTime.TextSize = new System.Drawing.Size(174, 22);
             // 
-            // comboBoxEdit1
-            // 
-            this.comboBoxEdit1.Location = new System.Drawing.Point(0, 0);
-            this.comboBoxEdit1.Name = "comboBoxEdit1";
-            this.comboBoxEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.comboBoxEdit1.Size = new System.Drawing.Size(125, 24);
-            this.comboBoxEdit1.TabIndex = 3;
-            // 
             // EditParaColForm
             // 
             this.Appearance.BackColor = System.Drawing.Color.White;
@@ -1069,7 +1058,6 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1590, 637);
-            this.Controls.Add(this.comboBoxEdit1);
             this.Controls.Add(this.layoutControl1);
             this.Margin = new System.Windows.Forms.Padding(6);
             this.Name = "EditParaColForm";
@@ -1077,7 +1065,6 @@
             this.Text = "EditParaColForm";
             this.Load += new System.EventHandler(this.EditParaColForm_Load);
             this.Controls.SetChildIndex(this.layoutControl1, 0);
-            this.Controls.SetChildIndex(this.comboBoxEdit1, 0);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.testStepEdit.Properties)).EndInit();
@@ -1131,7 +1118,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.测试步骤)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.waiterTime)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1190,7 +1176,6 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
         private DevExpress.XtraEditors.ComboBoxEdit protocolTypeBoxEdit;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit1;
         private DevExpress.XtraEditors.ComboBoxEdit testStepEdit;
         private DevExpress.XtraLayout.LayoutControlItem 测试步骤;
     }

ProductionSystem/ProductionSystem.csproj

@@ -349,6 +349,7 @@
     <Compile Include="Untils\Message\IEquipment.cs" />
     <Compile Include="Untils\MFCan_DevInfo.cs" />
     <Compile Include="Untils\MFMsgVariable.cs" />
+    <Compile Include="Untils\MFSerial.cs" />
     <Compile Include="Untils\ProtocolDeviceHelper.cs" />
     <Compile Include="Untils\PWMDeviceHelper.cs" />
     <Compile Include="Untils\DoSomething.cs" />

ProductionSystem_UserControl/ExtendedControls/MyParaControl.Designer.cs

@@ -125,7 +125,7 @@
             this.txtMaxVal.Location = new System.Drawing.Point(200, 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(64, 27);
             this.txtMaxVal.StyleController = this.layoutControl1;
             this.txtMaxVal.TabIndex = 5;
@@ -135,7 +135,7 @@
             this.txtMinVal.Location = new System.Drawing.Point(274, 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(64, 27);
             this.txtMinVal.StyleController = this.layoutControl1;
             this.txtMinVal.TabIndex = 6;