保存修复

MainForm/FaForm/Form_SystemSet.Designer.cs

@@ -76,7 +76,6 @@
             this.label12 = new System.Windows.Forms.Label();
             this.txtAGVHttpIP = new System.Windows.Forms.TextBox();
             this.button6 = new System.Windows.Forms.Button();
-            this.btnAGV = new System.Windows.Forms.Button();
             this.chkIsUseAGV = new System.Windows.Forms.CheckBox();
             this.label15 = new System.Windows.Forms.Label();
             this.txtAGVMQTTIP = new System.Windows.Forms.TextBox();
@@ -106,6 +105,19 @@
             this.txtPLCAddress7 = new System.Windows.Forms.TextBox();
             this.rdbS6 = new System.Windows.Forms.RadioButton();
             this.txtPLCAddress6 = new System.Windows.Forms.TextBox();
+            this.groupBox6 = new System.Windows.Forms.GroupBox();
+            this.checkBox4 = new System.Windows.Forms.CheckBox();
+            this.checkBox2 = new System.Windows.Forms.CheckBox();
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.label16 = new System.Windows.Forms.Label();
+            this.checkBox1 = new System.Windows.Forms.CheckBox();
+            this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
+            this.label17 = new System.Windows.Forms.Label();
+            this.txtStation2 = new System.Windows.Forms.TextBox();
+            this.label19 = new System.Windows.Forms.Label();
+            this.txtDeviceCode2 = new System.Windows.Forms.TextBox();
+            this.label21 = new System.Windows.Forms.Label();
+            this.txtWorkStation2 = new System.Windows.Forms.TextBox();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numMqttPort)).BeginInit();
@@ -114,6 +126,7 @@
             this.groupBox5.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numPLCPort)).BeginInit();
             this.groupBox3.SuspendLayout();
+            this.groupBox6.SuspendLayout();
             this.SuspendLayout();
             // 
             // roundButton10
@@ -137,7 +150,7 @@
             // 
             // textBoxLineCode
             // 
-            this.textBoxLineCode.Location = new System.Drawing.Point(164, 78);
+            this.textBoxLineCode.Location = new System.Drawing.Point(664, 75);
             this.textBoxLineCode.Margin = new System.Windows.Forms.Padding(4);
             this.textBoxLineCode.Name = "textBoxLineCode";
             this.textBoxLineCode.Size = new System.Drawing.Size(250, 36);
@@ -145,16 +158,16 @@
             // 
             // textBoxLineName
             // 
-            this.textBoxLineName.Location = new System.Drawing.Point(664, 81);
+            this.textBoxLineName.Location = new System.Drawing.Point(1157, 78);
             this.textBoxLineName.Margin = new System.Windows.Forms.Padding(4);
             this.textBoxLineName.Name = "textBoxLineName";
-            this.textBoxLineName.Size = new System.Drawing.Size(740, 36);
+            this.textBoxLineName.Size = new System.Drawing.Size(250, 36);
             this.textBoxLineName.TabIndex = 74;
             // 
             // label7
             // 
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(34, 82);
+            this.label7.Location = new System.Drawing.Point(534, 79);
             this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(106, 30);
@@ -164,7 +177,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(535, 84);
+            this.label1.Location = new System.Drawing.Point(1027, 81);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(106, 30);
@@ -173,16 +186,16 @@
             // 
             // txtProgramName
             // 
-            this.txtProgramName.Location = new System.Drawing.Point(164, 179);
+            this.txtProgramName.Location = new System.Drawing.Point(1157, 24);
             this.txtProgramName.Margin = new System.Windows.Forms.Padding(4);
             this.txtProgramName.Name = "txtProgramName";
-            this.txtProgramName.Size = new System.Drawing.Size(750, 36);
+            this.txtProgramName.Size = new System.Drawing.Size(250, 36);
             this.txtProgramName.TabIndex = 82;
             // 
             // label18
             // 
             this.label18.AutoSize = true;
-            this.label18.Location = new System.Drawing.Point(34, 183);
+            this.label18.Location = new System.Drawing.Point(1027, 28);
             this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(106, 30);
@@ -231,7 +244,7 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(535, 32);
+            this.label3.Location = new System.Drawing.Point(553, 32);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(82, 30);
@@ -240,7 +253,7 @@
             // 
             // txtProcess_Section_Code
             // 
-            this.txtProcess_Section_Code.Location = new System.Drawing.Point(1154, 26);
+            this.txtProcess_Section_Code.Location = new System.Drawing.Point(164, 79);
             this.txtProcess_Section_Code.Margin = new System.Windows.Forms.Padding(4);
             this.txtProcess_Section_Code.Name = "txtProcess_Section_Code";
             this.txtProcess_Section_Code.Size = new System.Drawing.Size(250, 36);
@@ -249,7 +262,7 @@
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(1025, 30);
+            this.label5.Location = new System.Drawing.Point(35, 83);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(106, 30);
@@ -267,12 +280,12 @@
             // label9
             // 
             this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(1027, 136);
+            this.label9.Location = new System.Drawing.Point(1058, 135);
             this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(62, 30);
+            this.label9.Size = new System.Drawing.Size(75, 30);
             this.label9.TabIndex = 92;
-            this.label9.Text = "⼯站:";
+            this.label9.Text = "⼯站1:";
             // 
             // txtDeviceCode
             // 
@@ -288,9 +301,9 @@
             this.label10.Location = new System.Drawing.Point(35, 132);
             this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(106, 30);
+            this.label10.Size = new System.Drawing.Size(119, 30);
             this.label10.TabIndex = 94;
-            this.label10.Text = "装备编码:";
+            this.label10.Text = "装备编码1:";
             // 
             // txtStation
             // 
@@ -303,16 +316,24 @@
             // label14
             // 
             this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(535, 135);
+            this.label14.Location = new System.Drawing.Point(540, 135);
             this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(82, 30);
+            this.label14.Size = new System.Drawing.Size(95, 30);
             this.label14.TabIndex = 96;
-            this.label14.Text = "⼯位Id:";
+            this.label14.Text = "⼯位1Id:";
             // 
             // groupBox1
             // 
             this.groupBox1.BackColor = System.Drawing.Color.White;
+            this.groupBox1.Controls.Add(this.label17);
+            this.groupBox1.Controls.Add(this.txtStation2);
+            this.groupBox1.Controls.Add(this.label19);
+            this.groupBox1.Controls.Add(this.txtDeviceCode2);
+            this.groupBox1.Controls.Add(this.label21);
+            this.groupBox1.Controls.Add(this.txtWorkStation2);
+            this.groupBox1.Controls.Add(this.txtProgramName);
+            this.groupBox1.Controls.Add(this.label18);
             this.groupBox1.Controls.Add(this.label14);
             this.groupBox1.Controls.Add(this.txtStation);
             this.groupBox1.Controls.Add(this.label10);
@@ -326,8 +347,6 @@
             this.groupBox1.Controls.Add(this.label2);
             this.groupBox1.Controls.Add(this.txtProject_code);
             this.groupBox1.Controls.Add(this.buttonConfirm);
-            this.groupBox1.Controls.Add(this.label18);
-            this.groupBox1.Controls.Add(this.txtProgramName);
             this.groupBox1.Controls.Add(this.label1);
             this.groupBox1.Controls.Add(this.label7);
             this.groupBox1.Controls.Add(this.textBoxLineName);
@@ -647,13 +666,6 @@
             this.button6.Text = "确认";
             this.button6.UseVisualStyleBackColor = true;
             // 
-            // btnAGV
-            // 
-            this.btnAGV.Location = new System.Drawing.Point(0, 0);
-            this.btnAGV.Name = "btnAGV";
-            this.btnAGV.Size = new System.Drawing.Size(75, 23);
-            this.btnAGV.TabIndex = 89;
-            // 
             // chkIsUseAGV
             // 
             this.chkIsUseAGV.AutoSize = true;
@@ -729,7 +741,6 @@
             this.groupBox5.Controls.Add(this.txtAGVMQTTIP);
             this.groupBox5.Controls.Add(this.label15);
             this.groupBox5.Controls.Add(this.chkIsUseAGV);
-            this.groupBox5.Controls.Add(this.btnAGV);
             this.groupBox5.Controls.Add(this.button6);
             this.groupBox5.Controls.Add(this.txtAGVHttpIP);
             this.groupBox5.Controls.Add(this.label12);
@@ -1016,13 +1027,134 @@
             this.txtPLCAddress6.Size = new System.Drawing.Size(250, 36);
             this.txtPLCAddress6.TabIndex = 96;
             // 
+            // groupBox6
+            // 
+            this.groupBox6.Controls.Add(this.checkBox4);
+            this.groupBox6.Controls.Add(this.checkBox2);
+            this.groupBox6.Controls.Add(this.textBox1);
+            this.groupBox6.Controls.Add(this.label16);
+            this.groupBox6.Controls.Add(this.checkBox1);
+            this.groupBox6.Font = new System.Drawing.Font("微软雅黑", 10.8F);
+            this.groupBox6.Location = new System.Drawing.Point(0, 797);
+            this.groupBox6.Name = "groupBox6";
+            this.groupBox6.Size = new System.Drawing.Size(1566, 124);
+            this.groupBox6.TabIndex = 25;
+            this.groupBox6.TabStop = false;
+            this.groupBox6.Text = "日志清理";
+            // 
+            // checkBox4
+            // 
+            this.checkBox4.AutoSize = true;
+            this.checkBox4.Location = new System.Drawing.Point(664, 36);
+            this.checkBox4.Margin = new System.Windows.Forms.Padding(4);
+            this.checkBox4.Name = "checkBox4";
+            this.checkBox4.Size = new System.Drawing.Size(174, 34);
+            this.checkBox4.TabIndex = 93;
+            this.checkBox4.Text = "MES过站日志";
+            this.checkBox4.UseVisualStyleBackColor = true;
+            // 
+            // checkBox2
+            // 
+            this.checkBox2.AutoSize = true;
+            this.checkBox2.Location = new System.Drawing.Point(883, 36);
+            this.checkBox2.Margin = new System.Windows.Forms.Padding(4);
+            this.checkBox2.Name = "checkBox2";
+            this.checkBox2.Size = new System.Drawing.Size(164, 34);
+            this.checkBox2.TabIndex = 91;
+            this.checkBox2.Text = "IOT上传日志";
+            this.checkBox2.UseVisualStyleBackColor = true;
+            // 
+            // textBox1
+            // 
+            this.textBox1.Location = new System.Drawing.Point(288, 34);
+            this.textBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(320, 36);
+            this.textBox1.TabIndex = 89;
+            // 
+            // label16
+            // 
+            this.label16.AutoSize = true;
+            this.label16.Location = new System.Drawing.Point(130, 36);
+            this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label16.Name = "label16";
+            this.label16.Size = new System.Drawing.Size(150, 30);
+            this.label16.TabIndex = 90;
+            this.label16.Text = "日志保存天数:";
+            // 
+            // checkBox1
+            // 
+            this.checkBox1.AutoSize = true;
+            this.checkBox1.Location = new System.Drawing.Point(32, 36);
+            this.checkBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.checkBox1.Name = "checkBox1";
+            this.checkBox1.Size = new System.Drawing.Size(83, 34);
+            this.checkBox1.TabIndex = 89;
+            this.checkBox1.Text = "启用";
+            this.checkBox1.UseVisualStyleBackColor = true;
+            // 
+            // label17
+            // 
+            this.label17.AutoSize = true;
+            this.label17.Location = new System.Drawing.Point(540, 187);
+            this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label17.Name = "label17";
+            this.label17.Size = new System.Drawing.Size(95, 30);
+            this.label17.TabIndex = 102;
+            this.label17.Text = "⼯位Id2:";
+            // 
+            // txtStation2
+            // 
+            this.txtStation2.Location = new System.Drawing.Point(664, 181);
+            this.txtStation2.Margin = new System.Windows.Forms.Padding(4);
+            this.txtStation2.Name = "txtStation2";
+            this.txtStation2.Size = new System.Drawing.Size(250, 36);
+            this.txtStation2.TabIndex = 101;
+            // 
+            // label19
+            // 
+            this.label19.AutoSize = true;
+            this.label19.Location = new System.Drawing.Point(34, 181);
+            this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label19.Name = "label19";
+            this.label19.Size = new System.Drawing.Size(119, 30);
+            this.label19.TabIndex = 100;
+            this.label19.Text = "装备编码2:";
+            // 
+            // txtDeviceCode2
+            // 
+            this.txtDeviceCode2.Location = new System.Drawing.Point(164, 178);
+            this.txtDeviceCode2.Margin = new System.Windows.Forms.Padding(4);
+            this.txtDeviceCode2.Name = "txtDeviceCode2";
+            this.txtDeviceCode2.Size = new System.Drawing.Size(250, 36);
+            this.txtDeviceCode2.TabIndex = 99;
+            // 
+            // label21
+            // 
+            this.label21.AutoSize = true;
+            this.label21.Location = new System.Drawing.Point(1058, 187);
+            this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label21.Name = "label21";
+            this.label21.Size = new System.Drawing.Size(75, 30);
+            this.label21.TabIndex = 98;
+            this.label21.Text = "⼯站2:";
+            // 
+            // txtWorkStation2
+            // 
+            this.txtWorkStation2.Location = new System.Drawing.Point(1157, 184);
+            this.txtWorkStation2.Margin = new System.Windows.Forms.Padding(4);
+            this.txtWorkStation2.Name = "txtWorkStation2";
+            this.txtWorkStation2.Size = new System.Drawing.Size(250, 36);
+            this.txtWorkStation2.TabIndex = 97;
+            // 
             // Form_SystemSet
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoSize = true;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(1566, 797);
+            this.ClientSize = new System.Drawing.Size(1566, 926);
+            this.Controls.Add(this.groupBox6);
             this.Controls.Add(this.groupBox3);
             this.Controls.Add(this.groupBox5);
             this.Controls.Add(this.groupBox4);
@@ -1046,6 +1178,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.numPLCPort)).EndInit();
             this.groupBox3.ResumeLayout(false);
             this.groupBox3.PerformLayout();
+            this.groupBox6.ResumeLayout(false);
+            this.groupBox6.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -1098,7 +1232,6 @@
         private System.Windows.Forms.Label label12;
         private System.Windows.Forms.TextBox txtAGVHttpIP;
         private System.Windows.Forms.Button button6;
-        private System.Windows.Forms.Button btnAGV;
         private System.Windows.Forms.CheckBox chkIsUseAGV;
         private System.Windows.Forms.Label label15;
         private System.Windows.Forms.TextBox txtAGVMQTTIP;
@@ -1131,5 +1264,18 @@
         private System.Windows.Forms.TextBox txtPLCAddress6;
         private System.Windows.Forms.CheckBox chkMqttPassResult;
         private System.Windows.Forms.CheckBox chkMqttUpFile;
+        private System.Windows.Forms.GroupBox groupBox6;
+        private System.Windows.Forms.CheckBox checkBox4;
+        private System.Windows.Forms.CheckBox checkBox2;
+        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.Label label16;
+        private System.Windows.Forms.CheckBox checkBox1;
+        private System.ComponentModel.BackgroundWorker backgroundWorker1;
+        private System.Windows.Forms.Label label17;
+        private System.Windows.Forms.TextBox txtStation2;
+        private System.Windows.Forms.Label label19;
+        private System.Windows.Forms.TextBox txtDeviceCode2;
+        private System.Windows.Forms.Label label21;
+        private System.Windows.Forms.TextBox txtWorkStation2;
     }
 }

MainForm/FaForm/Form_SystemSet.cs

@@ -59,6 +59,18 @@ namespace MainForm
             numAGVMQTTPort.Text = IniFile.INIGetStringValue(FilePath, "AGV", "AGVMQTTPort", "");  // MQTT端口
             txtTPortCode.Text = IniFile.INIGetStringValue(FilePath, "AGV", "AGVMQTTDeviceCode", "");  // MQTT PortCode
 
+            txtPLCAddress1.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine1Address", GlobalContext.ConstMachine1Address);
+            txtPLCAddress2.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine2Address", GlobalContext.ConstMachine2Address);
+            txtPLCAddress3.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine3Address", GlobalContext.ConstMachine3Address);
+            txtPLCAddress4.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine4Address", GlobalContext.ConstMachine4Address);
+            txtPLCAddress5.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine5Address", GlobalContext.ConstMachine5Address);
+            txtPLCAddress6.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine6Address", GlobalContext.ConstMachine6Address);
+            txtPLCAddress7.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine7Address", GlobalContext.ConstMachine7Address);
+            txtPLCAddress8.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine8Address", GlobalContext.ConstMachine8Address);
+            txtPLCAddress9.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine9Address", GlobalContext.ConstMachine9Address);
+
+            numPLCPort.Value = int.Parse(IniFile.INIGetStringValue(FilePath, "Machine", "MachinePort", "0"));
+
             // 机器IP配置
             bool boolS1 = bool.Parse(IniFile.INIGetStringValue(FilePath, "Machine", "IsUsePLC1", "false"));
             bool boolS2 = bool.Parse(IniFile.INIGetStringValue(FilePath, "Machine", "IsUsePLC2", "false"));
@@ -80,19 +92,26 @@ namespace MainForm
             rdbS8.Checked = boolS8;
             rdbS9.Checked = boolS9;
 
-            txtPLCAddress1.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine1Address", GlobalContext.ConstMachine1Address);
-            txtPLCAddress2.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine2Address", GlobalContext.ConstMachine2Address);
-            txtPLCAddress3.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine3Address", GlobalContext.ConstMachine3Address);
-            txtPLCAddress4.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine4Address", GlobalContext.ConstMachine4Address);
-            txtPLCAddress5.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine5Address", GlobalContext.ConstMachine5Address);
-            txtPLCAddress6.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine6Address", GlobalContext.ConstMachine6Address);
-            txtPLCAddress7.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine7Address", GlobalContext.ConstMachine7Address);
-            txtPLCAddress8.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine8Address", GlobalContext.ConstMachine8Address);
-            txtPLCAddress9.Text = IniFile.INIGetStringValue(FilePath, "Machine", "Machine9Address", GlobalContext.ConstMachine9Address);
+            RefreshStationInfo();
+        }
+        #endregion 窗体事件
 
-            numPLCPort.Value = int.Parse(IniFile.INIGetStringValue(FilePath, "Machine", "MachinePort", "0"));
+        private void RefreshStationInfo() {
+            // 机器IP配置
+            bool boolS1 = rdbS1.Checked;
+            bool boolS2 = rdbS2.Checked;
+            bool boolS3 = rdbS3.Checked;
+            bool boolS4 = rdbS4.Checked;
+            bool boolS5 = rdbS5.Checked;
+            bool boolS6 = rdbS6.Checked;
+            bool boolS7 = rdbS7.Checked;
+            bool boolS8 = rdbS8.Checked;
+            bool boolS9 = rdbS9.Checked;
+
+            txtDeviceCode2.Text = string.Empty;
+            txtStation2.Text = string.Empty;
+            txtWorkStation2.Text = string.Empty;
 
-            // 产品2
             if (boolS1)
             {
                 txtWorkStation.Text = IniFile.INIGetStringValue(FilePath, "Station", "s1_work_station", "");
@@ -103,13 +122,16 @@ namespace MainForm
             {
                 txtWorkStation.Text = IniFile.INIGetStringValue(FilePath, "Station", "s2_work_station", "");
                 txtDeviceCode.Text = IniFile.INIGetStringValue(FilePath, "Station", "s2_device_code", "");
-                txtStation.Text = IniFile.INIGetStringValue(FilePath, "Station", "s3_station", "");
+                txtStation.Text = IniFile.INIGetStringValue(FilePath, "Station", "s2_1_station", "");
             }
             else if (boolS3)
             {
-                txtWorkStation.Text = IniFile.INIGetStringValue(FilePath, "Station", "s3_work_station", "");
-                txtDeviceCode.Text = IniFile.INIGetStringValue(FilePath, "Station", "s3_device_code", "");
-                txtStation.Text = IniFile.INIGetStringValue(FilePath, "Station", "s3_station", "");
+                txtWorkStation.Text = IniFile.INIGetStringValue(FilePath, "Station", "s3_1_work_station", "");
+                txtDeviceCode.Text = IniFile.INIGetStringValue(FilePath, "Station", "s3_1_device_code", "");
+                txtStation.Text = IniFile.INIGetStringValue(FilePath, "Station", "s3_1_station", "");
+                txtWorkStation2.Text = IniFile.INIGetStringValue(FilePath, "Station", "s3_2_work_station", "");
+                txtDeviceCode2.Text = IniFile.INIGetStringValue(FilePath, "Station", "s3_2_device_code", "");
+                txtStation2.Text = IniFile.INIGetStringValue(FilePath, "Station", "s3_2_station", "");
             }
             else if (boolS4)
             {
@@ -123,8 +145,35 @@ namespace MainForm
                 txtDeviceCode.Text = IniFile.INIGetStringValue(FilePath, "Station", "s5_device_code", "");
                 txtStation.Text = IniFile.INIGetStringValue(FilePath, "Station", "s5_station", "");
             }
+            else if (boolS6)
+            {
+                txtWorkStation.Text = IniFile.INIGetStringValue(FilePath, "Station", "s6_work_station", "");
+                txtDeviceCode.Text = IniFile.INIGetStringValue(FilePath, "Station", "s6_device_code", "");
+                txtStation.Text = IniFile.INIGetStringValue(FilePath, "Station", "s6_station", "");
+            }
+            else if (boolS7)
+            {
+                txtWorkStation.Text = IniFile.INIGetStringValue(FilePath, "Station", "s7_1_work_station", "");
+                txtDeviceCode.Text = IniFile.INIGetStringValue(FilePath, "Station", "s7_1_device_code", "");
+                txtStation.Text = IniFile.INIGetStringValue(FilePath, "Station", "s7_1_station", "");
+                txtWorkStation2.Text = IniFile.INIGetStringValue(FilePath, "Station", "s7_2_work_station", "");
+                txtDeviceCode2.Text = IniFile.INIGetStringValue(FilePath, "Station", "s7_2_device_code", "");
+                txtStation2.Text = IniFile.INIGetStringValue(FilePath, "Station", "s7_2_station", "");
+            }
+            else if (boolS8)
+            {
+                txtWorkStation.Text = IniFile.INIGetStringValue(FilePath, "Station", "s8_work_station", "");
+                txtDeviceCode.Text = IniFile.INIGetStringValue(FilePath, "Station", "s8_device_code", "");
+                txtStation.Text = IniFile.INIGetStringValue(FilePath, "Station", "s8_station", "");
+            }
+            else if (boolS9)
+            {
+                txtWorkStation.Text = IniFile.INIGetStringValue(FilePath, "Station", "s9_work_station", "");
+                txtDeviceCode.Text = IniFile.INIGetStringValue(FilePath, "Station", "s9_device_code", "");
+                txtStation.Text = IniFile.INIGetStringValue(FilePath, "Station", "s9_station", "");
+            }
+
         }
-        #endregion 窗体事件
 
         /// <summary>
         /// 改变用户时更新页面
@@ -159,6 +208,8 @@ namespace MainForm
         /// </summary>
         private void buttonConfirm_Click(object sender, EventArgs e)
         {
+            RefreshStationInfo();
+
             #region 产线信息
             try
             {
@@ -184,9 +235,12 @@ namespace MainForm
                 }
                 else if (rdbS3.Checked)
                 {
-                    IniFile.INIWriteValue(FilePath, "Station", "s3_work_station", txtWorkStation.Text.Trim());
-                    IniFile.INIWriteValue(FilePath, "Station", "s3_device_code", txtDeviceCode.Text.Trim());
-                    IniFile.INIWriteValue(FilePath, "Station", "s3_station", txtStation.Text.Trim());
+                    IniFile.INIWriteValue(FilePath, "Station", "s3_1_work_station", txtWorkStation.Text.Trim());
+                    IniFile.INIWriteValue(FilePath, "Station", "s3_1_device_code", txtDeviceCode.Text.Trim());
+                    IniFile.INIWriteValue(FilePath, "Station", "s3_1_station", txtStation.Text.Trim());
+                    IniFile.INIWriteValue(FilePath, "Station", "s3_2_work_station", txtWorkStation2.Text.Trim());
+                    IniFile.INIWriteValue(FilePath, "Station", "s3_2_device_code", txtDeviceCode2.Text.Trim());
+                    IniFile.INIWriteValue(FilePath, "Station", "s3_2_station", txtStation2.Text.Trim());
                 }
                 else if (rdbS4.Checked)
                 {
@@ -208,9 +262,12 @@ namespace MainForm
                 }
                 else if (rdbS7.Checked)
                 {
-                    IniFile.INIWriteValue(FilePath, "Station", "s7_work_station", txtWorkStation.Text.Trim());
-                    IniFile.INIWriteValue(FilePath, "Station", "s7_device_code", txtDeviceCode.Text.Trim());
-                    IniFile.INIWriteValue(FilePath, "Station", "s7_station", txtStation.Text.Trim());
+                    IniFile.INIWriteValue(FilePath, "Station", "s7_1_work_station", txtWorkStation.Text.Trim());
+                    IniFile.INIWriteValue(FilePath, "Station", "s7_1_device_code", txtDeviceCode.Text.Trim());
+                    IniFile.INIWriteValue(FilePath, "Station", "s7_1_station", txtStation.Text.Trim());
+                    IniFile.INIWriteValue(FilePath, "Station", "s7_2_work_station", txtWorkStation2.Text.Trim());
+                    IniFile.INIWriteValue(FilePath, "Station", "s7_2_device_code", txtDeviceCode2.Text.Trim());
+                    IniFile.INIWriteValue(FilePath, "Station", "s7_2_station", txtStation2.Text.Trim());
                 }
                 else if (rdbS8.Checked)
                 {

MainForm/FaForm/Form_SystemSet.resx

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="backgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>