Browse Source

修改错误提示

章政 8 years ago
parent
commit
81172852cd

+ 6 - 2
UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -222,8 +222,12 @@ namespace UAS_MES.Make
                     tnode_0.Nodes.Add(tnode_1);
                     tnode_0.Nodes.Add(tnode_1);
                 }
                 }
             }
             }
-            if (bg_code.Text != "")
-                BadCodeTree.Nodes[bg_code.Text].Expand();
+            try
+            {
+                if (bg_code.Text != "")
+                    BadCodeTree.Nodes[bg_code.Text].Expand();
+            }
+            catch (Exception){}
         }
         }
 
 
         private void RefreshTreeView_Click(object sender, EventArgs e)
         private void RefreshTreeView_Click(object sender, EventArgs e)

+ 2 - 2
UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -431,7 +431,7 @@ namespace UAS_MES.Make
                     {
                     {
                         if (ChoosedRejectList.Items[i].ListView.Items[0].SubItems[2].Text == bc_code.Text)
                         if (ChoosedRejectList.Items[i].ListView.Items[0].SubItems[2].Text == bc_code.Text)
                         {
                         {
-                            MessageBox.Show("已添加过不良代码" + bc_code.Text);
+                            OperateResult.AppendText(">>已添加过不良代码\n", Color.Red);
                             return;
                             return;
                         }
                         }
                     }
                     }
@@ -441,7 +441,7 @@ namespace UAS_MES.Make
                         lvi.SubItems.Add(dt.Rows[0][j].ToString());
                         lvi.SubItems.Add(dt.Rows[0][j].ToString());
                     ChoosedRejectList.Items.Add(lvi);
                     ChoosedRejectList.Items.Add(lvi);
                 }
                 }
-                else MessageBox.Show("不良代码不存在");
+                else OperateResult.AppendText(">>不良代码不存在\n", Color.Red);
             }
             }
         }
         }
 
 

+ 1 - 1
UAS-MES/Program.cs

@@ -91,7 +91,7 @@ namespace UAS_MES
             if (ex != null)
             if (ex != null)
             {
             {
                 sb.AppendLine(ex.Message);
                 sb.AppendLine(ex.Message);
-                sb.AppendLine("【异常方法】:" + ex.StackTrace);
+                //sb.AppendLine("【异常方法】:" + ex.StackTrace);
             }
             }
             //else { sb.AppendLine("【未处理异常】:" + backStr); }
             //else { sb.AppendLine("【未处理异常】:" + backStr); }
             return sb.ToString();
             return sb.ToString();

+ 3 - 2
UAS-MES/PublicMethod/LogicHandler.cs

@@ -382,9 +382,10 @@ namespace UAS_MES.PublicMethod
             if (dt.Rows.Count > 0)
             if (dt.Rows.Count > 0)
             {
             {
                 string em_name = dt.Rows[0]["em_name"].ToString();
                 string em_name = dt.Rows[0]["em_name"].ToString();
-                if (dt.Rows[0]["em_type"].ToString() == "admin" && iSourceCode == "")
+                if (iSourceCode == "")
                 {
                 {
-                    return true;
+                    oErrorMessage = "岗位资源不允许为空";
+                    return false;
                 }
                 }
                 dt = dh.getFieldsDatasByCondition("cs$empgroup left join cs$userresource on ur_groupcode=eg_groupcode left join source on ur_resourcecode=sc_code", new string[] { "ur_resourcecode" }, "eg_emcode = '" + iUserCode + "' and sc_statuscode='AUDITED'");
                 dt = dh.getFieldsDatasByCondition("cs$empgroup left join cs$userresource on ur_groupcode=eg_groupcode left join source on ur_resourcecode=sc_code", new string[] { "ur_resourcecode" }, "eg_emcode = '" + iUserCode + "' and sc_statuscode='AUDITED'");
                 //如果存在该编号
                 //如果存在该编号