岗位资源与当前使用模块对应

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -33,7 +33,7 @@ namespace UAS_MES.Make
         //判断是否输入BT
         Boolean isMAC = false;
         //打印计数
-        int printcount ;
+        int printcount;
 
         public Make_CollectBTMAC()
         {
@@ -46,7 +46,7 @@ namespace UAS_MES.Make
             dh = new DataHelper();
             asc.controllInitializeSize(this);
             printcount = 0;
-          
+
         }
 
         private void Make_CollectBTMAC_Activated(object sender, EventArgs e)
@@ -75,51 +75,7 @@ namespace UAS_MES.Make
             sncode.Focus();
         }
 
-        /// <summary>
-        /// 获取序列号输入，并给界面控件赋值
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void getSocode(object sender,EventArgs e) {
-            string ErrorMessage2;
-            string oMakeCode;
-            //由序列号获取数据
-            if (sncode.Text == "")
-            {
-                OperateResult.AppendText(">>序列号不能为空\n", Color.Red);
-                return;
-            }
-            OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Green);
-            // 获取工单归属工单下一工序是否正确
-            if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, 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)
-                {
-                    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
-                {
-                    sncode.Text = "";
-                    OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
-                }
-            }
-            else
-            {
-                sncode.Text = "";
-                OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
-            }
-        }
+
 
 
         private void sncode_KeyDown(object sender, KeyEventArgs e)
@@ -130,7 +86,52 @@ namespace UAS_MES.Make
                 {
                     if (!isBT)
                     {
-                        getSocode(sender,e);
+                        string ErrorMessage2;
+                        string oMakeCode;
+                        //由序列号获取数据
+                        if (sncode.Text == "")
+                        {
+                            OperateResult.AppendText(">>序列号不能为空\n", Color.Red);
+                            return;
+                        }
+                        if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage2))
+                        {
+                            OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Green);
+                            // 获取工单归属工单下一工序是否正确
+                            if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, 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)
+                                {
+                                    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
+                                {
+                                    sncode.Text = "";
+                                    OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
+                                }
+                            }
+                            else
+                            {
+                                sncode.Text = "";
+                                OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
+                            }
+                        }
+                        else
+                        {
+                            sncode.Text = "";
+                            OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
+                        }
                     }
                     else
                     //采集BT

UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs

@@ -47,6 +47,8 @@ namespace UAS_MES.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
+                string ErrorMessage2;
+                string oMakeCode;
                 if (!isnetcode)
                 {
                     if (sncode.Text == "")
@@ -54,31 +56,37 @@ namespace UAS_MES.Make
                         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 (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, 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)
+                        OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Green);
+                        // 获取工单归属工单下一工序是否正确
+                        if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
                         {
-                            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;
+                            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)
+                            {
+                                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
+                            {
+                                sncode.Text = "";
+                                OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
+                            }
                         }
                         else
                         {
                             sncode.Text = "";
-                            OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
+                            OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
                         }
                     }
                     else

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -56,74 +56,82 @@ namespace UAS_MES.Make
                 string oMsID;
                 string ErrorMessage2;
                 string oMakeCode;
-                // 获取工单归属工单下一工序是否正确
-                if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
+                if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, 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)
+                    // 获取工单归属工单下一工序是否正确
+                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
                     {
-                        BaseUtil.SetFormValue(this.Controls, dt);
-                        //提示用户“<<工单号：取ma_makecode”
-                        OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Green);
-                        //提示用户“<< 序列号：XXXX”
-                        OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Green);
-                    }
-                    else
-                    {
-                        sncode.Text = "";
-                        OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
+                        //获取工单的其他信息
+                        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)
+                        {
+                            BaseUtil.SetFormValue(this.Controls, dt);
+                            //提示用户“<<工单号：取ma_makecode”
+                            OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Green);
+                            //提示用户“<< 序列号：XXXX”
+                            OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Green);
+                        }
+                        else
+                        {
+                            sncode.Text = "";
+                            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);
-                        sncode.Focus();
-                        return;
-                    }
-                    else
-                    {
-                        if (PrintLabel.SelectedValue != null && PrintNum.Text.Trim() != "")
+                        }
+                        string ErrorMessage = "";
+                        string result = "";
+                        if (int.Parse(mcd_remainqty.Text) <= 0)
                         {
-                            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))
+                            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() != "")
                             {
-                                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();
+                                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 = "";
+                                    sncode.Focus();
+                                }
+                                else
+                                {
+                                    sncode.Text = "";
+                                    sncode.Focus();
+                                    OperateResult.AppendText(">>更新失败" + ErrorMessage + "\n", Color.Red);
+                                }
                             }
                             else
                             {
-                                sncode.Text = "";
-                                sncode.Focus();
-                                OperateResult.AppendText(">>更新失败" + ErrorMessage + "\n", Color.Red);
+                                ErrorMessage = "该序列号对应的产品未维护（彩盒）标签模板或打印张数没有选择";
+                                OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
+                                return;
                             }
+                            OperateResult.AppendText(">>请输入SN\n", Color.Green);
                         }
-                        else
-                        {
-                            ErrorMessage = "该序列号对应的产品未维护（彩盒）标签模板或打印张数没有选择";
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
-                            return;
-                        }
-                        OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                    }
+                    else
+                    {
+                        sncode.Text = "";
+                        OperateResult.AppendText(ErrorMessage2 + "\n", Color.Red);
                     }
                 }
                 else
                 {
                     sncode.Text = "";
-                    OperateResult.AppendText(ErrorMessage2 + "\n", Color.Red);
+                    OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
                 }
             }
         }