|
|
@@ -601,7 +601,7 @@ namespace UAS_MES.Make
|
|
|
//记录日志
|
|
|
LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_macode.Text, User.UserLineCode, User.UserSourceCode, "序列烧录转换", "转换成功", TSN, "");
|
|
|
//写入sninfo表
|
|
|
- insert2Sninfo(SN);
|
|
|
+ insert2Sninfo(SN,TSN);
|
|
|
if (ChangeResult.Checked)
|
|
|
{
|
|
|
//删除最近一条转换记录
|
|
|
@@ -873,10 +873,10 @@ namespace UAS_MES.Make
|
|
|
OperateResult.AppendText("<<请输入TSN号\n", Color.Black);
|
|
|
}
|
|
|
}
|
|
|
- private void insert2Sninfo(string sn)
|
|
|
+ private void insert2Sninfo(string sn,string tsn)
|
|
|
{
|
|
|
//查询是否有记录
|
|
|
- string siid = dh.getFieldDataByCondition("sninfo", "max(si_id) si_id", "si_sn='" + sn + "' or si_sn in(select sn from makesnrelation where sn='" + sn + "' or beforesn = '" + sn + "' )").ToString();
|
|
|
+ string siid = dh.getFieldDataByCondition("sninfo", "max(si_id) si_id", "si_sn in (select '"+tsn+"' from dual union select sn from makesnrelation where beforesn = '" + tsn + "' )").ToString();
|
|
|
//是否为空
|
|
|
if (siid == "")
|
|
|
{
|
shim