|
|
@@ -8,6 +8,7 @@ using System.Windows.Forms;
|
|
|
using System.Xml;
|
|
|
using UAS_AutoPass.ToolClass;
|
|
|
using BenQGuru.eMES.DLLService;
|
|
|
+using System.Text;
|
|
|
|
|
|
namespace UAS_AutoPass
|
|
|
{
|
|
|
@@ -25,6 +26,8 @@ namespace UAS_AutoPass
|
|
|
string isource;
|
|
|
|
|
|
Thread InitDB;
|
|
|
+
|
|
|
+ StringBuilder sql = new StringBuilder();
|
|
|
/// <summary>
|
|
|
/// 缓存的文件
|
|
|
/// </summary>
|
|
|
@@ -188,10 +191,10 @@ namespace UAS_AutoPass
|
|
|
string iMakeCode = dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_sncode='" + sncode + "' order by ms_id desc").ToString();
|
|
|
OperateResult.AppendText("读取文件" + e.Name + "\n");
|
|
|
//获取采集的项目名称
|
|
|
- List<string> name = new List<string>();
|
|
|
+ List<string> badcode = new List<string>();
|
|
|
//获取采集项目的结果
|
|
|
- List<string> result = new List<string>();
|
|
|
- int name_or_result = 0;
|
|
|
+ List<string> badlocation = new List<string>();
|
|
|
+ int code_or_location = 0;
|
|
|
while (myReader.Read())
|
|
|
{
|
|
|
if (myReader.NodeType == XmlNodeType.Element && myReader.Name == "test" && myReader.IsStartElement())
|
|
|
@@ -203,15 +206,15 @@ namespace UAS_AutoPass
|
|
|
}
|
|
|
if (myReader.NodeType == XmlNodeType.Text)
|
|
|
{
|
|
|
- if (name_or_result % 2 == 0)
|
|
|
+ if (code_or_location % 2 == 0)
|
|
|
{
|
|
|
- name.Add(myReader.Value);
|
|
|
- name_or_result++;
|
|
|
+ badcode.Add(myReader.Value);
|
|
|
+ code_or_location++;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- result.Add(myReader.Value);
|
|
|
- name_or_result++;
|
|
|
+ badlocation.Add(myReader.Value);
|
|
|
+ code_or_location++;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -219,7 +222,24 @@ namespace UAS_AutoPass
|
|
|
string ErrMessage = "";
|
|
|
if (helper.GoMo(MakeCode.Text, sncode, isource, out ErrMessage))
|
|
|
{
|
|
|
- if (!helper.SetStepFinish(MakeCode.Text, isource, sncode, "自动过站采集", test_result, iusercode, "自动过站不良", out ErrMessage))
|
|
|
+ string BadCode = "";
|
|
|
+ if (test_result == "NG")
|
|
|
+ {
|
|
|
+ for (int i = 0; i < badcode.Count; i++)
|
|
|
+ {
|
|
|
+ BadCode += badcode[i] + ",";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (helper.SetStepFinish(MakeCode.Text, isource, sncode, "自动过站采集", test_result, iusercode, BadCode.Substring(0, BadCode.Length - 1), out ErrMessage))
|
|
|
+ {
|
|
|
+ //sql.Clear();
|
|
|
+ //sql.Append("insert into makebadrsloc(mbl_id,mbl_mbrid,mbl_loc,mbl_badcode,mbl_brcode,");
|
|
|
+ //sql.Append("mbl_sncode,mbl_makecode,mbl_indate ,mbl_inman) select makebadrsloc_seq.nextval," + mbr_id);
|
|
|
+ //sql.Append(",:location,'" + bc_code.Text + "','" + nr_code.Text + "','" + GetSNCode.Text + "','" + macode + "',");
|
|
|
+ //sql.Append("sysdate,'" + User.UserCode + "' from dual");
|
|
|
+
|
|
|
+ }
|
|
|
+ else
|
|
|
{
|
|
|
OperateResult.AppendText(ErrMessage + "\n");
|
|
|
return;
|