|
|
@@ -135,38 +135,39 @@ namespace UAS_MES_NEW.Make
|
|
|
}
|
|
|
if (Result)
|
|
|
{
|
|
|
- if (LogicHandler.snChangeAndBurn(sncode.Text, PSN.Text, User.UserSourceCode, User.UserCode, omakeCode, 0, IMEI1.Text, IMEI2.Text, "", "", "", "", "", "", "", MAC.Text, BT.Text, "", "", "", 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,时间，结果记录在页面1
|
|
|
+ //记录日志
|
|
|
+ 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 + "信息核对成功,转换SN" + PSN.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)
|
|
|
{
|
|
|
- //提示正确返回时传递的信息
|
|
|
- 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 + "信息核对成功,转换SN" + PSN.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);
|
|
|
+ BaseUtil.GetDataFromDevice("RESET");
|
|
|
}
|
|
|
+ //if (LogicHandler.snChangeAndBurn(sncode.Text, PSN.Text, User.UserSourceCode, User.UserCode, omakeCode, 0, IMEI1.Text, IMEI2.Text, "", "", "", "", "", "", "", MAC.Text, BT.Text, "", "", "", out oErrorMessage))
|
|
|
+ //{
|
|
|
+
|
|
|
+ //}
|
|
|
+ //else
|
|
|
+ //{
|
|
|
+ // OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
|
|
|
+ //}
|
|
|
//if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, sncode.Text, "", "OK", User.UserCode, out oErrorMessage))
|
|
|
//{
|
|
|
// //提示正确返回时传递的信息
|
