Browse Source

去除多余语句

Hcsy 8 years ago
parent
commit
42a01841c7

+ 5 - 7
UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs

@@ -80,9 +80,9 @@ namespace UAS_MES.Make
                             }
                             else OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red, sncode);
                         }
-                        else  OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red, sncode);
+                        else OperateResult.AppendText(">>" + ErrorMessage2 + "\n", Color.Red, sncode);
                     }
-                    else OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red, sncode);
+                    else OperateResult.AppendText(">>" + ErrorMessage2 + "\n", Color.Red, sncode);
                 }
                 //采集netcode
                 else
@@ -114,7 +114,7 @@ namespace UAS_MES.Make
                     net_code = dh.getFieldDataByCondition("makeserial", "ms_netcode", "ms_id = '" + oMsID + "'").ToString();
                     if (int.Parse(mcd_remainqty.Text) <= 0)
                     {
-                        ErrorMessage = "工单" + ms_makecode.Text + "剩余采集数不足>>>请输入SN";
+                        ErrorMessage = "工单" + ms_makecode.Text + "剩余采集数不足\n>>>请输入SN";
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
                         return;
                     }
@@ -130,8 +130,7 @@ namespace UAS_MES.Make
                         if (LogicHandler.SetStepResult(ms_makecode.Text, User.UserSourceCode, sn_code, "网标采集", "网标采集完成", User.UserCode, out ErrorMessage))
                         {
                             dh.UpdateByCondition("makeserial", "ms_netcode = '" + sncode.Text + "'", "ms_id = '" + oMsID + "'");
-                            ErrorMessage = "网标采集完成,执行更新";
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
+                            OperateResult.AppendText(">>网标采集完成,执行更新\n", Color.Green);
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "网标采集", "采集成功", sn_code, "");
                             sql.Clear();
                             sql.Append("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
@@ -148,8 +147,7 @@ namespace UAS_MES.Make
                         {
                             OperateResult.AppendText(">>更新错误" + ErrorMessage + "\n", Color.Red);
                         }
-                        ErrorMessage = ">>>请输入SN";
-                        OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Black);
+                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
                     }
                 }
             }

+ 0 - 2
UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -178,13 +178,11 @@ namespace UAS_MES.Make
                 sql.Clear();
                 bccode = new string[dt.Rows.Count];
                 bgcode = new string[dt.Rows.Count];
-                id = new string[dt.Rows.Count];
                 for (int i = 0; i < dt.Rows.Count; i++)
                 {
                     sql.Append(dt.Rows[i]["mb_bgcode"].ToString() + " : " + dt.Rows[i]["mb_badcode"].ToString() + "  ");
                     bgcode[i] = dt.Rows[i]["mb_bgcode"].ToString();
                     bccode[i] = dt.Rows[i]["mb_badcode"].ToString();
-                    id[i] = dh.GetSEQ("MakeBad_seq");
                 }
                 for (int i = 0; i < LabelDataGridView.Rows.Count; i++)
                 {