Merge repos.ubtob.net:usoft/mes-client

FileWatcher/AutoSMTRXY.Designer.cs

@@ -111,7 +111,7 @@
             "投入",
             "产出"});
             this.Type.Location = new System.Drawing.Point(166, 200);
-            this.Type.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Type.Margin = new System.Windows.Forms.Padding(2);
             this.Type.Name = "Type";
             this.Type.Size = new System.Drawing.Size(328, 26);
             this.Type.TabIndex = 18;
@@ -132,7 +132,7 @@
             this.AutoStart.Checked = true;
             this.AutoStart.CheckState = System.Windows.Forms.CheckState.Checked;
             this.AutoStart.Location = new System.Drawing.Point(521, 95);
-            this.AutoStart.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.AutoStart.Margin = new System.Windows.Forms.Padding(2);
             this.AutoStart.Name = "AutoStart";
             this.AutoStart.Size = new System.Drawing.Size(142, 22);
             this.AutoStart.TabIndex = 20;
@@ -189,7 +189,7 @@
             this.RemindVoice.Checked = true;
             this.RemindVoice.CheckState = System.Windows.Forms.CheckState.Checked;
             this.RemindVoice.Location = new System.Drawing.Point(521, 143);
-            this.RemindVoice.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.RemindVoice.Margin = new System.Windows.Forms.Padding(2);
             this.RemindVoice.Name = "RemindVoice";
             this.RemindVoice.Size = new System.Drawing.Size(124, 22);
             this.RemindVoice.TabIndex = 35;
@@ -200,7 +200,7 @@
             // 
             this.SN.AutoSize = true;
             this.SN.Location = new System.Drawing.Point(166, 364);
-            this.SN.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.SN.Margin = new System.Windows.Forms.Padding(2);
             this.SN.Name = "SN";
             this.SN.Size = new System.Drawing.Size(87, 22);
             this.SN.TabIndex = 37;
@@ -213,7 +213,7 @@
             this.Counter.AutoSize = true;
             this.Counter.Checked = true;
             this.Counter.Location = new System.Drawing.Point(268, 364);
-            this.Counter.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Counter.Margin = new System.Windows.Forms.Padding(2);
             this.Counter.Name = "Counter";
             this.Counter.Size = new System.Drawing.Size(87, 22);
             this.Counter.TabIndex = 36;
@@ -285,7 +285,7 @@
             // pr_pcbacount
             // 
             this.pr_pcbacount.Location = new System.Drawing.Point(403, 260);
-            this.pr_pcbacount.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.pr_pcbacount.Margin = new System.Windows.Forms.Padding(2);
             this.pr_pcbacount.Name = "pr_pcbacount";
             this.pr_pcbacount.Size = new System.Drawing.Size(90, 28);
             this.pr_pcbacount.TabIndex = 45;
@@ -405,7 +405,7 @@
             "PLC",
             "计数器"});
             this.CountType.Location = new System.Drawing.Point(765, 373);
-            this.CountType.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.CountType.Margin = new System.Windows.Forms.Padding(2);
             this.CountType.Name = "CountType";
             this.CountType.Size = new System.Drawing.Size(104, 26);
             this.CountType.TabIndex = 54;
@@ -559,7 +559,7 @@
             this.Name = "AutoSMTRXY";
             this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "过站数据统计2026-08-19";
+            this.Text = "过站数据统计2026-09-21";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
             this.Load += new System.EventHandler(this.Form1_Load);
             ((System.ComponentModel.ISupportInitialize)(this.pr_pcbacount)).EndInit();

FileWatcher/AutoSMTRXY.cs

@@ -503,6 +503,7 @@ namespace FileWatcher
             string ExitConfirm = MessageBox.Show(this, "确认计数器是否置为0？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
             if (ExitConfirm == "Yes")
             {
+                NowQTY.Text = "0";
                 OperateResult write = plc.Write(ToZero.Text, 0);
                 if (write.IsSuccess)
                 {