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

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -108,7 +108,7 @@ namespace UAS_MES.Make
                             sql.Clear();
                             sql.Append("select ma_code,ma_craftcode,ms_sncode,ma_qty,pr_detail,pr_code,ma_bomversion,ms_firstsn from makeserial left join make on ");
                             sql.Append("ms_makecode=ma_code left join product on ms_prodcode=pr_code where ms_id='" + Msid + "'");
-                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                            DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count > 0)
                             {
                                 BaseUtil.SetFormValue(this.Controls, dt);
@@ -179,7 +179,7 @@ namespace UAS_MES.Make
                                 else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, code);
                             }
                         }
-                        else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
+                        else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, code);
                     }
                     else
                     {
@@ -236,7 +236,7 @@ namespace UAS_MES.Make
                         }
                     }
                 }
-                else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
+                else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, code);
             }
         }