BT/MAC采集修改

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -22,8 +22,10 @@ namespace UAS_MES.Make
         string sn_code;
         //制造单号
         string macode;
-        //采集网标号
-        string net_code;
+        //采集BT号
+        string ms_bt;
+        //采集MAC
+        string ms_mac;
         //网标查询条件ms_id
         string oMsID;
         //判断是否输入BT
@@ -70,95 +72,126 @@ namespace UAS_MES.Make
             {
                 if (!isMAC)
                 {
-                    if (sncode.Text == "")
-                    {
-                        OperateResult.AppendText(">>序列号不能为空\n", Color.Red);
-                        return;
-                    }
-                    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 (!isBT)
                     {
-                        if (LogicHandler.GetMakeInfo(sncode.Text, out macode, out ErrorMessage2))
+                        //由序列号获取数据
+                        if (sncode.Text == "")
+                        {
+                            OperateResult.AppendText(">>序列号不能为空\n", Color.Red);
+                            return;
+                        }
+                        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 (ms_makecode.Text != macode || macode == "")
+                            if (LogicHandler.GetMakeInfo(sncode.Text, out macode, out ErrorMessage2))
                             {
-                                //ma_code不为空的时候表示不是第一次加载，提示用户切换工单
-                                if (macode != "" && ms_makecode.Text != "")
+                                //判断如果该序列号的归属工单和之前查询的是一致的话，就不进行重复数据的查询
+                                if (ms_makecode.Text != macode || macode == "")
                                 {
-                                    OperateResult.AppendText(">>切换工单至工单号" + macode + "\n", Color.Red);
+                                    //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 = "";
-                                isBT = true;
-                                return;
+                                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);
+                                }
+
                             }
                             else
                             {
-                                OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
+                                OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
                             }
-
                         }
                         else
                         {
                             OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
                         }
+
                     }
                     else
+                    //采集BT
                     {
-                        OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
+                        if (sncode.Text == "")
+                        {
+                            OperateResult.AppendText(">>BT号不能为空\n", Color.Red);
+                            return;
+                        }
+                        OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Green);
+                        string ErrorMessage = "";
+                        string result = "";
+                        //根据序列号获取此时BT号
+                        ms_bt = dh.getFieldDataByCondition("makeserial", "ms_bt", "ms_id = '" + oMsID + "'").ToString();
+                        if (sncode.Text == ms_bt)
+                        {
+                            OperateResult.AppendText(">>BT错误,重复\n", Color.Red);
+                            OperateResult.AppendText(">>请输入BT\n", Color.Green);
+                            return;
+                        }
+                        else
+                        {
+                            ms_bt = sncode.Text;
+                            ErrorMessage = "工单" + sncode.Text + "BT采集完成>>>请输入SN";
+                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
+                            isBT = false;
+                            isMAC = true;
+                            ErrorMessage = ">>>请输入SN";
+                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
+                        }
+
                     }
                 }
                 else
                 {
+                    //采集MAC
                     if (sncode.Text == "")
                     {
-                        OperateResult.AppendText(">>网标号不能为空\n", Color.Red);
+                        OperateResult.AppendText(">>MAC号不能为空\n", Color.Red);
                         return;
                     }
                     OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Green);
                     string ErrorMessage = "";
                     string result = "";
                     //根据序列号获取此时网标号
-                    net_code = dh.getFieldDataByCondition("makeserial", "ms_netcode", "ms_id = '" + oMsID + "'").ToString();
-                    if (int.Parse(mcd_remainqty.Text) <= 0)
-                    {
-                        ErrorMessage = "工单" + sncode.Text + "网标采集完成>>>请输入SN";
-                        OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
-                        return;
-                    }
-                    else if (sncode.Text == net_code)
+                    ms_mac = dh.getFieldDataByCondition("makeserial", "ms_mac", "ms_id = '" + oMsID + "'").ToString();
+                    if (sncode.Text == ms_mac)
                     {
-                        OperateResult.AppendText(">>网标错误,重复\n", Color.Red);
-                        OperateResult.AppendText(">>请输入网标\n", Color.Green);
+                        OperateResult.AppendText(">>MAC错误,重复\n", Color.Red);
+                        OperateResult.AppendText(">>请输入MAC\n", Color.Green);
                         return;
                     }
                     else
                     {
-                        if (LogicHandler.UpdateMakeMessage(sn_code, ms_makecode.Text, "网标采集", User.UserSourceCode, User.UserCode, "采集完成", out ErrorMessage))
+                        if (LogicHandler.UpdateMakeMessage(sn_code, ms_makecode.Text, "BT/MAC采集", User.UserSourceCode, User.UserCode, "采集完成", out ErrorMessage))
                         {
-                            dh.UpdateByCondition("makeserial", "ms_netcode = '" + sncode.Text + "'", "ms_id = '" + oMsID + "'");
-                            ErrorMessage = "网标采集完成,执行更新";
+                            dh.UpdateByCondition("makeserial", "ms_mac = '" + sncode.Text + "' ," + "ms_bt = '" + ms_bt + "'", "ms_id = '" + oMsID + "'");
+                            ErrorMessage = "BT/MAC采集完成,执行更新";
                             OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
                             BaseUtil.CleanForm(this);
                             printcount++;
                             mcd_okqty.Text = printcount + "";
                             mcd_remainqty.Text = 0 + "";
-                           // netcode = false;
+                            isMAC = false;
                         }
                         else
                         {

UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs

@@ -115,7 +115,7 @@ 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 = "工单" + sncode.Text + "剩余采集数不足>>>请输入SN";
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
                         return;
                     }

UAS-MES/PublicMethod/LogicHandler.cs

@@ -995,12 +995,10 @@ namespace UAS_MES.PublicMethod
             Console.WriteLine("CurrentStep" + CurrentStep);
             if (StepCode == CurrentStep)
             {
-                MessageBox.Show("执行打印");
                 InsertMakeProcess(iSN, iMakeCode, iSourceCode, iMPKind, iResult, iUserCode);
                 return true;
             }
             else {
-                MessageBox.Show("执行更新"+ iMakeCode+"," +iSourceCode+","+iSN+","+ iUserCode);
                 return CS_SetFinish(iMakeCode, iSourceCode, iSN, iUserCode, out oErrorMessage);
             }
         }