BT/MAC采集，网标采集，彩盒打印界面与逻辑错误修改

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -42,6 +42,7 @@ namespace UAS_MES.Make
 
         private void Make_CollectBTMAC_Load(object sender, EventArgs e)
         {
+            sncode.Focus();
             dh = new DataHelper();
             asc.controllInitializeSize(this);
         }
@@ -86,45 +87,30 @@ namespace UAS_MES.Make
                         // 获取工单归属工单下一工序是否正确
                         if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
                         {
-                            if (LogicHandler.GetMakeInfo(sncode.Text, out macode, out ErrorMessage2))
+                            sql.Clear();
+                            sql.Append("select ma_code as ms_makecode,nvl(mcd_okqty,0),ma_prodcode,pr_detail,");
+                            sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
+                            sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + oMakeCode + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
+                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                            if (dt.Rows.Count > 0)
                             {
-                                //判断如果该序列号的归属工单和之前查询的是一致的话，就不进行重复数据的查询
-                                if (ms_makecode.Text != macode || macode == "")
-                                {
-                                    //ma_code不为空的时候表示不是第一次加载，提示用户切换工单
-                                    if (macode != "" && ms_makecode.Text != "")
-                                    {
-                                        OperateResult.AppendText(">>切换工单至工单号" + macode + "\n", Color.Red);
-                                    }
-                                }
-                                sql.Clear();
-                                sql.Append("select  ma_code as ms_makecode,nvl(mcd_inqty,0),ma_prodcode,pr_detail,pr_spec, ");
-                                sql.Append("ma_qty-nvl(mcd_inqty,0)as mcd_remainqty from make left join makecraftdetail on mcd_maid=ma_id left join product on pr_code=ma_prodcode ");
-                                sql.Append("where ma_code=:ma_code");
-                                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", macode);
-                                if (dt.Rows.Count > 0)
-                                {
-                                    BaseUtil.SetFormValue(this.Controls, dt);
-                                    dh.UpdateByCondition("makeserial", "ms_currentstepcode = '" + User.CurrentStepCode + "'", "ms_id = '" + oMsID + "'");
-                                    OperateResult.AppendText(">>请输入BT\n", Color.Green);
-                                    sn_code = sncode.Text;
-                                    sncode.Text = "";
-                                    isBT = true;
-                                    return;
-                                }
-                                else
-                                {
-                                    OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
-                                }
-
+                                BaseUtil.SetFormValue(this.Controls, dt);
+                                dh.UpdateByCondition("makeserial", "ms_currentstepcode = '" + User.CurrentStepCode + "'", "ms_id = '" + oMsID + "'");
+                                OperateResult.AppendText(">>请输入BT\n", Color.Green);
+                                sn_code = sncode.Text;
+                                sncode.Text = "";
+                                isBT = true;
+                                return;
                             }
                             else
                             {
-                                OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
+                                sncode.Text = "";
+                                OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
                             }
                         }
                         else
                         {
+                            sncode.Text = "";
                             OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
                         }
 
@@ -144,6 +130,7 @@ namespace UAS_MES.Make
                         ms_bt = dh.getFieldDataByCondition("makeserial", "ms_bt", "ms_id = '" + oMsID + "'").ToString();
                         if (sncode.Text == ms_bt)
                         {
+                            sncode.Text = "";
                             OperateResult.AppendText(">>BT错误,重复\n", Color.Red);
                             OperateResult.AppendText(">>请输入BT\n", Color.Green);
                             return;
@@ -151,12 +138,12 @@ namespace UAS_MES.Make
                         else
                         {
                             ms_bt = sncode.Text;
-                            ErrorMessage = "工单" + sncode.Text + "BT采集完成>>>请输入SN";
+                            ErrorMessage = "BT采集完成>>>请输入MAC";
                             OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
                             isBT = false;
                             isMAC = true;
-                            ErrorMessage = ">>>请输入SN";
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
+                            sncode.Text = "";
+                            sncode.Focus(); 
                         }
 
                     }
@@ -176,6 +163,7 @@ namespace UAS_MES.Make
                     ms_mac = dh.getFieldDataByCondition("makeserial", "ms_mac", "ms_id = '" + oMsID + "'").ToString();
                     if (sncode.Text == ms_mac)
                     {
+                        sncode.Text = "";
                         OperateResult.AppendText(">>MAC错误,重复\n", Color.Red);
                         OperateResult.AppendText(">>请输入MAC\n", Color.Green);
                         return;
@@ -195,7 +183,7 @@ namespace UAS_MES.Make
                         }
                         else
                         {
-                            OperateResult.AppendText(">>更新错误" + ErrorMessage + "\n", Color.Red);
+                            OperateResult.AppendText(">>采集错误" + ErrorMessage + "\n", Color.Red);
                         }
                         ErrorMessage = ">>>请输入SN";
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);

UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs

@@ -38,6 +38,7 @@ namespace UAS_MES.Make
 
         private void Make_CollectNetCode_Load(object sender, EventArgs e)
         {
+            sncode.Focus();
             dh = new DataHelper();
             asc.controllInitializeSize(this);
 
@@ -54,50 +55,34 @@ namespace UAS_MES.Make
                         OperateResult.AppendText(">>序列号不能为空\n", Color.Red);
                         return;
                     }
-                    OperateResult.AppendText("<<"+sncode.Text+"\n", Color.Green);
+                    OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Green);
                     string ErrorMessage2;
                     string oMakeCode;
                     // 获取工单归属工单下一工序是否正确
                     if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
                     {
-                        if (LogicHandler.GetMakeInfo(sncode.Text, out macode, out ErrorMessage2))
+                        sql.Clear();
+                        sql.Append("select ma_code as ms_makecode,nvl(mcd_okqty,0),ma_prodcode,pr_detail,");
+                        sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
+                        sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + oMakeCode + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dt.Rows.Count > 0)
                         {
-                            //判断如果该序列号的归属工单和之前查询的是一致的话，就不进行重复数据的查询
-                            if (ms_makecode.Text != macode || macode == "")
-                            {
-                                //ma_code不为空的时候表示不是第一次加载，提示用户切换工单
-                                if (macode != "" && ms_makecode.Text != "")
-                                {
-                                    OperateResult.AppendText(">>切换工单至工单号" + macode + "\n", Color.Red);
-                                }
-                            }
-                            sql.Clear();
-                            sql.Append("select  ma_code as ms_makecode,nvl(mcd_inqty,0),ma_prodcode,pr_detail,pr_spec, ");
-                            sql.Append("ma_qty-nvl(mcd_inqty,0)as mcd_remainqty from make left join makecraftdetail on mcd_maid=ma_id left join product on pr_code=ma_prodcode ");
-                            sql.Append("where ma_code=:ma_code");
-                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", macode);
-                            if (dt.Rows.Count > 0)
-                            {
-                                BaseUtil.SetFormValue(this.Controls, dt);
-                                dh.UpdateByCondition("makeserial", "ms_currentstepcode = '" + User.CurrentStepCode + "'", "ms_id = '" + oMsID + "'");
-                                OperateResult.AppendText(">>请输入网标\n", Color.Green);
-                                sn_code = sncode.Text;
-                                sncode.Text = "";
-                                isnetcode = true;
-                                return;
-                            }
-                            else
-                            {
-                                OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
-                            }
-
+                            BaseUtil.SetFormValue(this.Controls, dt);
+                            dh.UpdateByCondition("makeserial", "ms_currentstepcode = '" + User.CurrentStepCode + "'", "ms_id = '" + oMsID + "'");
+                            OperateResult.AppendText(">>请输入网标\n", Color.Green);
+                            sn_code = sncode.Text;
+                            sncode.Text = "";
+                            isnetcode = true;
+                            return;
                         }
                         else
                         {
-                            OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
+                            OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
                         }
                     }
-                    else {
+                    else
+                    {
                         OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
                     }
                 }
@@ -115,11 +100,13 @@ namespace UAS_MES.Make
                     net_code = dh.getFieldDataByCondition("makeserial", "ms_netcode", "ms_id = '" + oMsID + "'").ToString();
                     if (int.Parse(mcd_remainqty.Text) <= 0)
                     {
-                        ErrorMessage = "工单" + sncode.Text + "剩余采集数不足>>>请输入SN";
+                        ErrorMessage = "工单" + ms_makecode.Text + "剩余采集数不足>>>请输入SN";
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
                         return;
                     }
-                    else if (sncode.Text == net_code) {
+                    else if (sncode.Text == net_code)
+                    {
+                        sncode.Text = "";
                         OperateResult.AppendText(">>网标错误,重复\n", Color.Red);
                         OperateResult.AppendText(">>请输入网标\n", Color.Green);
                         return;
@@ -134,7 +121,7 @@ namespace UAS_MES.Make
                             BaseUtil.CleanForm(this);
                             printcount++;
                             mcd_okqty.Text = printcount + "";
-                            mcd_remainqty.Text = 0+ "";
+                            mcd_remainqty.Text = 0 + "";
                             isnetcode = false;
                         }
                         else
@@ -160,9 +147,10 @@ namespace UAS_MES.Make
 
         private void deleteButton1_Click(object sender, EventArgs e)
         {
-            if (isnetcode) {
+            if (isnetcode)
+            {
                 BaseUtil.CleanForm(this);
-                mcd_remainqty.Text = 0+ "";
+                mcd_remainqty.Text = 0 + "";
                 OperateResult.AppendText(">>清除完成，清重新输入SN号\n", Color.Green);
                 isnetcode = false;
             }

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.Designer.cs

@@ -195,7 +195,7 @@
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(483, 52);
+            this.pr_code.Location = new System.Drawing.Point(465, 52);
             this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code.Name = "pr_code";
             this.pr_code.Size = new System.Drawing.Size(0, 27);
@@ -206,7 +206,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(777, 52);
+            this.pr_detail.Location = new System.Drawing.Point(748, 54);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 27);
@@ -261,7 +261,7 @@
             // 
             this.ma_code.AutoSize = true;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code.Location = new System.Drawing.Point(191, 58);
+            this.ma_code.Location = new System.Drawing.Point(163, 54);
             this.ma_code.Name = "ma_code";
             this.ma_code.Size = new System.Drawing.Size(0, 27);
             this.ma_code.TabIndex = 183;

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -30,8 +30,6 @@ namespace UAS_MES.Make
         string craftcode;
         //制造单号
         string macode;
-        //当前工单的序列号
-        string sn_code;
         //当前提示的索引
         int RemainIndex = 0;
         ApplicationClass lbl;
@@ -61,78 +59,70 @@ namespace UAS_MES.Make
                 // 获取工单归属工单下一工序是否正确
                 if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
                 {
-                    if (LogicHandler.GetMakeInfo(sncode.Text, out macode, out ErrorMessage2))
+                    //获取工单的其他信息
+                    sql.Clear();
+                    sql.Append("select ma_code,nvl(mcd_okqty,0),ma_prodcode as pr_code ,pr_detail,");
+                    sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
+                    sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + oMakeCode + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
+                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                    if (dt.Rows.Count > 0)
                     {
-                        //判断如果该序列号的归属工单和之前查询的是一致的话，就不进行重复数据的查询
-                      //  macode = dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_sncode='" + sncode.Text + "'").ToString();
-                        if (ma_code.Text != macode || macode == "")
-                        {
-                            //ma_code不为空的时候表示不是第一次加载，提示用户切换工单
-                            if (macode != "" && ma_code.Text != "")
-                            {
-                                OperateResult.AppendText(">>切换工单至工单号" + macode + "\n", Color.Red);
-                            }
-                        }
-                        sql.Clear();
-                        sql.Append("select ma_code,mcd_okqty,ma_qty,ma_qty-mcd_okqty as mcd_remainqty,pr_detail,pr_code ");
-                        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");
-                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", sncode.Text);
-                        if (dt.Rows.Count > 0)
-                        {
-                            BaseUtil.SetFormValue(this.Controls, dt);
-                            sn_code = sncode.Text;
-                        }
-                        else
-                        {
-                            OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
+                        BaseUtil.SetFormValue(this.Controls, dt);
+                        //提示用户“<<工单号：取ma_makecode”
+                        OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Green);
+                        //提示用户“<< 序列号：XXXX”
+                        OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Green);
+                    }
+                    else
+                    {
+                        OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
 
-                        }
-                        string ErrorMessage = "";
-                        string result = "";
-                        if (int.Parse(mcd_remainqty.Text) <= 0)
-                        {
-                            macode = ma_code.Text;
-                            BaseUtil.CleanForm(this);
-                            ErrorMessage = "工单" + macode + "打印完成>>>请输入SN";
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
-                            return;
-                        }
-                        else
+                    }
+                    string ErrorMessage = "";
+                    string result = "";
+                    if (int.Parse(mcd_remainqty.Text) <= 0)
+                    {
+                        macode = ma_code.Text;
+                        BaseUtil.CleanForm(this);
+                        ErrorMessage = "工单" + macode + "打印完成>>>请输入SN";
+                        OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
+                        sncode.Focus();
+                        return;
+                    }
+                    else
+                    {
+                        if (PrintLabel.SelectedValue != null && PrintNum.Text.Trim() != "")
                         {
-                            if (PrintLabel.SelectedValue != null && PrintNum.Text.Trim() != "")
+                            Print.CodeSoft(lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, ma_code.Text, int.Parse(PrintNum.Text));
+                            if (LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "彩盒打印", User.UserSourceCode, User.UserCode, "彩盒打印成功", out ErrorMessage))
                             {
-                                Print.CodeSoft(lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, ma_code.Text, int.Parse(PrintNum.Text));
-                                if (LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "彩盒打印", User.UserSourceCode, User.UserCode, "彩盒打印成功", out ErrorMessage))
-                                {
-                                    ErrorMessage = "打印完成,执行更新";
-                                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
-                                    mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
-                                    mcd_remainqty.Text = int.Parse(mcd_remainqty.Text) - 1 + "";
-                                    sncode.Text = "";
-                                }
-                                else
-                                {
-                                    OperateResult.AppendText(">>更新错误" + ErrorMessage + "\n", Color.Red);
-                                }
+                                ErrorMessage = "打印完成,执行更新";
+                                OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
+                                mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
+                                mcd_remainqty.Text = int.Parse(mcd_remainqty.Text) - 1 + "";
+                                sncode.Text = "";
+                                sncode.Focus();
                             }
                             else
                             {
-                                ErrorMessage = "该序列号对应的产品未维护（彩盒）标签模板或打印张数没有选择";
-                                OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
-                                return;
+                                sncode.Text = "";
+                                sncode.Focus();
+                                OperateResult.AppendText(">>更新失败" + ErrorMessage + "\n", Color.Red);
                             }
-                            ErrorMessage = ">>>请输入SN";
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
                         }
-                    }
-                    else
-                    {
-                        OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
+                        else
+                        {
+                            ErrorMessage = "该序列号对应的产品未维护（彩盒）标签模板或打印张数没有选择";
+                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
+                            return;
+                        }
+                        ErrorMessage = ">>>请输入SN";
+                        OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
                     }
                 }
-                else {
-                    OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
+                else
+                {
+                    OperateResult.AppendText(ErrorMessage2 + "\n", Color.Red);
                 }
             }
         }