|
|
@@ -889,8 +889,7 @@ namespace UAS_MES_NEW.Make
|
|
|
logArr.Add(itemLog);
|
|
|
|
|
|
}
|
|
|
- LogMessage($"文件: {PathName},共{fileNum}条记录,已解析");
|
|
|
- if (InsertDb(logArr, PathName))
|
|
|
+ if (InsertDb(logArr, PathName, fileNum))
|
|
|
{
|
|
|
if (ConsoleLog(restOfStream, PathName))
|
|
|
{
|
|
|
@@ -905,7 +904,7 @@ namespace UAS_MES_NEW.Make
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private bool InsertDb(List<Log> logs, string PathName)
|
|
|
+ private bool InsertDb(List<Log> logs, string PathName,int fileNum)
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
@@ -924,39 +923,55 @@ namespace UAS_MES_NEW.Make
|
|
|
BaseUtil.SetFormValue(Controls, dt);
|
|
|
//记录操作日志
|
|
|
LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "日志解析", "日志解析成功", item.SN, "");
|
|
|
- LogMessage($"处理过站成功");
|
|
|
+
|
|
|
+ param.Add(item.SN);
|
|
|
+ param.Add(item.Work_order);
|
|
|
+ param.Add(item.Result == "PASS" ? "OK" : "NG");
|
|
|
+ param.Add(equiType);
|
|
|
+ param.Add(item.Details);
|
|
|
+ param.Add(User.UserCode);
|
|
|
+ param.Add(User.UserSourceCode);
|
|
|
+ param.Add(item.Line);
|
|
|
+ string res = "";
|
|
|
+ param.Add(res);
|
|
|
+ string[] paramList = param.ToArray();
|
|
|
+ dh.CallProcedure("cs_insert_testrejects", ref paramList);
|
|
|
+ param.Clear();
|
|
|
+ LogMessage($"文件: {PathName},共{fileNum}条记录,已过站解析");
|
|
|
+ continue;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
LogMessage($"处理过站error:{oErrorMessage}");
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- LogMessage($"处理过站核对error:{oErrorMessage}");
|
|
|
+ param.Add(item.SN);
|
|
|
+ param.Add(item.Work_order);
|
|
|
+ param.Add(item.Result == "PASS" ? "OK" : "NG");
|
|
|
+ param.Add(equiType);
|
|
|
+ param.Add(item.Details);
|
|
|
+ param.Add(User.UserCode);
|
|
|
+ param.Add(User.UserSourceCode);
|
|
|
+ param.Add(item.Line);
|
|
|
+ string res = "";
|
|
|
+ param.Add(res);
|
|
|
+ string[] paramList = param.ToArray();
|
|
|
+ dh.CallProcedure("cs_insert_testrejects", ref paramList);
|
|
|
+ param.Clear();
|
|
|
+ LogMessage($"文件: {PathName},共{fileNum}条记录,已解析");
|
|
|
+ continue;
|
|
|
}
|
|
|
- param.Add(item.SN);
|
|
|
- param.Add(item.Work_order);
|
|
|
- param.Add(item.Result == "PASS" ? "OK" : "NG");
|
|
|
- param.Add(equiType);
|
|
|
- param.Add(item.Details);
|
|
|
- param.Add(User.UserCode);
|
|
|
- param.Add(User.UserSourceCode);
|
|
|
- param.Add(item.Line);
|
|
|
- string res = "";
|
|
|
- param.Add(res);
|
|
|
- string[] paramList = param.ToArray();
|
|
|
- dh.CallProcedure("cs_insert_testrejects", ref paramList);
|
|
|
- param.Clear();
|
|
|
- return true;
|
|
|
}
|
|
|
+ return false;
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
{
|
|
|
LogMessage($"处理解析写入error:{ex.Message}");
|
|
|
return false;
|
|
|
}
|
|
|
- return false;
|
|
|
}
|
|
|
|
|
|
private bool ConsoleLog(string Content, string PathName)
|