修改提示语字体颜色

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -43,7 +43,7 @@ namespace UAS_MES.Make
             dh = new DataHelper();
             sncode.Focus();
             asc.controllInitializeSize(this);
-            OperateResult.AppendText(">>请输入SN\n", Color.Green);
+            OperateResult.AppendText(">>请输入SN\n", Color.Black);
             InitPrint = new Thread(InPrint);
             SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
             BaseUtil.SetFormCenter(stw);
@@ -78,11 +78,17 @@ namespace UAS_MES.Make
                     //定义临时变量
                     string oMakeCode = "";
                     string oMsId = "";
+                    if (!LogicHandler.GetMakeInfo(sncode.Text, out oMakeCode, out oErrorMessage))
+                    {
+                        OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red);
+                        OperateResult.AppendText(">>请输入序列号\n", Color.Black);
+                        return;
+                    }
                     //调用公共方法CheckStepSNAndMacode判断工序是否正确
-                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out oErrorMessage))
+                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text==oMakeCode?oMakeCode:"", User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out oErrorMessage))
                     {
                         //IF (如果ma_code 为空)THEN
-                        if (ma_code.Text == "")
+                        if (ma_code.Text == ""||ma_code.Text!=oMakeCode)
                         {
                             //获取工单的其他信息
                             sql.Clear();
@@ -96,9 +102,9 @@ namespace UAS_MES.Make
                                 //将工单的其他信息赋值到对应的控件
                                 BaseUtil.SetFormValue(this.Controls, mapB);
                                 //提示用户“<<工单号：取ma_makecode”
-                                OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Green);
+                                OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Black);
                                 //提示用户“<< 序列号：XXXX”
-                                OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Green);
+                                OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Black);
                             }
                             //没有数据
                             else
@@ -120,7 +126,7 @@ namespace UAS_MES.Make
                                     sncode.Text = "";
                                     sncode.Focus();
                                     //提示用户“>>请输入SN”
-                                    OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                                    OperateResult.AppendText(">>请输入SN\n", Color.Black);
                                     return;
                                 }
                                 //按照打印张数打印
@@ -146,7 +152,7 @@ namespace UAS_MES.Make
                                 else
                                 {
                                     //提示用户“>>请输入SN”
-                                    OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                                    OperateResult.AppendText(">>请输入SN\n", Color.Black);
                                 }
                             }
                             //标签为空

UAS-MES/FunctionCode/Make/Make_LabelCheck.cs

@@ -46,7 +46,7 @@ namespace UAS_MES.Make
             //聚焦SN号
             sncode.Focus();
             //打开界面提示用户：请输入SN 
-            OperateResult.AppendText(">>请输入SN\n", Color.Green);
+            OperateResult.AppendText(">>请输入SN\n", Color.Black);
             sql = new LogStringBuilder();
             dh = new DataHelper();
         }
@@ -86,7 +86,7 @@ namespace UAS_MES.Make
                         //请输入SN
                         OperateResult.AppendText("<<SN错误，序列号" + sncode.Text + "不存在\n", Color.Red);
                         sncode.Text = "";
-                        OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
                     }
                     //存在该SN号
                     else
@@ -104,7 +104,7 @@ namespace UAS_MES.Make
                                 //>> 请输入SN
                                 OperateResult.AppendText("<<SN" + sncode.Text + "对应的IMEI不存在\n", Color.Red);
                                 sncode.Text = "";
-                                OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                                OperateResult.AppendText(">>请输入SN\n", Color.Black);
                             }
                             else
                             //存在该imei信息
@@ -115,7 +115,7 @@ namespace UAS_MES.Make
                                 //>>SN对应的IMEI号为:xxxxxxxxx
                                 //>> 请输入彩盒上的IMEI
                                 OperateResult.AppendText("<<SN对应的IMEI号为:" + imei1 + "\n", Color.Green);
-                                OperateResult.AppendText(">>请输入彩盒上的IMEI\n", Color.Green);
+                                OperateResult.AppendText(">>请输入彩盒上的IMEI\n", Color.Black);
                                 sncode.Text = "";
                                 //设定要输入imei1
                                 isImei1 = true;
@@ -125,7 +125,7 @@ namespace UAS_MES.Make
                         {
                             OperateResult.AppendText("<<SN" + sncode.Text + "对应的IMEI不存在\n", Color.Red);
                             sncode.Text = "";
-                            OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                            OperateResult.AppendText(">>请输入SN\n", Color.Black);
                         }
                     }
                 }
@@ -157,7 +157,7 @@ namespace UAS_MES.Make
                                     //>> 请输入SN
                                     OperateResult.AppendText("<<IMEI核对成功\n", Color.Green);
                                     sncode.Text = "";
-                                    OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                                    OperateResult.AppendText(">>请输入SN\n", Color.Black);
                                 }
                                 else
                                 {
@@ -192,7 +192,7 @@ namespace UAS_MES.Make
                         //>> 请输入SN
                         OperateResult.AppendText(">>IMEI核对失败\n", Color.Red);
                         sncode.Text = "";
-                        OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
                     }
                     //imei1校对结束，下次输入的是SN
                     isImei1 = false;

UAS-MES/FunctionCode/Make/Make_PalletWeigh.cs

@@ -53,7 +53,7 @@ namespace UAS_MES.Make
         {
             CheckForIllegalCrossThreadCalls = false;
             asc.controllInitializeSize(this);
-            OperateResult.AppendText(">>请输入栈板号\n", Color.Green);
+            OperateResult.AppendText(">>请输入栈板号\n", Color.Black);
             //栈板号输入框聚焦
             palletcode.Focus();
             ComList.Text = Properties.Settings.Default.PortName;
@@ -137,13 +137,13 @@ namespace UAS_MES.Make
                             catch (Exception ex)
                             {
                                 OperateResult.AppendText("<<打印失败\n", Color.Red);
-                                OperateResult.AppendText(">>请输入栈板号\n", Color.Green);
+                                OperateResult.AppendText(">>请输入栈板号\n", Color.Black);
                                 palletcode.Text = "";
                                 return;
                             }
                             //打印成功，请输入栈板号
                             OperateResult.AppendText("<<打印成功\n", Color.Green);
-                            OperateResult.AppendText(">>请输入栈板号\n", Color.Green);
+                            OperateResult.AppendText(">>请输入栈板号\n", Color.Black);
                             //更新栈板打印次数
                             sql.Clear();
                             sql.Append("update package set pa_printcount= pa_printcount+1  where pa_id=:pa_id");

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -56,7 +56,7 @@ namespace UAS_MES.Make
             dh = new DataHelper();
             code.Focus();
             //提示用户“>>请输入TSN号”
-            OperateResult.AppendText(">>请输入TSN号\n", Color.Green);
+            OperateResult.AppendText(">>请输入TSN号\n", Color.Black);
         }
 
         private void 序列烧录转换_SizeChanged(object sender, EventArgs e)
@@ -75,7 +75,7 @@ namespace UAS_MES.Make
                         //为0，输入TSN
                         if (step == 0)
                         {
-                            OperateResult.AppendText(">>序列号：" + code.Text + " , 发送请求\n", Color.Green);
+                            OperateResult.AppendText(">>序列号：" + code.Text + " , 发送请求\n", Color.Black);
 
                             string oMakecode = "";
                             string oMsid = "";
@@ -123,7 +123,7 @@ namespace UAS_MES.Make
                                         if (ListA.Rows.Count == 0)
                                         {
                                             OperateResult.AppendText(">>请维护产品对应的关联采集信息\n", Color.Red);
-                                            OperateResult.AppendText("<<请输入TSN\n", Color.Green);
+                                            OperateResult.AppendText("<<请输入TSN\n", Color.Black);
                                             return;
                                         }
                                         step = 1;
@@ -138,7 +138,7 @@ namespace UAS_MES.Make
                                     {
                                         OperateResult.AppendText(">>序列号" + code.Text + "已进行了转换\n", Color.Red);
                                         code.Text = "";
-                                        OperateResult.AppendText("<<请重新输入TSN\n", Color.Green);
+                                        OperateResult.AppendText("<<请重新输入TSN\n", Color.Black);
                                     }
                                 }
                                 else
@@ -185,7 +185,7 @@ namespace UAS_MES.Make
                             else
                             {
                                 OperateResult.AppendText(">>序列号" + code.Text + "已存在\n", Color.Red);
-                                OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                                OperateResult.AppendText(">>请输入SN\n", Color.Black);
                                 code.Text = "";
                             }
                         }
@@ -234,7 +234,7 @@ namespace UAS_MES.Make
                         //序列号校验错误，长度错误
                         OperateResult.AppendText(">>" + TSNorSN + ":" + code.Text + "校验错误，长度错误\n", Color.Red);
                         code.Text = "";
-                        OperateResult.AppendText("<<请重新输入" + TSNorSN + "\n", Color.Green);
+                        OperateResult.AppendText("<<请重新输入" + TSNorSN + "\n", Color.Black);
                         return false;
                     }
                 }
@@ -246,7 +246,7 @@ namespace UAS_MES.Make
                         //序列号校验错误，前缀错误
                         OperateResult.AppendText(">>" + TSNorSN + ":" + code.Text + "校验错误，前缀错误\n", Color.Red);
                         code.Text = "";
-                        OperateResult.AppendText("<<请重新输入" + TSNorSN + "\n", Color.Green);
+                        OperateResult.AppendText("<<请重新输入" + TSNorSN + "\n", Color.Black);
                         return false;
                     }
                 }
@@ -265,14 +265,14 @@ namespace UAS_MES.Make
             if ((ListA.Rows[step - 2]["psr_length"].ToString() == "" ? true : code.Text.Length != int.Parse(ListA.Rows[step - 2]["psr_length"].ToString())))
             {
                 OperateResult.AppendText(">>" + ListA.Rows[step - 2]["psr_type"] + "长度校验不通过,请重新输入\n", Color.Red);
-                OperateResult.AppendText(">>请重新输入" + ListA.Rows[step - 2]["psr_type"] + "\n", Color.Green);
+                OperateResult.AppendText(">>请重新输入" + ListA.Rows[step - 2]["psr_type"] + "\n", Color.Black);
                 code.Text = "";
                 return false;
             }
             if (!(ListA.Rows[step - 2]["psr_prefix"].ToString() == "" ? true : code.Text.StartsWith(ListA.Rows[step - 2]["psr_prefix"].ToString())))
             {
                 OperateResult.AppendText(">>" + ListA.Rows[step - 2]["psr_type"] + "前缀校验不通过,请重新输入\n", Color.Red);
-                OperateResult.AppendText(">>请重新输入" + ListA.Rows[step - 2]["psr_type"] + "\n", Color.Green);
+                OperateResult.AppendText(">>请重新输入" + ListA.Rows[step - 2]["psr_type"] + "\n", Color.Black);
                 code.Text = "";
                 return false;
             }
@@ -284,7 +284,7 @@ namespace UAS_MES.Make
                     if (checkExist("ms_imei1='" + code.Text + "' or ms_imei2 = '" + code.Text + "' or ms_imei3 = '" + code.Text + "'"))
                     {
                         OperateResult.AppendText(">>" + type + ":" + code.Text + "错误，不允许重复\n", Color.Red);
-                        OperateResult.AppendText(">>请输入" + type + "\n", Color.Green);
+                        OperateResult.AppendText(">>请输入" + type + "\n", Color.Black);
                         code.Text = "";
                         return false;
                     }
@@ -294,7 +294,7 @@ namespace UAS_MES.Make
                         if (imei.ToString().Contains(code.Text))
                         {
                             OperateResult.AppendText(">>" + type + ":" + code.Text + "已录，请重新输入\n", Color.Red);
-                            OperateResult.AppendText(">>请输入" + type + "\n", Color.Green);
+                            OperateResult.AppendText(">>请输入" + type + "\n", Color.Black);
                             code.Text = "";
                             return false;
                         }
@@ -309,7 +309,7 @@ namespace UAS_MES.Make
                     if (checkExist("MS_" + type + "='" + code.Text + "'"))
                     {
                         OperateResult.AppendText(">>" + type + ":" + code.Text + "错误，不允许重复\n", Color.Red);
-                        OperateResult.AppendText(">>请输入" + type + "\n", Color.Green);
+                        OperateResult.AppendText(">>请输入" + type + "\n", Color.Black);
                         code.Text = "";
                         return false;
                     }
@@ -333,7 +333,7 @@ namespace UAS_MES.Make
                         if (dh.CheckExist("makeserial", "MS_" + de.Key + "='" + de.Value + "'"))
                         {
                             flag = false;
-                            OperateResult.AppendText(">>" + de.Key + "已被使用,请重新输入TSN,重新转换\n", Color.Green);
+                            OperateResult.AppendText(">>" + de.Key + "已被使用,请重新输入TSN,重新转换\n", Color.Red);
                             //清空信息
                             clearInfo();
                             break;
@@ -350,14 +350,13 @@ namespace UAS_MES.Make
                         string updateSql = "update makeserial set ms_sncode='" + SN + "', ms_beforesn='" + TSN + "'," + s1.Remove(s1.Length - 1, 1).ToString() + " where ms_sncode='" + TSN + "'";
                         string insertSql = "insert into  makesnrelation (BEFORESN,SN,FIRSTSN,MAKECODE,msr_indate, msr_inman)values('" + TSN + "','" + SN + "','" + firstsn + "','" + ms_macode.Text + "', sysdate ,'" + User.UserCode + "')";
                         dh.ExecuteSQLTran(updateSql, insertSql);
-                        OperateResult.AppendText(">>序列号转换成功\n", Color.Green);
+                        OperateResult.AppendText(">>序列号转换成功\n关联采集成功", Color.Green);
                         //写入日志
                         LogManager.DoLog("修改序列号：" + TSN + "为" + SN + "成功！" + "操作人：" + User.UserCode);
                         //完成该道工序 setFinish
                         LogicHandler.UpdateMakeMessage(SN, ms_macode.Text, "序列烧录转换", User.UserSourceCode, User.UserCode, "序列烧录转换成功", out errorMessage);
 
                         //输出提示用户“>>序列号转换成功”，“>>关联采集成功”
-                        OperateResult.AppendText(">>关联采集成功\n", Color.Green);
                         //获取剩余数，刷新页面
                         sql.Clear();
                         sql.Append("select mcd_inqty from makecraftdetail where mcd_macode='" + ms_macode.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
@@ -370,13 +369,13 @@ namespace UAS_MES.Make
                         count.Text = int.Parse(count.Text) + 1 + "";
                         //完成之后,清除信息
                         clearInfo();
-                        OperateResult.AppendText(">>请输入TSN号\n", Color.Green);
+                        OperateResult.AppendText(">>请输入TSN号\n", Color.Black);
                     }
                 }
                 else
                 {
                     OperateResult.AppendText(">>序列号" + SN + "已存在\n", Color.Red);
-                    OperateResult.AppendText(">>请重新输入TSN\n", Color.Green);
+                    OperateResult.AppendText(">>请重新输入TSN\n", Color.Black);
                     code.Text = "";
                     //清空信息
                     clearInfo();

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -33,7 +33,7 @@ namespace UAS_MES.Make
             asc.controllInitializeSize(this);
             dh = new DataHelper();
             sncode.Focus();
-            OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Green);
+            OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Black);
 
             //设置锁定工单
             ms_makecode_lock.GetMakeCodeCtl(ma_code);
@@ -62,7 +62,7 @@ namespace UAS_MES.Make
                 {
                     if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out errorMessage))
                     {
-                        OperateResult.AppendText(">>序列号：" + sncode.Text + " , 发送请求\n", Color.Green);
+                        OperateResult.AppendText(">>序列号：" + sncode.Text + " , 发送请求\n", Color.Black);
                         //如果用户没有输入工单号自行去后台查询
                         //通过工单序列号关系验证
                         //bsncode为空，就说明是输入转换之前的序列号
@@ -71,11 +71,17 @@ namespace UAS_MES.Make
                             //定义传入方法的变量
                             string oMakeCode = "";
                             string oMsId = "";
+                            if (!LogicHandler.GetMakeInfo(sncode.Text,out oMakeCode,out errorMessage))
+                            {
+                                OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red);
+                                OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Black);
+                                return;
+                            }
                             //用户填写了工单号，那么序列号必须要是该工单的，否则提示错误
-                            if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out errorMessage))
+                            if (LogicHandler.CheckStepSNAndMacode(ma_code.Text==oMakeCode?oMakeCode:"", User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out errorMessage))
                             {
                                 //如果用户没有选择工单号
-                                if (ma_code.Text=="") {
+                                if (ma_code.Text==""||ma_code.Text!=oMakeCode) {
                                     dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,pr_detail,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
                                     if (dt.Rows.Count > 0)
                                     {
@@ -101,9 +107,9 @@ namespace UAS_MES.Make
                                         }
                                         else
                                         {
-                                            OperateResult.AppendText(">>不存在该已转序列号\n" + sncode.Text + "\n");
+                                            OperateResult.AppendText(">>不存在该已转序列号:" + sncode.Text + "\n",Color.Red);
                                             sncode.Text = "";
-                                            OperateResult.AppendText("<<请重新输入序列号\n", Color.Green);
+                                            OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
                                         }
                                         break;
                                     case CheckState.Unchecked:
@@ -122,7 +128,7 @@ namespace UAS_MES.Make
                                         {
                                             OperateResult.AppendText(">>序列号" + sncode.Text + "错误\n", Color.Red);
                                             sncode.Text = "";
-                                            OperateResult.AppendText("<<请重新输入序列号\n", Color.Green);
+                                            OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
                                         }
                                         break;
                                     default:
@@ -173,7 +179,7 @@ namespace UAS_MES.Make
                                     //写入日志
                                     LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "序列转换", User.UserSourceCode, User.UserCode, "序列转换成功", out errorMessage);
                                     LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
-                                    OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Green);
+                                    OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Black);
                                     //置空
                                     bsncode = "";
                                     //更新数量
@@ -354,7 +360,7 @@ namespace UAS_MES.Make
                         //序列号校验错误，长度错误
                         OperateResult.AppendText(">>序列号" + sncode.Text + "校验错误，长度错误\n", Color.Red);
                         sncode.Text = "";
-                        OperateResult.AppendText("<<请重新输入序列号\n", Color.Green);
+                        OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
                         return false;
                     }
                 }
@@ -366,7 +372,7 @@ namespace UAS_MES.Make
                         //序列号校验错误，前缀错误
                         OperateResult.AppendText(">>序列号" + sncode.Text + "校验错误，前缀错误\n", Color.Red);
                         sncode.Text = "";
-                        OperateResult.AppendText("<<请重新输入序列号\n", Color.Green);
+                        OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
                         return false;
                     }
                 }