Special_Reset新增备注输入框,备注拼接到commandlog记录

UAS_MES_YDCY/.workbuddy/memory/2026-09-20.md

@@ -54,3 +54,9 @@
 - 打印分支插在第一组 `Print.BarTender` 之后、`DoCommandLog` 之前，模板类型仍为「机身标」。
 - **核实**：Make_SNLabelCheckFuge 第三组文案实际为「打印标签2/打印机2/标签2」，与第二组「打印副标签/打印机1/标签1」无重复（此前担心重复是误判，未改动）。
 - 两界面新增组的对应关系：SNLabelCheckFuge=打印机/标签/份数，FuselageLabelPrint=打印机/打印张数/标签，文案随界面既有风格走。
+
+## Special_Reset 备注框（同日第三轮）
+- 右侧按钮行（站点重置/导出/导入 y216~260）下方新增 `Remark_label`「备注」(947,290) + `Remark`(EnterTextBox, 1049,290, 460×44, 微软雅黑9F, 白底)。
+- 新增 `ResultWithRemark(string result)`：备注 Trim 后非空则 `result + "," + remark`，空则原样返回。
+- 3 处 `DoCommandLog` 的 result 参数统一包 `ResultWithRemark("站点重置至" + stname)`：ReSN 方法内（SN 模式）、卡通箱分支、栈板分支。commandlog 的 `cl_result` 变为如「站点重置至OP100,客户投诉重置」。
+- 备注框跨批次保留不清空；「数据清空」按钮的 `BaseUtil.CleanControls` 会顺带清掉它。

UAS_MES_YDCY/FunctionCode/Special/Special_Reset.Designer.cs

@@ -52,6 +52,8 @@
             this.Split = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.ImportExcel1 = new System.Windows.Forms.OpenFileDialog();
             this.pallet = new System.Windows.Forms.RadioButton();
+            this.Remark_label = new System.Windows.Forms.Label();
+            this.Remark = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.SuspendLayout();
             // 
             // Pallet_label
@@ -359,6 +361,33 @@
             this.pallet.Text = "栈板";
             this.pallet.UseVisualStyleBackColor = true;
             this.pallet.Click += new System.EventHandler(this.bigboxBtn_Click);
+            //
+            // Remark_label
+            //
+            this.Remark_label.AutoSize = true;
+            this.Remark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Remark_label.Location = new System.Drawing.Point(947, 290);
+            this.Remark_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.Remark_label.Name = "Remark_label";
+            this.Remark_label.Size = new System.Drawing.Size(82, 41);
+            this.Remark_label.TabIndex = 249;
+            this.Remark_label.Text = "备注";
+            //
+            // Remark
+            //
+            this.Remark.AllPower = null;
+            this.Remark.BackColor = System.Drawing.Color.White;
+            this.Remark.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.Remark.ID = null;
+            this.Remark.Location = new System.Drawing.Point(1049, 290);
+            this.Remark.Margin = new System.Windows.Forms.Padding(5);
+            this.Remark.Name = "Remark";
+            this.Remark.Power = null;
+            this.Remark.Size = new System.Drawing.Size(460, 44);
+            this.Remark.Str = null;
+            this.Remark.Str1 = null;
+            this.Remark.Str2 = null;
+            this.Remark.TabIndex = 250;
             // 
             // Special_Reset
             // 
@@ -366,6 +395,8 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1611, 1131);
             this.Controls.Add(this.pallet);
+            this.Controls.Add(this.Remark_label);
+            this.Controls.Add(this.Remark);
             this.Controls.Add(this.ImportExcel);
             this.Controls.Add(this.Export);
             this.Controls.Add(this.数据清空);
@@ -422,5 +453,7 @@
         private System.Windows.Forms.FolderBrowserDialog ExportFileDialog;
         private System.Windows.Forms.OpenFileDialog ImportExcel1;
         private System.Windows.Forms.RadioButton pallet;
+        private System.Windows.Forms.Label Remark_label;
+        private CustomControl.TextBoxWithIcon.EnterTextBox Remark;
     }
 }

UAS_MES_YDCY/FunctionCode/Special/Special_Reset.cs

@@ -48,6 +48,15 @@ namespace UAS_MES_NEW.Special
             BaseUtil.SetFormValue(this.Controls, Dbfind);
         }
 
+        /// <summary>
+        /// 备注框有值时拼接到 commandlog 的结果字段
+        /// </summary>
+        private string ResultWithRemark(string result)
+        {
+            string remark = Remark.Text.Trim();
+            return remark == "" ? result : result + "," + remark;
+        }
+
         private bool ReSN(string sncode, string stepcode)
         {
             DataTable dt = (DataTable)dh.ExecuteSql("select ms_paststep,nvl(MS_ISACTIVE,0)MS_ISACTIVE,nvl(ms_qccheck,0)ms_qccheck,nvl(ms_ifqccheck,0)ms_ifqccheck,ms_makecode,nvl(ms_outstatus,0)ms_outstatus,nvl(pr_ifrepaircheck,0)pr_ifrepaircheck from makeserial left join product on pr_code=ms_prodcode where ms_sncode ='" + sncode + "' order by ms_id desc", "select");
@@ -81,7 +90,7 @@ namespace UAS_MES_NEW.Special
             sql.Append("cm_dropdate =sysdate,CM_REMARK = '重置站点拆解',cm_dropstep='" + User.CurrentStepCode + "',");
             sql.Append("cm_dropsccode='" + User.UserSourceCode + "' where cm_sncode = '" + sncode + "' and cm_makecode='" + makecode + "' and cm_stepcode in (select cd_stepcode from craftdetail left join step on st_code=cd_stepcode left join craft on cd_crid=cr_id where ST_STATUSCODE='AUDITED' and cr_code='" + cr_code.Text + "' and cr_prodcode='" + ms_prodcode.Text + "' and cd_detno >=" + cd_stepno.Text + " )");
             dh.ExecuteSql(sql.GetString(), "update");
-            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "站点重置", "站点重置至" + stname, sncode, "");
+            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "站点重置", ResultWithRemark("站点重置至" + stname), sncode, "");
             return true;
         }
 
@@ -125,7 +134,7 @@ namespace UAS_MES_NEW.Special
                             dh.ExecuteSql("delete from package where pa_outboxcode = '" + sb[i].ToString() + "'", "delete");
                             //删除箱的明细
                             dh.ExecuteSql("delete from packagedetail where pd_outboxcode='" + sb[i].ToString() + "'", "delete");
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "站点重置", "站点重置至" + stname, sb[i].ToString(), "");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "站点重置", ResultWithRemark("站点重置至" + stname), sb[i].ToString(), "");
                             OperatResult.AppendText("卡通箱：" + sb[i].ToString() + "回流至" + cd_stepcode.Text + "完成\n", Color.Green);
                         }
                         else
@@ -155,7 +164,7 @@ namespace UAS_MES_NEW.Special
                             dh.ExecuteSql("delete from package where pa_mothercode = '" + sb[i].ToString() + "'", "delete");
                             //删除箱的明细
                             dh.ExecuteSql("delete from packagedetail where pd_outboxcode='" + sb[i].ToString() + "'", "delete");
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "站点重置", "站点重置至" + stname, sb[i].ToString(), "");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "站点重置", ResultWithRemark("站点重置至" + stname), sb[i].ToString(), "");
                             OperatResult.AppendText("栈板：" + sb[i].ToString() + "回流至" + cd_stepcode.Text + "完成\n", Color.Green);
                         }
                         else