Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_BigBoxWeight.cs

@@ -88,7 +88,8 @@ namespace UAS_MES.Make
                 lbl = new ApplicationClass();
                 BaseUtil.WriteLbl(lbl);
             }
-            catch {
+            catch
+            {
                 OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
             }
         }
@@ -140,12 +141,12 @@ namespace UAS_MES.Make
                     OperateResult.AppendText("<<<更新成功\n", Color.Green);
                     //刷新grid的历史称重信息；
                     recordResult(pa_outboxcode.Text, weight.Text, System.DateTime.Now.ToString());
-                    LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode,pa_makecode.Text,User.UserLineCode,User.UserSourceCode,"大箱称重","称重成功","","");
+                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "大箱称重", "称重成功", "", "");
                     if (autoprint.Checked == true)
                     {
                         try
                         {
-                            Print.CodeSoft(Tag.ToString(),lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), Printer.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+                            Print.CodeSoft(Tag.ToString(), lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), Printer.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
                             dh.ExecuteSql("update package set pa_printcount= pa_printcount+1 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
                             printcount++;
                             weightsum.Text = printcount + "";
@@ -153,15 +154,15 @@ namespace UAS_MES.Make
                             pa_outboxcode.Text = "";
                             pa_outboxcode.Focus();
                         }
-                        catch(Exception eb)
+                        catch (Exception eb)
                         {
                             if (PrintLabel.SelectedValue == null)
                             {
-                                OperateResult.AppendText(">>产品:" + pa_prodcode.Text + "未维护大箱标签模板\n", Color.Red);
-                                pa_outboxcode.Text = "";
+                                OperateResult.AppendText(">>产品:" + pa_prodcode.Text + "未维护大箱标签模板\n", Color.Red, pa_outboxcode);
                                 pa_outboxcode.Focus();
-                            }else
-                            OperateResult.AppendText("<<<打印失败:"+eb.Message+"\n", Color.Red);
+                            }
+                            else
+                                OperateResult.AppendText("<<<打印失败:" + eb.Message + "\n", Color.Red);
                         }
                     }
                     else
@@ -169,8 +170,9 @@ namespace UAS_MES.Make
                         OperateResult.AppendText("<<<需打印请勾选自动打印\n", Color.Red);
                     }
                 }
-                else {
-                       OperateResult.AppendText("<<<大箱重量应大于0\n", Color.Red);
+                else
+                {
+                    OperateResult.AppendText("<<<大箱重量应大于0\n", Color.Red);
                 }
             }
         }

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -115,20 +115,17 @@ namespace UAS_MES.Make
                                 }
                                 else
                                 {
-                                    OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
-                                    sncode.Text = "";
+                                    OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red, sncode);
                                 }
                             }
                             else
                             {
-                                sncode.Text = "";
-                                OperateResult.AppendText(ErrorMessage2 + "\n", Color.Red);
+                                OperateResult.AppendText(ErrorMessage2 + "\n", Color.Red, sncode);
                             }
                         }
                         else
                         {
-                            sncode.Text = "";
-                            OperateResult.AppendText(ErrorMessage2 + "\n", Color.Red);
+                            OperateResult.AppendText(ErrorMessage2 + "\n", Color.Red, sncode);
                         }
                     }
                     else
@@ -157,8 +154,7 @@ namespace UAS_MES.Make
                             }
                             if (!isbt)
                             {
-                                OperateResult.AppendText(">>BT号不符合工单导入要求\n", Color.Red);
-                                sncode.Text = "";
+                                OperateResult.AppendText(">>BT号不符合工单导入要求\n", Color.Red, sncode);
                                 return;
                             }
                         }
@@ -173,8 +169,7 @@ namespace UAS_MES.Make
                             {
                                 if (!(dt.Rows[0]["sr_startcode"].ToString().CompareTo(sncode.Text) <= 0 && dt.Rows[0]["sr_endcode"].ToString().CompareTo(sncode.Text) >= 0))
                                 {
-                                    OperateResult.AppendText(">>BT号不符合销售单合同范围\n", Color.Red);
-                                    sncode.Text = "";
+                                    OperateResult.AppendText(">>BT号不符合销售单合同范围\n", Color.Red, sncode);
                                     return;
                                 }
                             }
@@ -183,18 +178,16 @@ 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.Red, sncode);
                             OperateResult.AppendText(">>请输入BT\n", Color.Black);
                             return;
                         }
                         else
                         {
                             ms_bt = sncode.Text;
-                            OperateResult.AppendText(">>BT采集完成\n>>请输入MAC\n", Color.Green);
+                            OperateResult.AppendText(">>BT采集完成\n>>请输入MAC\n", Color.Green, sncode);
                             isBT = false;
                             isMAC = true;
-                            sncode.Text = "";
                             sncode.Focus();
                             return;
                         }
@@ -226,8 +219,7 @@ namespace UAS_MES.Make
                         }
                         if (!ismac)
                         {
-                            OperateResult.AppendText(">>MAC号不符合工单导入要求\n", Color.Red);
-                            sncode.Text = "";
+                            OperateResult.AppendText(">>MAC号不符合工单导入要求\n", Color.Red, sncode);
                             return;
                         }
                     }
@@ -242,8 +234,7 @@ namespace UAS_MES.Make
                         {
                             if (!(dt.Rows[0]["sr_startcode"].ToString().CompareTo(sncode.Text) <= 0 && dt.Rows[0]["sr_endcode"].ToString().CompareTo(sncode.Text) >= 0))
                             {
-                                OperateResult.AppendText(">>MAC号不符合销售单合同范围\n", Color.Red);
-                                sncode.Text = "";
+                                OperateResult.AppendText(">>MAC号不符合销售单合同范围\n", Color.Red, sncode);
                                 return;
                             }
                         }
@@ -252,18 +243,17 @@ 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.Red, sncode);
                         OperateResult.AppendText(">>请输入MAC\n", Color.Black);
                         return;
                     }
                     else
                     {
-                        if (LogicHandler.SetStepResult(ms_makecode.Text, User.UserSourceCode, sn_code,"BT/MAC采集", "BT/MAC采集完成",User.UserCode,out ErrorMessage))   
+                        if (LogicHandler.SetStepResult(ms_makecode.Text, User.UserSourceCode, sn_code, "BT/MAC采集", "BT/MAC采集完成", User.UserCode, out ErrorMessage))
                         {
                             dh.UpdateByCondition("makeserial", "ms_mac = '" + sncode.Text + "' ," + "ms_bt = '" + ms_bt + "'", "ms_id = '" + oMsID + "'");
                             OperateResult.AppendText(">>BT/MAC采集完成,执行更新\n", Color.Green);
-                            LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode,ms_makecode.Text,User.UserLineCode,User.UserSourceCode,"BT/MAC采集","采集成功", sn_code,"");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "BT/MAC采集", "采集成功", sn_code, "");
                             sql.Clear();
                             sql.Append("select 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='" + ms_makecode.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -126,15 +126,13 @@ namespace UAS_MES.Make
                     if (dt.Rows[0][0].ToString() != "")
                     {
                         ms_id = dt.Rows[0][0].ToString();
-                        sncode.Text = "";
                         sncode.Focus();
-                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                        OperateResult.AppendText(">>请输入SN\n", Color.Black, sncode);
                         return;
                     }
                     else
                     {
-                        sncode.Text = "";
-                        OperateResult.AppendText(">>TSN错误,不存在\n", Color.Red);
+                        OperateResult.AppendText(">>TSN错误,不存在\n", Color.Red, sncode);
                         OperateResult.AppendText(">>请输入TSN\n", Color.Black);
                         return;
                     }
@@ -156,8 +154,7 @@ namespace UAS_MES.Make
                     }
                     else
                     {
-                        sncode.Text = "";
-                        OperateResult.AppendText(">>TSN和SN不一致\n", Color.Red);
+                        OperateResult.AppendText(">>TSN和SN不一致\n", Color.Red, sncode);
                         OperateResult.AppendText(">>请输入TSN\n", Color.Black);
                         ms_id = null;
                         return;
@@ -184,7 +181,7 @@ namespace UAS_MES.Make
                         sql.Clear();
                         sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,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=="null"?ma_code.Text: oMakeCode) + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
+                        sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + (oMakeCode == "null" ? ma_code.Text : oMakeCode) + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (dt.Rows.Count > 0)
                         {
@@ -207,8 +204,7 @@ namespace UAS_MES.Make
                         }
                         else
                         {
-                            OperateResult.AppendText(">>无序列号" + sncode.Text + "对应工单信息\n", Color.Red);
-                            sncode.Text = "";
+                            OperateResult.AppendText(">>无序列号" + sncode.Text + "对应工单信息\n", Color.Red, sncode);
                             sncode.Focus();
                             return;
                         }
@@ -231,9 +227,8 @@ namespace UAS_MES.Make
                                 //如果打印张数为空，返回
                                 if (PrintNum.Text == "" || int.Parse(PrintNum.Text) == 0)
                                 {
-                                    OperateResult.AppendText(">>打印张数不可空或者为0\n", Color.Red);
+                                    OperateResult.AppendText(">>打印张数不可空或者为0\n", Color.Red, sncode);
                                     //清空输入框的值，聚焦
-                                    sncode.Text = "";
                                     sncode.Focus();
                                     //提示用户“>>请输入SN”
                                     OperateResult.AppendText(">>请输入SN\n", Color.Black);
@@ -256,8 +251,7 @@ namespace UAS_MES.Make
                                 }
                                 else
                                 {
-                                    OperateResult.AppendText(">>" + ErrorMessage2 + "\n", Color.Red);
-                                    sncode.Text = "";
+                                    OperateResult.AppendText(">>" + ErrorMessage2 + "\n", Color.Red, sncode);
                                     ms_id = null;
                                     sncode.Focus();
                                 }
@@ -279,8 +273,7 @@ namespace UAS_MES.Make
                     }
                     else
                     {
-                        sncode.Text = "";
-                        OperateResult.AppendText(ErrorMessage2 + "\n", Color.Red);
+                        OperateResult.AppendText(ErrorMessage2 + "\n", Color.Red, sncode);
                         if (CheckTSN.Checked == true)
                         {
                             OperateResult.AppendText(">>请输入TSN\n", Color.Black);
@@ -292,8 +285,7 @@ namespace UAS_MES.Make
                 }
                 else
                 {
-                    sncode.Text = "";
-                    OperateResult.AppendText(ErrorMessage2 + "\n", Color.Red);
+                    OperateResult.AppendText(ErrorMessage2 + "\n", Color.Red, sncode);
                     if (CheckTSN.Checked == true)
                     {
                         OperateResult.AppendText(">>请输入TSN\n", Color.Black);
@@ -363,16 +355,14 @@ namespace UAS_MES.Make
             {
                 ms_id = null;
                 OperateResult.AppendText(">>切换至检查TSN\n", Color.Green);
-                OperateResult.AppendText(">>请输入TSN\n", Color.Black);
-                sncode.Text = "";
+                OperateResult.AppendText(">>请输入TSN\n", Color.Black, sncode);
                 sncode.Focus();
             }
             else
             {
                 ms_id = null;
                 OperateResult.AppendText(">>切换至不检查TSN\n", Color.Green);
-                OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                sncode.Text = "";
+                OperateResult.AppendText(">>请输入SN\n", Color.Black, sncode);
                 sncode.Focus();
             }
         }

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -90,8 +90,7 @@ namespace UAS_MES.Make
                     }
                     else
                     {
-                        OperateResult.AppendText(">>序列号" + ms_sncode.Text + "必须是非在线状态才能做拆解\n", Color.Red);
-                        sn_code.Text = "";
+                        OperateResult.AppendText(">>序列号" + ms_sncode.Text + "必须是非在线状态才能做拆解\n", Color.Red, sn_code);
                         BaseUtil.CleanForm(this);
                         sn_code.Focus();
                         return;
@@ -100,8 +99,7 @@ namespace UAS_MES.Make
                 else
                 {
                     ms_id = null;
-                    OperateResult.AppendText(">>序列号" + sncode_1 + "不存在\n", Color.Red);
-                    sn_code.Text = "";
+                    OperateResult.AppendText(">>序列号" + sncode_1 + "不存在\n", Color.Red, sn_code);
                     BaseUtil.CleanForm(this);
                     sn_code.Focus();
                     return;

UAS-MES/FunctionCode/Make/Make_MakeDown.cs

@@ -106,16 +106,14 @@ namespace UAS_MES.Make
                             }
                             else
                             {
-                                OperateResult.AppendText(">>>序列号" + sn_code.Text + "已装箱:" + ms_outboxcode + ",不允许下地，如需下地请先解除装箱\n", Color.Red);
-                                sn_code.Text = "";
+                                OperateResult.AppendText(">>>序列号" + sn_code.Text + "已装箱:" + ms_outboxcode + ",不允许下地，如需下地请先解除装箱\n", Color.Red, sn_code);
                                 sn_code.Focus();
                                 return;
                             }
                         }
                         else
                         {
-                            OperateResult.AppendText(">>>序列号" + sn_code.Text + "目前已经是下地状态，无需重复下地\n", Color.Red);
-                            sn_code.Text = "";
+                            OperateResult.AppendText(">>>序列号" + sn_code.Text + "目前已经是下地状态，无需重复下地\n", Color.Red, sn_code);
                             sn_code.Focus();
                             return;
                         }
@@ -124,15 +122,13 @@ namespace UAS_MES.Make
                     else
                     {
                         ms_id = null;
-                        OperateResult.AppendText(">>>序列号" + sn_code.Text + "不存在\n", Color.Red);
-                        sn_code.Text = "";
+                        OperateResult.AppendText(">>>序列号" + sn_code.Text + "不存在\n", Color.Red, sn_code);
                         sn_code.Focus();
                     }
                 }
                 else
                 {
-                    OperateResult.AppendText(">>>序列号" + sn_code.Text + "未输入下地原因\n", Color.Red);
-                    sn_code.Text = "";
+                    OperateResult.AppendText(">>>序列号" + sn_code.Text + "未输入下地原因\n", Color.Red, sn_code);
                     sn_code.Focus();
                     return;
                 }