|
|
@@ -71,7 +71,7 @@ namespace UAS_MES_NEW.Make
|
|
|
{
|
|
|
string ms_prodcode = dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_id='" + oMsid + "'").ToString();
|
|
|
DataTable dt = new DataTable();
|
|
|
- BaseUtil.GetDataFromDevice("GETFILE", WatchPath.Text + " ./" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text);
|
|
|
+ //BaseUtil.GetDataFromDevice("GETFILE", WatchPath.Text + " ./" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text);
|
|
|
string[] files = Directory.GetFiles(Application.StartupPath + "/" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text, "*.csv");
|
|
|
BaseUtil.OpenCSVFile(ref dt, files[0]);
|
|
|
//移除标题行
|
|
|
@@ -80,21 +80,35 @@ namespace UAS_MES_NEW.Make
|
|
|
dt.Columns[0].ColumnName = "std_class";
|
|
|
//dt.Columns[1].ColumnName = "std_testtimes";
|
|
|
dt.Columns[1].ColumnName = "std_testresult";
|
|
|
+ dt.Columns[2].ColumnName = "std_sn";
|
|
|
+ dt.Columns[3].ColumnName = "std_mac";
|
|
|
+ dt.Columns[4].ColumnName = "std_bt";
|
|
|
+ dt.Columns[5].ColumnName = "std_imei1";
|
|
|
+ dt.Columns[6].ColumnName = "std_imei2";
|
|
|
//dt.Columns[3].ColumnName = "std_badcode";
|
|
|
CheckItemDGV.DataSource = dt;
|
|
|
bool Result = true;
|
|
|
+ string MAC = "";
|
|
|
+ string BT = "";
|
|
|
+ string IMEI1 = "";
|
|
|
+ string IMEI2 = "";
|
|
|
+ string PSN = "";
|
|
|
for (int i = 0; i < dt.Rows.Count; i++)
|
|
|
{
|
|
|
+ PSN = dt.Rows[0]["std_sn"].ToString();
|
|
|
+ MAC = dt.Rows[0]["std_mac"].ToString().Replace(":", "").ToUpper();
|
|
|
+ BT = dt.Rows[0]["std_bt"].ToString().Replace(":", "").ToUpper();
|
|
|
+ IMEI1 = dt.Rows[0]["std_imei1"].ToString().Replace("null", "");
|
|
|
+ IMEI2 = dt.Rows[0]["std_imei2"].ToString().Replace("null", "");
|
|
|
if (dt.Rows[i]["std_testresult"].ToString() != "OK" || dt.Rows[i]["std_testresult"].ToString() == "NOTEST")
|
|
|
{
|
|
|
Result = false;
|
|
|
}
|
|
|
- //dh.ExecuteSql("insert into STEPTESTDETAIL(std_id,std_sn,std_indate,std_class,std_testtimes,std_testresult,std_badcode) values(STEPTESTDETAIL_seq.nextval,'" + sncode.Text + "',sysdate,'" + dt.Rows[i]["std_class"].ToString() + "','" + dt.Rows[i]["std_testtimes"].ToString() + "','" + dt.Rows[i]["std_testresult"].ToString() + "','" + dt.Rows[i]["std_badcode"].ToString() + "')", "insert");
|
|
|
dh.ExecuteSql("insert into STEPTESTDETAIL(std_id,std_sn,std_indate,std_class,std_testtimes,std_testresult,std_badcode) values(STEPTESTDETAIL_seq.nextval,'" + sncode.Text + "',sysdate,'" + dt.Rows[i]["std_class"].ToString() + "','','" + dt.Rows[i]["std_testresult"].ToString() + "','')", "insert");
|
|
|
}
|
|
|
if (Result)
|
|
|
{
|
|
|
- if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, sncode.Text, "", "OK", User.UserCode, out oErrorMessage))
|
|
|
+ if (LogicHandler.snChangeAndBurn(sncode.Text, PSN, User.UserSourceCode, User.UserCode, omakeCode, 0, IMEI1, IMEI2, "", "", "", "", "", "", "", MAC, BT, "", "", "", out oErrorMessage))
|
|
|
{
|
|
|
//提示正确返回时传递的信息
|
|
|
if (oErrorMessage.Contains("AFTERSUCCESS"))
|
|
|
@@ -126,6 +140,38 @@ namespace UAS_MES_NEW.Make
|
|
|
{
|
|
|
OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
|
|
|
}
|
|
|
+ //if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, sncode.Text, "", "OK", User.UserCode, out oErrorMessage))
|
|
|
+ //{
|
|
|
+ // //提示正确返回时传递的信息
|
|
|
+ // if (oErrorMessage.Contains("AFTERSUCCESS"))
|
|
|
+ // OperateResult.AppendText(">>" + oErrorMessage + "\n");
|
|
|
+ // //根据工单号查询makecraftdetail 表中的 mcd_okqty 计数，剩余数为ma_qty - nvl（mcd_inqty,0），刷新页面中工单信息的显示
|
|
|
+ // sql.Clear();
|
|
|
+ // sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail,");
|
|
|
+ // sql.Append("ma_qty - nvl(mcd_okqty, 0) remain_qty from make left join makecraftdetail on ");
|
|
|
+ // sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + omakeCode + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
|
|
|
+ // dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
+ // BaseUtil.SetFormValue(Controls, dt);
|
|
|
+ // //将SN,时间，结果记录在页面
|
|
|
+ // //记录日志
|
|
|
+ // //ftp.UpLoadFile(Application.StartupPath, sncode.Text + ".csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
|
|
|
+ // LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "参数核对成功", sncode.Text, "");
|
|
|
+ // //SN核对成功
|
|
|
+ // //>> 请输入SN
|
|
|
+ // OperateResult.AppendText("<<" + sncode.Text + "信息核对成功\n", Color.Green, sncode);
|
|
|
+ // OperateResult.AppendText(">>请输入SN\n", Color.Black);
|
|
|
+ // SetCheck set = new SetCheck("OK", Color.Green);
|
|
|
+ // BaseUtil.SetFormCenter(set);
|
|
|
+ // set.ShowDialog();
|
|
|
+ // if (ReSet.Checked)
|
|
|
+ // {
|
|
|
+ // BaseUtil.GetDataFromDevice("RESET");
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+ //else
|
|
|
+ //{
|
|
|
+ // OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
|
|
|
+ //}
|
|
|
}
|
|
|
else
|
|
|
{
|
