Selaa lähdekoodia

转号需求更改

shim 8 vuotta sitten
vanhempi
commit
0dbea60f74

+ 73 - 28
UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.Designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_SeqProgramTransform));
             this.ms_macode_label = new System.Windows.Forms.Label();
             this.ma_prodcode_label = new System.Windows.Forms.Label();
             this.pr_detail_label = new System.Windows.Forms.Label();
@@ -43,15 +42,19 @@
             this.SNPre_checkBox = new System.Windows.Forms.CheckBox();
             this.tip = new System.Windows.Forms.Label();
             this.in_label = new System.Windows.Forms.Label();
+            this.ClearSn_code = new System.Windows.Forms.PictureBox();
+            this.sn_code_label = new System.Windows.Forms.Label();
+            this.ChangeResult = new System.Windows.Forms.CheckBox();
+            this.show_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ma_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.cancel = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.SNPre = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.TSNPre = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.SNLength = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.TSNLength = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).BeginInit();
             this.SuspendLayout();
             // 
             // ms_macode_label
@@ -190,13 +193,65 @@
             // in_label
             // 
             this.in_label.AutoSize = true;
-            this.in_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.in_label.Location = new System.Drawing.Point(44, 479);
+            this.in_label.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.in_label.Location = new System.Drawing.Point(43, 523);
             this.in_label.Name = "in_label";
-            this.in_label.Size = new System.Drawing.Size(72, 27);
+            this.in_label.Size = new System.Drawing.Size(86, 31);
             this.in_label.TabIndex = 21;
             this.in_label.Text = "录入框";
             // 
+            // ClearSn_code
+            // 
+            this.ClearSn_code.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.ClearSn_code.Image = global::UAS_MES.Properties.Resources.bindingNavigatorDeleteItem_Image;
+            this.ClearSn_code.Location = new System.Drawing.Point(414, 481);
+            this.ClearSn_code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ClearSn_code.Name = "ClearSn_code";
+            this.ClearSn_code.Size = new System.Drawing.Size(24, 24);
+            this.ClearSn_code.TabIndex = 144;
+            this.ClearSn_code.TabStop = false;
+            this.ClearSn_code.Click += new System.EventHandler(this.cancel_Click);
+            // 
+            // 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(43, 481);
+            this.sn_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sn_code_label.Name = "sn_code_label";
+            this.sn_code_label.Size = new System.Drawing.Size(86, 31);
+            this.sn_code_label.TabIndex = 142;
+            this.sn_code_label.Text = "序列号";
+            // 
+            // ChangeResult
+            // 
+            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(414, 526);
+            this.ChangeResult.Margin = new System.Windows.Forms.Padding(4);
+            this.ChangeResult.Name = "ChangeResult";
+            this.ChangeResult.Size = new System.Drawing.Size(136, 35);
+            this.ChangeResult.TabIndex = 145;
+            this.ChangeResult.Text = "重新转换";
+            this.ChangeResult.UseVisualStyleBackColor = true;
+            // 
+            // 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(138, 481);
+            this.show_sncode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.show_sncode.Name = "show_sncode";
+            this.show_sncode.Power = null;
+            this.show_sncode.Size = new System.Drawing.Size(238, 34);
+            this.show_sncode.Str = null;
+            this.show_sncode.Str1 = null;
+            this.show_sncode.Str2 = null;
+            this.show_sncode.TabIndex = 143;
+            // 
             // ma_prodcode
             // 
             this.ma_prodcode.AutoSize = true;
@@ -225,35 +280,18 @@
             // 
             this.code.AllPower = null;
             this.code.BackColor = System.Drawing.Color.White;
+            this.code.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.code.ID = null;
-            this.code.Location = new System.Drawing.Point(139, 482);
+            this.code.Location = new System.Drawing.Point(138, 526);
             this.code.Name = "code";
             this.code.Power = null;
-            this.code.Size = new System.Drawing.Size(196, 28);
+            this.code.Size = new System.Drawing.Size(238, 34);
             this.code.Str = null;
             this.code.Str1 = null;
             this.code.Str2 = null;
             this.code.TabIndex = 22;
             this.code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.code_KeyDown);
             // 
-            // cancel
-            // 
-            this.cancel.AllPower = null;
-            this.cancel.BackColor = System.Drawing.Color.Transparent;
-            this.cancel.DownImage = ((System.Drawing.Image)(resources.GetObject("cancel.DownImage")));
-            this.cancel.Image = null;
-            this.cancel.IsShowBorder = true;
-            this.cancel.Location = new System.Drawing.Point(421, 482);
-            this.cancel.MoveImage = ((System.Drawing.Image)(resources.GetObject("cancel.MoveImage")));
-            this.cancel.Name = "cancel";
-            this.cancel.NormalImage = ((System.Drawing.Image)(resources.GetObject("cancel.NormalImage")));
-            this.cancel.Power = null;
-            this.cancel.Size = new System.Drawing.Size(75, 28);
-            this.cancel.TabIndex = 20;
-            this.cancel.Text = "取消";
-            this.cancel.UseVisualStyleBackColor = false;
-            this.cancel.Click += new System.EventHandler(this.cancel_Click);
-            // 
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("宋体", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -329,12 +367,15 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1268, 526);
+            this.ClientSize = new System.Drawing.Size(1268, 591);
+            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.ma_prodcode);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.code);
             this.Controls.Add(this.in_label);
-            this.Controls.Add(this.cancel);
             this.Controls.Add(this.OperateResult);
             this.Controls.Add(this.tip);
             this.Controls.Add(this.SNPre);
@@ -358,6 +399,7 @@
             this.Tag = "Make!SeqProgramTransform";
             this.Load += new System.EventHandler(this.Make_SeqProgramTransform_Load);
             this.SizeChanged += new System.EventHandler(this.序列烧录转换_SizeChanged);
+            ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -383,10 +425,13 @@
         private CustomControl.TextBoxWithIcon.EnterTextBox SNPre;
         private System.Windows.Forms.Label tip;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
-        private CustomControl.ButtonUtil.NormalButton cancel;
         private System.Windows.Forms.Label in_label;
         private CustomControl.TextBoxWithIcon.EnterTextBox code;
         private CustomControl.ValueLabel.ValueLabel pr_detail;
         private CustomControl.ValueLabel.ValueLabel ma_prodcode;
+        private System.Windows.Forms.PictureBox ClearSn_code;
+        private CustomControl.TextBoxWithIcon.EnterTextBox show_sncode;
+        private System.Windows.Forms.Label sn_code_label;
+        private System.Windows.Forms.CheckBox ChangeResult;
     }
 }

+ 126 - 59
UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -85,66 +85,95 @@ namespace UAS_MES.Make
                             string oMakecode = "";
                             string oMsid = "";
                             //记录当前序列号查出来的工单
-                            if (LogicHandler.GetMakeInfo(code.Text, out makecode, out errorMessage))
+                            if (GetMakeInfo(code.Text, out makecode, out errorMessage))
                             {
                                 //核对工序
                                 if (LogicHandler.CheckStepSNAndMacode(makecode == ms_macode.Text ? makecode : "", User.UserSourceCode, code.Text, User.UserCode, out oMakecode, out oMsid, out errorMessage))
                                 {
-                                    //核对TSN是否正确
-                                    //string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + code.Text + "'").ToString().Trim();
-                                    if (dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id='" + oMsid + "'"))
+                                    //按照out出的工单号查出工单相关信息,并赋值到相关控件
+                                    sql.Clear();
+                                    sql.Append("select ma_code as ms_macode,mcd_okqty,ma_qty,ma_qty-mcd_inqty as remain_qty,pr_detail,pr_code as ma_prodcode ");
+                                    sql.Append("from makeserial left join make on ms_makecode=ma_code left join product on ");
+                                    sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_id=:msid and mcd_stepcode='" + User.CurrentStepCode + "'");
+                                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", oMsid);
+                                    if (dt.Rows.Count > 0)
                                     {
-                                        //按照out出的工单号查出工单相关信息,并赋值到相关控件
-                                        sql.Clear();
-                                        sql.Append("select ma_code as ms_macode,mcd_okqty,ma_qty,ma_qty-mcd_inqty as remain_qty,pr_detail,pr_code as ma_prodcode ");
-                                        sql.Append("from makeserial left join make on ms_makecode=ma_code left join product on ");
-                                        sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_sncode=:sncode and mcd_stepcode='" + User.CurrentStepCode + "'");
-                                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", code.Text);
-                                        if (dt.Rows.Count > 0)
+                                        //记录数量
+                                        ma_qty = int.Parse(dt.Rows[0]["ma_qty"].ToString());
+                                        BaseUtil.SetFormValue(this.Controls, dt);
+                                        //判断用户是否锁定输入TSN长度,
+                                        if (!checkLengthOrPre(TSNLength_checkBox, TSNLength, "长度", "TSN"))
                                         {
-                                            //记录数量
-                                            ma_qty = int.Parse(dt.Rows[0]["ma_qty"].ToString());
-                                            BaseUtil.SetFormValue(this.Controls, dt);
-                                            //判断用户是否锁定输入TSN长度,
-                                            if (!checkLengthOrPre(TSNLength_checkBox, TSNLength, "长度", "TSN"))
-                                            {
-                                                return;
-                                            }
-                                            //判断用户是否锁定输入TSN前缀,
-                                            if (!checkLengthOrPre(TSNPre_checkBox, TSNPre, "前缀", "TSN"))
-                                            {
-                                                return;
-                                            }
+                                            return;
                                         }
-                                        else
+                                        //判断用户是否锁定输入TSN前缀,
+                                        if (!checkLengthOrPre(TSNPre_checkBox, TSNPre, "前缀", "TSN"))
                                         {
-                                            OperateResult.AppendText(">>序列号" + code.Text + "不存在\n", Color.Red);
-                                            code.Text = "";
                                             return;
                                         }
-                                        //获取需要关联采集的信息,以及校验规则
-                                        ListA = (DataTable)dh.ExecuteSql("select * from productsnrelation where psr_prodcode='" + ma_prodcode.Text + "' order by psr_detno", "select");
-                                        //没有获取到就提示错误请维护产品对应的关联采集信息
-                                        if (ListA.Rows.Count == 0)
+                                    }
+                                    else
+                                    {
+                                        OperateResult.AppendText(">>序列号" + code.Text + "不存在\n", Color.Red);
+                                        code.Text = "";
+                                        return;
+                                    }
+                                    //获取需要关联采集的信息,以及校验规则
+                                    ListA = (DataTable)dh.ExecuteSql("select * from productsnrelation where psr_prodcode='" + ma_prodcode.Text + "' order by psr_detno", "select");
+                                    //没有获取到就提示错误请维护产品对应的关联采集信息
+                                    if (ListA.Rows.Count == 0)
+                                    {
+                                        OperateResult.AppendText(">>请维护产品对应的关联采集信息\n", Color.Red);
+                                        code.Text = "";
+                                        OperateResult.AppendText("<<请输入TSN\n", Color.Black);
+                                        return;
+                                    }
+                                    //判断重新转换是否勾选了
+                                    if (ChangeResult.Checked)
+                                    {
+                                        //勾选了
+                                        if (dh.CheckExist("MakeSerial", "ms_beforesn='" + code.Text + "' and ms_id='" + oMsid + "' and ms_stepcode='" + User.CurrentStepCode + "'"))
                                         {
-                                            OperateResult.AppendText(">>请维护产品对应的关联采集信息\n", Color.Red);
+                                            step = 1;
+
+                                            TSN = code.Text;
+                                            //显示序列号
+                                            show_sncode.Text = TSN;
                                             code.Text = "";
-                                            OperateResult.AppendText("<<请输入TSN\n", Color.Black);
-                                            return;
+                                            OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green);
+                                            ChangeResult.Enabled = false;
+                                        }
+                                        else
+                                        {
+                                            OperateResult.AppendText(">>不存在该已转序列号:" + code.Text + "\n", Color.Red);
+                                            code.Text = "";
+                                            OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
                                         }
-                                        step = 1;
-
-                                        //记录转换前的序列号
-                                        TSN = code.Text;
-                                        code.Text = "";
-                                        OperateResult.AppendText("<<请输入SN\n", Color.Green);
                                     }
                                     else
-                                    //不为空,进行过转换。不勾选修改结果,就不能再修改
                                     {
-                                        OperateResult.AppendText(">>序列号" + code.Text + "已进行了转换\n", Color.Red);
-                                        code.Text = "";
-                                        OperateResult.AppendText("<<请重新输入TSN\n", Color.Black);
+                                        //没有勾选,只能修改一次
+                                        //核对TSN是否正确
+                                        //string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + code.Text + "'").ToString().Trim();
+                                        if (dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id='" + oMsid + "' and ms_beforesn is null"))
+                                        {
+                                            step = 1;
+
+                                            //记录转换前的序列号
+                                            TSN = code.Text;
+                                            //显示之前的序列号
+                                            show_sncode.Text = TSN;
+                                            code.Text = "";
+                                            OperateResult.AppendText("<<请输入SN\n", Color.Green);
+                                            ChangeResult.Enabled = false;
+                                        }
+                                        else
+                                        //不为空,进行过转换。不勾选修改结果,就不能再修改
+                                        {
+                                            OperateResult.AppendText(">>序列号" + code.Text + "错误,或者已经转换过\n", Color.Red);
+                                            code.Text = "";
+                                            OperateResult.AppendText("<<请重新输入TSN\n", Color.Black);
+                                        }
                                     }
                                 }
                                 else
@@ -161,6 +190,7 @@ namespace UAS_MES.Make
                         }
                         else if (step == 1)
                         {
+                            OperateResult.AppendText(">>" + code.Text + "\n", Color.Black);
                             //开始录入SN
                             if (!dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "'"))
                             {
@@ -203,6 +233,7 @@ namespace UAS_MES.Make
                         }
                         else if (step < ListA.Rows.Count + 2)
                         {
+                            OperateResult.AppendText(">>"+code.Text+"\n", Color.Black);
                             //开始进行校验规则
                             if (checkRules(step))
                             {
@@ -306,7 +337,7 @@ namespace UAS_MES.Make
                 case "IMEI1":
                 case "IMEI2":
                 case "IMEI3":
-                    if (checkExist("ms_imei1='" + code.Text + "' or ms_imei2 = '" + code.Text + "' or ms_imei3 = '" + code.Text + "'"))
+                    if (!ChangeResult.Checked&&checkExist("ms_imei1='" + code.Text + "' or ms_imei2 = '" + code.Text + "' or ms_imei3 = '" + code.Text + "'"))
                     {
                         OperateResult.AppendText(">>" + type + ":" + code.Text + "错误,不允许重复\n", Color.Red);
                         OperateResult.AppendText(">>请输入" + type + "\n", Color.Black);
@@ -331,7 +362,7 @@ namespace UAS_MES.Make
                 case "BT":
                 case "MAC":
                 case "NETCODE":
-                    if (checkExist("MS_" + type + "='" + code.Text + "'"))
+                    if (!ChangeResult.Checked&&checkExist("MS_" + type + "='" + code.Text + "'"))
                     {
                         OperateResult.AppendText(">>" + ListA.Rows[step - 2]["psr_type"].ToString() + ":" + code.Text + "错误,不允许重复\n", Color.Red);
                         OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black);
@@ -352,16 +383,19 @@ namespace UAS_MES.Make
                 if (!dh.CheckExist("makeserial", "ms_sncode='" + SN + "'"))
                 {
                     bool flag = true;
-                    //遍历判断已采集的信息是否已存在
-                    foreach (DictionaryEntry de in hs)
+                    if (!ChangeResult.Checked)
                     {
-                        if (dh.CheckExist("makeserial", "MS_" + (de.Key.ToString()=="WIFI"?"MAC":de.Key) + "='" + de.Value + "'"))
+                        //遍历判断已采集的信息是否已存在
+                        foreach (DictionaryEntry de in hs)
                         {
-                            flag = false;
-                            OperateResult.AppendText(">>" + de.Key + "已被使用,请重新输入TSN,重新转换\n", Color.Red);
-                            //清空信息
-                            clearInfo();
-                            break;
+                            if (dh.CheckExist("makeserial", "MS_" + (de.Key.ToString() == "WIFI" ? "MAC" : de.Key) + "='" + de.Value + "'"))
+                            {
+                                flag = false;
+                                OperateResult.AppendText(">>" + de.Key + "已被使用,请重新输入TSN,重新转换\n", Color.Red);
+                                //清空信息
+                                clearInfo();
+                                break;
+                            }
                         }
                     }
 
@@ -369,10 +403,26 @@ namespace UAS_MES.Make
                     if (flag == true)
                     {
                         //说明SN和关联采集信息二次校验通过,则进行转换和采集信息绑定
-                        //查询ms_firstsn
-                        string firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_sncode='" + TSN + "'").ToString();
-                        //记录本次修改,存入makesnrelation表中
-                        string updateSql = "update makeserial set ms_sncode='" + SN + "', ms_beforesn='" + TSN + "'," + s1.Remove(s1.Length - 1, 1).ToString() + " where ms_sncode='" + TSN + "'";
+                        string firstsn = "";
+                        string updateSql = "";
+                        //勾选了修改转换结果
+                        if (ChangeResult.Checked)
+                        {
+                            //查询ms_firstsn
+                            firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_beforesn='" + TSN + "'").ToString();
+                            //记录本次修改,存入makesnrelation表中
+                            updateSql = "update makeserial set ms_sncode='" + SN + "'," + s1.Remove(s1.Length - 1, 1).ToString() + " where ms_beforesn='" + TSN + "'";
+                            //删除最近一条转换记录
+                            dh.ExecuteSql("delete from makesnrelation where BEFORESN='" + TSN + "'", "delete");
+                        }
+                        //未勾选修改转换结果
+                        else
+                        {
+                            //查询ms_firstsn
+                            firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_sncode='" + TSN + "'").ToString();
+                            //记录本次修改,存入makesnrelation表中
+                            updateSql = "update makeserial set ms_sncode='" + SN + "', ms_beforesn='" + TSN + "'," + s1.Remove(s1.Length - 1, 1).ToString() + " where ms_sncode='" + TSN + "'";
+                        }
                         string insertSql = "insert into  makesnrelation (BEFORESN,SN,FIRSTSN,MAKECODE,msr_indate, msr_inman)values('" + TSN + "','" + SN + "','" + firstsn + "','" + ms_macode.Text + "', sysdate ,'" + User.UserCode + "')";
                         dh.ExecuteSQLTran(updateSql, insertSql);
                         OperateResult.AppendText(">>序列号转换成功\n>>关联采集成功\n", Color.Green);
@@ -385,7 +435,7 @@ namespace UAS_MES.Make
                         //获取剩余数,刷新页面
                         sql.Clear();
                         sql.Append("select mcd_inqty from makecraftdetail where mcd_macode='" + ms_macode.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
-                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", SN);
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (dt.Rows.Count > 0)
                         {
                             remain_qty.Text = ma_qty - int.Parse(dt.Rows[0]["mcd_inqty"].ToString()) + "";
@@ -592,6 +642,8 @@ namespace UAS_MES.Make
             imei.Clear();
             logsql.Clear();
             s1.Clear();
+            show_sncode.Text = "";
+            ChangeResult.Enabled = true;
         }
 
         private void cancel_Click(object sender, EventArgs e)
@@ -601,5 +653,20 @@ namespace UAS_MES.Make
             //提示用户输入TSN
             OperateResult.AppendText("<<请输入TSN\n", Color.Green);
         }
+        private bool GetMakeInfo(string iSnCode, out string oMakeCode, out string oErrorMessage)
+        {
+            //取MakeProcess表中的执行记录ID最大的一个工单的号码
+            oMakeCode = "";
+            oErrorMessage = "";
+            string ms_id = dh.getFieldDataByCondition("MakeSerial", "max(ms_id) ms_id", "upper(ms_sncode)='" + iSnCode.ToUpper() + "' or ms_firstsn in (select firstsn from makesnrelation where upper(beforesn)='" + iSnCode.ToUpper() + "')").ToString();
+            oMakeCode = dh.getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id='" + ms_id + "'").ToString();
+            if (oMakeCode != "")
+                return true;
+            else
+            {
+                oErrorMessage = "序列号:" + iSnCode + " 未归属工单";
+                return false;
+            }
+        }
     }
 }

+ 0 - 39
UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.resx

@@ -117,43 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="cancel.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="cancel.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="cancel.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
-</value>
-  </data>
 </root>

+ 118 - 90
UAS-MES/FunctionCode/Make/Make_SeqTransform.Designer.cs

@@ -28,30 +28,33 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_SeqTransform));
             this.ms_makecode_label = new System.Windows.Forms.Label();
             this.pr_detail_label = new System.Windows.Forms.Label();
             this.ma_prodcode_label = new System.Windows.Forms.Label();
             this.sncode_label = new System.Windows.Forms.Label();
             this.ChangeResult = new System.Windows.Forms.CheckBox();
-            this.changenum_lanel = new System.Windows.Forms.Label();
             this.beforeTransSNLength_checkBox = new System.Windows.Forms.CheckBox();
             this.afterTransSNLength_checkBox = new System.Windows.Forms.CheckBox();
             this.beforeTransSNPre_checkBox = new System.Windows.Forms.CheckBox();
             this.afterTransSNPre_checkBox = new System.Windows.Forms.CheckBox();
             this.label1 = new System.Windows.Forms.Label();
             this.ma_code = new System.Windows.Forms.Label();
+            this.changenum = new System.Windows.Forms.Label();
+            this.remain_qty = new System.Windows.Forms.Label();
+            this.PrintNum_label = new System.Windows.Forms.Label();
+            this.remain_qty_label = new System.Windows.Forms.Label();
+            this.ClearSn_code = new System.Windows.Forms.PictureBox();
+            this.sn_code_label = new System.Windows.Forms.Label();
+            this.show_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ma_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.changenum = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
             this.afterTransSNLength = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
             this.beforeTransSNLength = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
             this.afterTransSNPre = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.beforeTransSNPre = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ReCall = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).BeginInit();
             this.SuspendLayout();
             // 
             // ms_makecode_label
@@ -90,7 +93,7 @@
             // 
             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(28, 641);
+            this.sncode_label.Location = new System.Drawing.Point(25, 645);
             this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sncode_label.Name = "sncode_label";
             this.sncode_label.Size = new System.Drawing.Size(86, 31);
@@ -101,30 +104,19 @@
             // 
             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(450, 641);
+            this.ChangeResult.Location = new System.Drawing.Point(420, 645);
             this.ChangeResult.Margin = new System.Windows.Forms.Padding(4);
             this.ChangeResult.Name = "ChangeResult";
-            this.ChangeResult.Size = new System.Drawing.Size(184, 35);
+            this.ChangeResult.Size = new System.Drawing.Size(136, 35);
             this.ChangeResult.TabIndex = 70;
-            this.ChangeResult.Text = "修改转换结果";
+            this.ChangeResult.Text = "重新转换";
             this.ChangeResult.UseVisualStyleBackColor = true;
             // 
-            // changenum_lanel
-            // 
-            this.changenum_lanel.AutoSize = true;
-            this.changenum_lanel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.changenum_lanel.Location = new System.Drawing.Point(664, 641);
-            this.changenum_lanel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.changenum_lanel.Name = "changenum_lanel";
-            this.changenum_lanel.Size = new System.Drawing.Size(110, 31);
-            this.changenum_lanel.TabIndex = 71;
-            this.changenum_lanel.Text = "转换数量";
-            // 
             // beforeTransSNLength_checkBox
             // 
             this.beforeTransSNLength_checkBox.AutoSize = true;
             this.beforeTransSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNLength_checkBox.Location = new System.Drawing.Point(29, 78);
+            this.beforeTransSNLength_checkBox.Location = new System.Drawing.Point(28, 121);
             this.beforeTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.beforeTransSNLength_checkBox.Name = "beforeTransSNLength_checkBox";
             this.beforeTransSNLength_checkBox.Size = new System.Drawing.Size(198, 31);
@@ -136,7 +128,7 @@
             // 
             this.afterTransSNLength_checkBox.AutoSize = true;
             this.afterTransSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNLength_checkBox.Location = new System.Drawing.Point(29, 128);
+            this.afterTransSNLength_checkBox.Location = new System.Drawing.Point(28, 171);
             this.afterTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.afterTransSNLength_checkBox.Name = "afterTransSNLength_checkBox";
             this.afterTransSNLength_checkBox.Size = new System.Drawing.Size(198, 31);
@@ -148,7 +140,7 @@
             // 
             this.beforeTransSNPre_checkBox.AutoSize = true;
             this.beforeTransSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNPre_checkBox.Location = new System.Drawing.Point(631, 76);
+            this.beforeTransSNPre_checkBox.Location = new System.Drawing.Point(630, 119);
             this.beforeTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.beforeTransSNPre_checkBox.Name = "beforeTransSNPre_checkBox";
             this.beforeTransSNPre_checkBox.Size = new System.Drawing.Size(198, 31);
@@ -160,7 +152,7 @@
             // 
             this.afterTransSNPre_checkBox.AutoSize = true;
             this.afterTransSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNPre_checkBox.Location = new System.Drawing.Point(631, 126);
+            this.afterTransSNPre_checkBox.Location = new System.Drawing.Point(630, 169);
             this.afterTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.afterTransSNPre_checkBox.Name = "afterTransSNPre_checkBox";
             this.afterTransSNPre_checkBox.Size = new System.Drawing.Size(198, 31);
@@ -188,6 +180,85 @@
             this.ma_code.TabIndex = 95;
             this.ma_code.TextChanged += new System.EventHandler(this.ms_makecode_UserControlTextChanged);
             // 
+            // changenum
+            // 
+            this.changenum.AutoSize = true;
+            this.changenum.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.changenum.Location = new System.Drawing.Point(572, 77);
+            this.changenum.Name = "changenum";
+            this.changenum.Size = new System.Drawing.Size(28, 31);
+            this.changenum.TabIndex = 100;
+            this.changenum.Text = "0";
+            // 
+            // remain_qty
+            // 
+            this.remain_qty.AutoSize = true;
+            this.remain_qty.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.remain_qty.Location = new System.Drawing.Point(139, 76);
+            this.remain_qty.Name = "remain_qty";
+            this.remain_qty.Size = new System.Drawing.Size(0, 31);
+            this.remain_qty.TabIndex = 99;
+            // 
+            // PrintNum_label
+            // 
+            this.PrintNum_label.AutoSize = true;
+            this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.PrintNum_label.Location = new System.Drawing.Point(460, 77);
+            this.PrintNum_label.Name = "PrintNum_label";
+            this.PrintNum_label.Size = new System.Drawing.Size(62, 31);
+            this.PrintNum_label.TabIndex = 98;
+            this.PrintNum_label.Text = "计数";
+            // 
+            // remain_qty_label
+            // 
+            this.remain_qty_label.AutoSize = true;
+            this.remain_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.remain_qty_label.Location = new System.Drawing.Point(27, 77);
+            this.remain_qty_label.Name = "remain_qty_label";
+            this.remain_qty_label.Size = new System.Drawing.Size(86, 31);
+            this.remain_qty_label.TabIndex = 97;
+            this.remain_qty_label.Text = "剩余数";
+            // 
+            // ClearSn_code
+            // 
+            this.ClearSn_code.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.ClearSn_code.Image = global::UAS_MES.Properties.Resources.bindingNavigatorDeleteItem_Image;
+            this.ClearSn_code.Location = new System.Drawing.Point(420, 598);
+            this.ClearSn_code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ClearSn_code.Name = "ClearSn_code";
+            this.ClearSn_code.Size = new System.Drawing.Size(24, 24);
+            this.ClearSn_code.TabIndex = 141;
+            this.ClearSn_code.TabStop = false;
+            this.ClearSn_code.Click += new System.EventHandler(this.ReCall_Click);
+            // 
+            // 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(25, 594);
+            this.sn_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sn_code_label.Name = "sn_code_label";
+            this.sn_code_label.Size = new System.Drawing.Size(86, 31);
+            this.sn_code_label.TabIndex = 139;
+            this.sn_code_label.Text = "序列号";
+            // 
+            // 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(145, 594);
+            this.show_sncode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.show_sncode.Name = "show_sncode";
+            this.show_sncode.Power = null;
+            this.show_sncode.Size = new System.Drawing.Size(238, 34);
+            this.show_sncode.Str = null;
+            this.show_sncode.Str1 = null;
+            this.show_sncode.Str2 = null;
+            this.show_sncode.TabIndex = 140;
+            // 
             // pr_detail
             // 
             this.pr_detail.AutoSize = true;
@@ -211,21 +282,10 @@
             this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
             this.ma_prodcode.TabIndex = 94;
             // 
-            // changenum
-            // 
-            this.changenum.Enabled = false;
-            this.changenum.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.changenum.Location = new System.Drawing.Point(836, 641);
-            this.changenum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.changenum.Name = "changenum";
-            this.changenum.Size = new System.Drawing.Size(204, 34);
-            this.changenum.TabIndex = 91;
-            this.changenum.Text = "0";
-            // 
             // afterTransSNLength
             // 
             this.afterTransSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNLength.Location = new System.Drawing.Point(268, 124);
+            this.afterTransSNLength.Location = new System.Drawing.Point(267, 167);
             this.afterTransSNLength.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.afterTransSNLength.Name = "afterTransSNLength";
             this.afterTransSNLength.Size = new System.Drawing.Size(250, 34);
@@ -235,7 +295,7 @@
             // beforeTransSNLength
             // 
             this.beforeTransSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNLength.Location = new System.Drawing.Point(268, 74);
+            this.beforeTransSNLength.Location = new System.Drawing.Point(267, 117);
             this.beforeTransSNLength.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.beforeTransSNLength.Name = "beforeTransSNLength";
             this.beforeTransSNLength.Size = new System.Drawing.Size(250, 34);
@@ -248,7 +308,7 @@
             this.afterTransSNPre.BackColor = System.Drawing.Color.White;
             this.afterTransSNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.afterTransSNPre.ID = null;
-            this.afterTransSNPre.Location = new System.Drawing.Point(871, 126);
+            this.afterTransSNPre.Location = new System.Drawing.Point(870, 169);
             this.afterTransSNPre.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.afterTransSNPre.Name = "afterTransSNPre";
             this.afterTransSNPre.Power = null;
@@ -264,7 +324,7 @@
             this.beforeTransSNPre.BackColor = System.Drawing.Color.White;
             this.beforeTransSNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.beforeTransSNPre.ID = null;
-            this.beforeTransSNPre.Location = new System.Drawing.Point(871, 76);
+            this.beforeTransSNPre.Location = new System.Drawing.Point(870, 119);
             this.beforeTransSNPre.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.beforeTransSNPre.Name = "beforeTransSNPre";
             this.beforeTransSNPre.Power = null;
@@ -277,10 +337,10 @@
             // 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(29, 184);
+            this.OperateResult.Location = new System.Drawing.Point(28, 220);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1216, 428);
+            this.OperateResult.Size = new System.Drawing.Size(1216, 344);
             this.OperateResult.TabIndex = 78;
             this.OperateResult.Text = "";
             // 
@@ -290,7 +350,7 @@
             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(148, 641);
+            this.sncode.Location = new System.Drawing.Point(145, 645);
             this.sncode.Margin = new System.Windows.Forms.Padding(4);
             this.sncode.Name = "sncode";
             this.sncode.Power = "ifwrite";
@@ -302,55 +362,22 @@
             this.sncode.Tag = "IfWrite";
             this.sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sncode_KeyDown);
             // 
-            // ReCall
-            // 
-            this.ReCall.AllPower = null;
-            this.ReCall.BackColor = System.Drawing.Color.Transparent;
-            this.ReCall.DownImage = ((System.Drawing.Image)(resources.GetObject("ReCall.DownImage")));
-            this.ReCall.Image = ((System.Drawing.Image)(resources.GetObject("ReCall.Image")));
-            this.ReCall.IsShowBorder = true;
-            this.ReCall.Location = new System.Drawing.Point(663, 697);
-            this.ReCall.Margin = new System.Windows.Forms.Padding(4);
-            this.ReCall.MoveImage = ((System.Drawing.Image)(resources.GetObject("ReCall.MoveImage")));
-            this.ReCall.Name = "ReCall";
-            this.ReCall.NormalImage = ((System.Drawing.Image)(resources.GetObject("ReCall.NormalImage")));
-            this.ReCall.Power = null;
-            this.ReCall.Size = new System.Drawing.Size(105, 36);
-            this.ReCall.TabIndex = 74;
-            this.ReCall.Text = "撤销输入";
-            this.ReCall.UseVisualStyleBackColor = true;
-            this.ReCall.Click += new System.EventHandler(this.ReCall_Click);
-            // 
-            // Confirm
-            // 
-            this.Confirm.AllPower = "ifall";
-            this.Confirm.BackColor = System.Drawing.Color.Transparent;
-            this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
-            this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
-            this.Confirm.IsShowBorder = true;
-            this.Confirm.Location = new System.Drawing.Point(516, 697);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(4);
-            this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
-            this.Confirm.Name = "Confirm";
-            this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
-            this.Confirm.Power = null;
-            this.Confirm.Size = new System.Drawing.Size(105, 36);
-            this.Confirm.TabIndex = 73;
-            this.Confirm.Tag = "IfWrite";
-            this.Confirm.Text = "确认";
-            this.Confirm.UseVisualStyleBackColor = true;
-            this.Confirm.Click += new System.EventHandler(this.Confirm_Click);
-            // 
             // Make_SeqTransform
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1274, 756);
+            this.ClientSize = new System.Drawing.Size(1274, 701);
+            this.Controls.Add(this.ClearSn_code);
+            this.Controls.Add(this.show_sncode);
+            this.Controls.Add(this.sn_code_label);
+            this.Controls.Add(this.changenum);
+            this.Controls.Add(this.remain_qty);
+            this.Controls.Add(this.PrintNum_label);
+            this.Controls.Add(this.remain_qty_label);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.ma_prodcode);
             this.Controls.Add(this.label1);
-            this.Controls.Add(this.changenum);
             this.Controls.Add(this.afterTransSNLength);
             this.Controls.Add(this.beforeTransSNLength);
             this.Controls.Add(this.afterTransSNPre);
@@ -361,9 +388,6 @@
             this.Controls.Add(this.beforeTransSNLength_checkBox);
             this.Controls.Add(this.OperateResult);
             this.Controls.Add(this.sncode);
-            this.Controls.Add(this.ReCall);
-            this.Controls.Add(this.Confirm);
-            this.Controls.Add(this.changenum_lanel);
             this.Controls.Add(this.ChangeResult);
             this.Controls.Add(this.sncode_label);
             this.Controls.Add(this.ms_makecode_label);
@@ -376,6 +400,7 @@
             this.Text = " ";
             this.Load += new System.EventHandler(this.序列转换_Load);
             this.SizeChanged += new System.EventHandler(this.序列转换_SizeChanged);
+            ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -387,9 +412,6 @@
         private System.Windows.Forms.Label ma_prodcode_label;
         private System.Windows.Forms.Label sncode_label;
         private System.Windows.Forms.CheckBox ChangeResult;
-        private System.Windows.Forms.Label changenum_lanel;
-        private CustomControl.ButtonUtil.NormalButton Confirm;
-        private CustomControl.ButtonUtil.NormalButton ReCall;
         private CustomControl.TextBoxWithIcon.EnterTextBox sncode;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private System.Windows.Forms.CheckBox beforeTransSNLength_checkBox;
@@ -400,10 +422,16 @@
         private CustomControl.TextBoxWithIcon.EnterTextBox afterTransSNPre;
         private CustomControl.TextBoxWithIcon.TextBoxNumOnly beforeTransSNLength;
         private CustomControl.TextBoxWithIcon.TextBoxNumOnly afterTransSNLength;
-        private CustomControl.TextBoxWithIcon.TextBoxNumOnly changenum;
         private System.Windows.Forms.Label label1;
         private CustomControl.ValueLabel.ValueLabel ma_prodcode;
         private System.Windows.Forms.Label ma_code;
         private CustomControl.ValueLabel.ValueLabel pr_detail;
+        private System.Windows.Forms.Label changenum;
+        private System.Windows.Forms.Label remain_qty;
+        private System.Windows.Forms.Label PrintNum_label;
+        private System.Windows.Forms.Label remain_qty_label;
+        private System.Windows.Forms.PictureBox ClearSn_code;
+        private CustomControl.TextBoxWithIcon.EnterTextBox show_sncode;
+        private System.Windows.Forms.Label sn_code_label;
     }
 }

+ 31 - 3
UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -19,6 +19,8 @@ namespace UAS_MES.Make
 
         DataTable Dbfind;
 
+        LogStringBuilder sql = new LogStringBuilder();
+
         string bsncode = "";//转换前序列号
 
         string errorMessage = "";
@@ -29,6 +31,9 @@ namespace UAS_MES.Make
 
         string system = "";//进制
 
+        //存放工单中数量
+        int ma_qty;
+
         public Make_SeqTransform()
         {
             InitializeComponent();
@@ -92,9 +97,16 @@ namespace UAS_MES.Make
                                 //如果用户没有选择工单号
                                 if (ma_code.Text == "" || ma_code.Text != oMakeCode)
                                 {
-                                    dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,pr_detail,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
+                                    //按照out出的工单号查出工单相关信息,并赋值到相关控件
+                                    sql.Clear();
+                                    sql.Append("select ma_code,ma_prodcode,pr_detail,ma_qty,ma_qty-mcd_inqty as remain_qty ");
+                                    sql.Append("from makeserial left join make on ms_makecode=ma_code left join product on ");
+                                    sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_id=:msid and mcd_stepcode='" + User.CurrentStepCode + "'");
+                                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select",oMsId);
                                     if (dt.Rows.Count > 0)
                                     {
+                                        //记录数量
+                                        ma_qty = int.Parse(dt.Rows[0]["ma_qty"].ToString());
                                         BaseUtil.SetFormValue(this.Controls, dt);
                                         //ms_makecode_lock.Checked = true;
                                     }
@@ -112,6 +124,8 @@ namespace UAS_MES.Make
                                         if (dh.CheckExist("MakeSerial", "ms_beforesn='" + sncode.Text + "' and ms_id='" + oMsId + "' and ms_stepcode='" + User.CurrentStepCode + "'"))
                                         {
                                             bsncode = sncode.Text;
+                                            //显示序列号
+                                            show_sncode.Text = bsncode;
                                             sncode.Text = "";
                                             OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green);
                                             ChangeResult.Enabled = false;
@@ -127,10 +141,12 @@ namespace UAS_MES.Make
 
                                         //string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + sncode.Text + "'").ToString().Trim();
                                         //为空,就说明,没有进行过序列号的转换
-                                        if (dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id='" + oMsId + "'"))
+                                        if (dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id='" + oMsId + "' and ms_beforesn is null"))
                                         {
                                             //记录转换前的序列号
                                             bsncode = sncode.Text;
+                                            //显示序列号
+                                            show_sncode.Text = bsncode;
                                             sncode.Text = "";
                                             OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green);
                                             ChangeResult.Enabled = false;
@@ -138,7 +154,7 @@ namespace UAS_MES.Make
                                         else
                                         //不为空,进行过转换。不勾选修改结果,就不能再修改
                                         {
-                                            OperateResult.AppendText(">>序列号" + sncode.Text + "错误\n", Color.Red);
+                                            OperateResult.AppendText(">>序列号" + sncode.Text + "错误,或者已经转换过\n", Color.Red);
                                             sncode.Text = "";
                                             OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
                                         }
@@ -183,6 +199,8 @@ namespace UAS_MES.Make
                                         firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_beforesn='" + bsncode + "'").ToString();
                                         //记录本次修改,存入makesnrelation表中
                                         updateSql = "update makeserial set ms_sncode='" + sncode.Text + "' where ms_beforesn='" + bsncode + "'";
+                                        //删除最近一条转换记录
+                                        dh.ExecuteSql("delete from makesnrelation where BEFORESN='"+bsncode+"'", "delete");
                                     }
                                     //未勾选修改转换结果
                                     else
@@ -201,6 +219,15 @@ namespace UAS_MES.Make
                                     OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Black);
                                     //置空
                                     bsncode = "";
+                                    show_sncode.Text = "";
+                                    //获取剩余数,刷新页面
+                                    sql.Clear();
+                                    sql.Append("select mcd_inqty from makecraftdetail where mcd_macode='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
+                                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                                    if (dt.Rows.Count > 0)
+                                    {
+                                        remain_qty.Text = ma_qty - int.Parse(dt.Rows[0]["mcd_inqty"].ToString()) + "";
+                                    }
                                     //更新数量
                                     changenum.Text = int.Parse(changenum.Text) + 1 + "";
                                     ChangeResult.Enabled = true;
@@ -243,6 +270,7 @@ namespace UAS_MES.Make
         private void ReCall_Click(object sender, EventArgs e)
         {
             bsncode = "";
+            show_sncode.Text = "";
             OperateResult.AppendText(">>请输需要转换的序列号\n", Color.Green);
             ChangeResult.Enabled = true;
         }

+ 0 - 263
UAS-MES/FunctionCode/Make/Make_SeqTransform.resx

@@ -117,267 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="ReCall.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="ReCall.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
-  </data>
-  <data name="ReCall.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="ReCall.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="Confirm.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="Confirm.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
-  </data>
-  <data name="Confirm.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="Confirm.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
-</value>
-  </data>
 </root>