优化返工工单绑定

UAS_MES_ZT/FunctionCode/Packing/Packing_PackageCollectionWeigh.Designer.cs

@@ -447,7 +447,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(379, 270);
+            this.label5.Location = new System.Drawing.Point(342, 275);
             this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(146, 41);
@@ -469,7 +469,7 @@
             // 
             this.ms_salecode.AutoSize = true;
             this.ms_salecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_salecode.Location = new System.Drawing.Point(547, 270);
+            this.ms_salecode.Location = new System.Drawing.Point(490, 275);
             this.ms_salecode.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.ms_salecode.Name = "ms_salecode";
             this.ms_salecode.Size = new System.Drawing.Size(0, 41);
@@ -512,7 +512,7 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(379, 212);
+            this.pr_detail_label.Location = new System.Drawing.Point(342, 217);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(146, 41);
@@ -544,7 +544,7 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(547, 212);
+            this.pr_detail.Location = new System.Drawing.Point(490, 217);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 41);
@@ -585,6 +585,7 @@
             this.AutoGenBoxCode.TabIndex = 215;
             this.AutoGenBoxCode.Text = "自动生成";
             this.AutoGenBoxCode.UseVisualStyleBackColor = true;
+            this.AutoGenBoxCode.Visible = false;
             this.AutoGenBoxCode.CheckedChanged += new System.EventHandler(this.AutoGenBoxCode_CheckedChanged);
             // 
             // pa_code_label

UAS_MES_ZT/FunctionCode/Special/Special_ReSNBD.cs

@@ -141,6 +141,16 @@ namespace UAS_MES_NEW.Special
                             OperateResult.AppendText(">>不允许自己转自己\n", Color.Red, sncode);
                             return;
                         }
+                        if (!sncode.Text.Contains(ma_code.Text.Replace("-1", "")))
+                        {
+                            OperateResult.AppendText(">>未包含工单号\n", Color.Red, sncode);
+                            return;
+                        }
+                        if (sncode.Text.Substring(-1) != "Z" && sncode.Text.Substring(-1) != "W")
+                        {
+                            OperateResult.AppendText(">>结尾非Z和W,不允许采集!\n", Color.Red, sncode);
+                            return;
+                        }
                         if (!ChangeResult.Checked)
                         {
                             if (dh.CheckExist("returnsnbd", "rsb_newsn = '" + sncode.Text + "'"))

UAS_MES_ZT/FunctionCode/Special/Special_ReSNBDNoStep.Designer.cs

@@ -0,0 +1,222 @@
+namespace UAS_MES_NEW.Special
+{
+    partial class Special_ReSNBDNoStep
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            this.ChangeResult = new UAS_MES_NEW.CustomControl.CustomCheckBox.CustomCheckBox();
+            this.ClearSn_code = new System.Windows.Forms.PictureBox();
+            this.show_sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.sn_code_label = new System.Windows.Forms.Label();
+            this.sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.sncode_label = new System.Windows.Forms.Label();
+            this.Lock = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
+            this.ma_code_label = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // OperateResult
+            // 
+            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OperateResult.Location = new System.Drawing.Point(16, 108);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(1351, 467);
+            this.OperateResult.TabIndex = 3;
+            this.OperateResult.Text = "";
+            // 
+            // ChangeResult
+            // 
+            this.ChangeResult.AllPower = "ifall";
+            this.ChangeResult.AutoSize = true;
+            this.ChangeResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ChangeResult.Location = new System.Drawing.Point(543, 716);
+            this.ChangeResult.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ChangeResult.Name = "ChangeResult";
+            this.ChangeResult.Power = "ifspecial";
+            this.ChangeResult.Size = new System.Drawing.Size(178, 45);
+            this.ChangeResult.TabIndex = 152;
+            this.ChangeResult.Text = "重新转换";
+            this.ChangeResult.UseVisualStyleBackColor = true;
+            this.ChangeResult.CheckedChanged += new System.EventHandler(this.ChangeResult_CheckedChanged);
+            // 
+            // ClearSn_code
+            // 
+            this.ClearSn_code.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.ClearSn_code.Image = global::UAS_MES_NEW.Properties.Resources.bindingNavigatorDeleteItem_Image;
+            this.ClearSn_code.Location = new System.Drawing.Point(543, 660);
+            this.ClearSn_code.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.ClearSn_code.Name = "ClearSn_code";
+            this.ClearSn_code.Size = new System.Drawing.Size(32, 32);
+            this.ClearSn_code.TabIndex = 151;
+            this.ClearSn_code.TabStop = false;
+            this.ClearSn_code.Click += new System.EventHandler(this.ClearSn_code_Click);
+            // 
+            // show_sncode
+            // 
+            this.show_sncode.AllPower = null;
+            this.show_sncode.BackColor = System.Drawing.Color.White;
+            this.show_sncode.Enabled = false;
+            this.show_sncode.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.show_sncode.ID = null;
+            this.show_sncode.Location = new System.Drawing.Point(177, 655);
+            this.show_sncode.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.show_sncode.Name = "show_sncode";
+            this.show_sncode.Power = null;
+            this.show_sncode.Size = new System.Drawing.Size(316, 43);
+            this.show_sncode.Str = null;
+            this.show_sncode.Str1 = null;
+            this.show_sncode.Str2 = null;
+            this.show_sncode.TabIndex = 150;
+            // 
+            // sn_code_label
+            // 
+            this.sn_code_label.AutoSize = true;
+            this.sn_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.sn_code_label.Location = new System.Drawing.Point(17, 655);
+            this.sn_code_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.sn_code_label.Name = "sn_code_label";
+            this.sn_code_label.Size = new System.Drawing.Size(114, 41);
+            this.sn_code_label.TabIndex = 149;
+            this.sn_code_label.Text = "序列号";
+            // 
+            // sncode
+            // 
+            this.sncode.AllPower = "ifall";
+            this.sncode.BackColor = System.Drawing.Color.White;
+            this.sncode.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.sncode.ID = null;
+            this.sncode.Location = new System.Drawing.Point(177, 721);
+            this.sncode.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.sncode.Name = "sncode";
+            this.sncode.Power = "ifread";
+            this.sncode.Size = new System.Drawing.Size(316, 43);
+            this.sncode.Str = null;
+            this.sncode.Str1 = null;
+            this.sncode.Str2 = null;
+            this.sncode.TabIndex = 148;
+            this.sncode.Tag = "IfRead";
+            this.sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sncode_KeyDown);
+            // 
+            // sncode_label
+            // 
+            this.sncode_label.AutoSize = true;
+            this.sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.sncode_label.Location = new System.Drawing.Point(17, 724);
+            this.sncode_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.sncode_label.Name = "sncode_label";
+            this.sncode_label.Size = new System.Drawing.Size(114, 41);
+            this.sncode_label.TabIndex = 147;
+            this.sncode_label.Text = "录入框";
+            // 
+            // Lock
+            // 
+            this.Lock.AutoSize = true;
+            this.Lock.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Lock.LeaveEvent = false;
+            this.Lock.Location = new System.Drawing.Point(505, 33);
+            this.Lock.Margin = new System.Windows.Forms.Padding(5);
+            this.Lock.Name = "Lock";
+            this.Lock.Size = new System.Drawing.Size(94, 35);
+            this.Lock.TabIndex = 185;
+            this.Lock.Text = "锁定";
+            this.Lock.UseVisualStyleBackColor = true;
+            // 
+            // ma_code
+            // 
+            this.ma_code.AllPower = null;
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = null;
+            this.ma_code.FormName = null;
+            this.ma_code.Location = new System.Drawing.Point(201, 30);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Power = null;
+            this.ma_code.ReturnData = null;
+            this.ma_code.SelectField = null;
+            this.ma_code.SetValueField = null;
+            this.ma_code.Size = new System.Drawing.Size(277, 43);
+            this.ma_code.TabIndex = 184;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
+            // 
+            // ma_code_label
+            // 
+            this.ma_code_label.AutoSize = true;
+            this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_code_label.Location = new System.Drawing.Point(17, 30);
+            this.ma_code_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.ma_code_label.Name = "ma_code_label";
+            this.ma_code_label.Size = new System.Drawing.Size(146, 41);
+            this.ma_code_label.TabIndex = 183;
+            this.ma_code_label.Text = "归属工单";
+            // 
+            // Special_ReSNBD
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1384, 803);
+            this.Controls.Add(this.Lock);
+            this.Controls.Add(this.ma_code);
+            this.Controls.Add(this.ma_code_label);
+            this.Controls.Add(this.ChangeResult);
+            this.Controls.Add(this.ClearSn_code);
+            this.Controls.Add(this.show_sncode);
+            this.Controls.Add(this.sn_code_label);
+            this.Controls.Add(this.sncode);
+            this.Controls.Add(this.sncode_label);
+            this.Controls.Add(this.OperateResult);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Name = "Special_ReSNBD";
+            this.Tag = "Special!ReSNBD";
+            this.Text = "返修SN采集";
+            this.Load += new System.EventHandler(this.Special_BoxSplit_Load);
+            this.SizeChanged += new System.EventHandler(this.Special_ReSNBD_SizeChanged);
+            ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private CustomControl.RichText.RichTextAutoBottom OperateResult;
+        private CustomControl.CustomCheckBox.CustomCheckBox ChangeResult;
+        private System.Windows.Forms.PictureBox ClearSn_code;
+        private CustomControl.TextBoxWithIcon.EnterTextBox show_sncode;
+        private System.Windows.Forms.Label sn_code_label;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox sncode;
+        private System.Windows.Forms.Label sncode_label;
+        private CustomControl.CustomCheckBox.LockCheckBox Lock;
+        private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
+        private System.Windows.Forms.Label ma_code_label;
+    }
+}

UAS_MES_ZT/FunctionCode/Special/Special_ReSNBDNoStep.cs

@@ -0,0 +1,210 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicMethod;
+
+namespace UAS_MES_NEW.Special
+{
+    public partial class Special_ReSNBDNoStep : Form
+    {
+        AutoSizeFormClass asc = new AutoSizeFormClass();
+        DataHelper dh;
+
+        string bsncode = "";//序列号录入框值
+
+        DataTable Dbfind;
+
+        LogStringBuilder sql = new LogStringBuilder();
+
+        public Special_ReSNBDNoStep()
+        {
+            InitializeComponent();
+        }
+
+        private void Special_BoxSplit_Load(object sender, EventArgs e)
+        {
+            asc.controllInitializeSize(this);
+            dh = SystemInf.dh;
+            ma_code.TableName = "make left join product on ma_prodcode=pr_code ";
+            ma_code.SelectField = "ma_code # 工单号,ma_prodcode # 产品编号,pr_orispeccode # 型号,ma_inqty # 投入数,ma_craftcode # 工艺路线";
+            ma_code.FormName = Name;
+            ma_code.DBTitle = "工单查询";
+            ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "pr_orispeccode", "ma_craftcode" };
+            ma_code.Condition = "ma_statuscode='STARTED' order by ma_auditdate desc";
+            ma_code.DbChange += Ma_code_DbChange;
+            ma_code.SetLockCheckBox(Lock);
+            Lock.GetMakeCodeCtl(ma_code);
+            sncode.Focus();
+            OperateResult.AppendText(">>请输入返修SN号\n", Color.Black);
+        }
+
+        private void Ma_code_DbChange(object sender, EventArgs e)
+        {
+            Dbfind = ma_code.ReturnData;
+            BaseUtil.SetFormValue(this.Controls, Dbfind);
+        }
+
+
+        private void ClearSn_code_Click(object sender, EventArgs e)
+        {
+            bsncode = "";
+            if (ChangeResult.Checked)
+            {
+                //勾选的时候提示输入TSN
+                OperateResult.AppendText(">>请输入待转换新SN号\n", Color.Black, show_sncode);
+            }
+            else
+            {
+                OperateResult.AppendText(">>请输入返修SN号\n", Color.Black, show_sncode);
+            }
+            ChangeResult.Enabled = true;
+        }
+
+        string makecode;
+        string prodcode;
+        string orispeccode;
+        string othcode1;
+
+        private void sncode_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (sncode.Text != "")
+                {
+                    if (bsncode == "")
+                    {
+                        if (!ChangeResult.Checked)
+                        {
+
+                            if (!dh.CheckExist("makeserial", "ms_sncode = '" + sncode.Text + "'"))
+                            {
+                                if (!dh.CheckExist("AFSALES", "as_sn = '" + sncode.Text + "'"))
+                                {
+                                    OperateResult.AppendText(">>SN" + sncode.Text + "未查询到生产记录以及售后判定记录，无法采集\n", Color.Red, sncode);
+                                    return;
+                                }
+                                else
+                                {
+                                    makecode = "";
+                                    prodcode = "";
+                                    orispeccode = "";
+                                }
+                            }
+                            else
+                            {
+                                DataTable dt = (DataTable)dh.ExecuteSql("select * from makeserial left join product on ms_prodcode  = pr_code where ms_sncode = '" + sncode.Text + "' order by ms_id desc", "select");
+                                makecode = dt.Rows[0]["ms_makecode"].ToString();
+                                prodcode = dt.Rows[0]["ms_prodcode"].ToString();
+                                orispeccode = dt.Rows[0]["pr_orispeccode"].ToString();
+                                othcode1 = dt.Rows[0]["ms_othcode1"].ToString();
+                            }
+
+                            if (dh.CheckExist("returnsnbd", "rsb_oldsn = '" + sncode.Text + "'"))
+                            {
+                                string newsn = dh.getFieldDataByCondition("returnsnbd", "rsb_newsn", "rsb_oldsn = '" + sncode.Text + "'").ToString();
+                                OperateResult.AppendText(">>返修SN" + sncode.Text + "已关联SN" + newsn + ",无法直接采集，需转换\n", Color.Red, sncode);
+                                return;
+                            }
+                            bsncode = sncode.Text;
+                            show_sncode.Text = bsncode;
+                            sncode.Text = "";
+                            ChangeResult.Enabled = false;
+                            OperateResult.AppendText(">>返修SN" + bsncode + "采集\n", Color.Green, sncode);
+                            return;
+                        }
+                        else
+                        {
+                            if (!dh.CheckExist("returnsnbd", "rsb_newsn = '" + sncode.Text + "'"))
+                            {
+                                OperateResult.AppendText(">>待转换新SN" + sncode.Text + "无采集记录,不可转换\n", Color.Red, sncode);
+                                return;
+                            }
+                            bsncode = sncode.Text;
+                            show_sncode.Text = bsncode;
+                            sncode.Text = "";
+                            ChangeResult.Enabled = false;
+                            OperateResult.AppendText(">>待转换新SN" + bsncode + "采集\n", Color.Green, sncode);
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        if (sncode.Text == bsncode)
+                        {
+                            OperateResult.AppendText(">>不允许自己转自己\n", Color.Red, sncode);
+                            return;
+                        }
+                        if (!sncode.Text.Contains(ma_code.Text.Replace("-1", ""))) {
+                            OperateResult.AppendText(">>未包含工单号\n", Color.Red, sncode);
+                            return;
+                        }
+                        if (sncode.Text.Substring(-1)!="Z"&& sncode.Text.Substring(-1) != "W")
+                        {
+                            OperateResult.AppendText(">>结尾非Z和W,不允许采集!\n", Color.Red, sncode);
+                            return;
+                        }
+                        if (!ChangeResult.Checked)
+                        {
+                            if (dh.CheckExist("returnsnbd", "rsb_newsn = '" + sncode.Text + "'"))
+                            {
+                                string oldsn = dh.getFieldDataByCondition("returnsnbd", "rsb_oldsn", "rsb_newsn = '" + sncode.Text + "'").ToString();
+                                OperateResult.AppendText(">>采集新SN:" + sncode.Text + "已关联返修SN:" + oldsn + ",无法采集\n", Color.Red, sncode);
+                                return;
+                            }
+                            dh.ExecuteSql("insert into returnsnbd (rsb_id,rsb_newsn,rsb_oldsn,RSB_MAKECODE,RSB_PRODCODE,RSB_ORISPECCODE) values (returnsnbd_seq.nextval,'" + sncode.Text + "','" + show_sncode.Text + "','" + makecode + "','" + prodcode + "','" + orispeccode + "') ", "insert");
+                            dh.ExecuteSql("update makeserial set ms_othcode1='" + othcode1 + "' where ms_sncode='" + sncode.Text + "'", "update");
+                            OperateResult.AppendText(">>待转换新SN:" + show_sncode.Text + "更换至新SN:" + sncode.Text + "成功\n", Color.LawnGreen, sncode, show_sncode);
+                            bsncode = "";
+                            ChangeResult.Enabled = true;
+                            return;
+                        }
+                        else
+                        {
+                            if (dh.CheckExist("returnsnbd", "rsb_newsn = '" + sncode.Text + "'"))
+                            {
+                                string oldsn = dh.getFieldDataByCondition("returnsnbd", "rsb_oldsn", "rsb_newsn = '" + sncode.Text + "'").ToString();
+                                OperateResult.AppendText(">>采集新SN:" + sncode.Text + "已关联返修SN:" + oldsn + ",无法采集\n", Color.Red, sncode);
+                                return;
+                            }
+                            dh.ExecuteSql(" update returnsnbd set rsb_newsn = '" + sncode.Text + "' where rsb_newsn = '" + show_sncode.Text + "'  ", "update");
+                            bsncode = "";
+                            ChangeResult.Enabled = true;
+                            OperateResult.AppendText(">>待转换新SN:" + show_sncode.Text + "更换至新SN:" + sncode.Text + "成功\n", Color.LawnGreen, sncode, show_sncode);
+                            return;
+                        }
+                    }
+                }
+                else
+                {
+                    OperateResult.AppendText("<<序列号不能为空\n", Color.Red);
+                }
+            }
+        }
+
+
+        private void ChangeResult_CheckedChanged(object sender, EventArgs e)
+        {
+            if (ChangeResult.Checked)
+            {
+                //勾选的时候提示输入TSN
+                OperateResult.AppendText(">>请输入待转换新SN号\n", Color.Black);
+            }
+            else
+            {
+                OperateResult.AppendText(">>请输入返修SN号\n", Color.Black);
+            }
+        }
+
+        private void Special_ReSNBD_SizeChanged(object sender, EventArgs e)
+        {
+            asc.controlAutoSize(this);
+        }
+    }
+}

UAS_MES_ZT/FunctionCode/Special/Special_ReSNBDNoStep.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

UAS_MES_ZT/UAS_MES_ZT.csproj

@@ -1251,6 +1251,12 @@
     <Compile Include="FunctionCode\Special\Special_ResetCheck.Designer.cs">
       <DependentUpon>Special_ResetCheck.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Special\Special_ReSNBDNoStep.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Special\Special_ReSNBDNoStep.Designer.cs">
+      <DependentUpon>Special_ReSNBDNoStep.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Special\Special_ReSNBD.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1907,6 +1913,9 @@
     <EmbeddedResource Include="FunctionCode\Special\Special_ResetCheck.resx">
       <DependentUpon>Special_ResetCheck.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Special\Special_ReSNBDNoStep.resx">
+      <DependentUpon>Special_ReSNBDNoStep.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Special\Special_ReSNBD.resx">
       <DependentUpon>Special_ReSNBD.cs</DependentUpon>
     </EmbeddedResource>