|
|
@@ -217,19 +217,19 @@ namespace UAS_MES.Make
|
|
|
BadCodeTree.Nodes.Clear();
|
|
|
return;
|
|
|
}
|
|
|
- dt = (DataTable)dh.ExecuteSql("select mb_stepcode from makebad where mb_sncode='" + GetSNCode.Text + "' and mb_status=0 order by mb_id desc", "select");
|
|
|
- //打不良的资源和当前资源相等可以快速维修,无须登录维修资源
|
|
|
- bool QuickRepair = false;
|
|
|
- if (dt.Rows.Count > 0)
|
|
|
- {
|
|
|
- if (dt.Rows[0]["mb_stepcode"].ToString() == User.CurrentStepCode)
|
|
|
- {
|
|
|
- QuickRepair = true;
|
|
|
- }
|
|
|
- }
|
|
|
+ //dt = (DataTable)dh.ExecuteSql("select mb_stepcode from makebad where mb_sncode='" + GetSNCode.Text + "' and mb_status=0 order by mb_id desc", "select");
|
|
|
+ ////打不良的资源和当前资源相等可以快速维修,无须登录维修资源
|
|
|
+ //bool QuickRepair = false;
|
|
|
+ //if (dt.Rows.Count > 0)
|
|
|
+ //{
|
|
|
+ // if (dt.Rows[0]["mb_stepcode"].ToString() == User.CurrentStepCode)
|
|
|
+ // {
|
|
|
+ // QuickRepair = true;
|
|
|
+ // }
|
|
|
+ //}
|
|
|
string ErrorMessage = "";
|
|
|
//验证工序是否正确
|
|
|
- if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage) || QuickRepair)
|
|
|
+ if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
|
|
|
{
|
|
|
BadInf_1.Clear();
|
|
|
string oStatus = "";
|