|
|
@@ -584,8 +584,6 @@ namespace UAS_MES.Make
|
|
|
firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_beforesn='" + TSN + "' and ms_id='" + oMsid + "'").ToString();
|
|
|
//记录本次修改，存入makesnrelation表中
|
|
|
updateSql = "update makeserial set ms_sncode='" + SN + "'," + s1.Remove(s1.Length - 1, 1).ToString() + " where ms_beforesn='" + TSN + "' and ms_id='" + oMsid + "'";
|
|
|
- //删除最近一条转换记录
|
|
|
- dh.ExecuteSql("delete from makesnrelation where BEFORESN='" + TSN + "' and makecode='" + ms_macode.Text + "'", "delete");
|
|
|
}
|
|
|
//未勾选修改转换结果
|
|
|
else
|
|
|
@@ -604,6 +602,11 @@ namespace UAS_MES.Make
|
|
|
LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_macode.Text, User.UserLineCode, User.UserSourceCode, "序列烧录转换", "转换成功", TSN, "");
|
|
|
//写入sninfo表
|
|
|
insert2Sninfo(SN);
|
|
|
+ if (ChangeResult.Checked)
|
|
|
+ {
|
|
|
+ //删除最近一条转换记录
|
|
|
+ dh.ExecuteSql("delete from makesnrelation where sn <> '"+SN+"' and BEFORESN='" + TSN + "' and makecode='" + ms_macode.Text + "'", "delete");
|
|
|
+ }
|
|
|
//输出提示用户“>>序列号转换成功”，“>>关联采集成功”
|
|
|
//完成该道工序 setFinish
|
|
|
if (LogicHandler.SetStepResult(ms_macode.Text, User.UserSourceCode, SN, "序列烧录转换", "序列烧录转换成功", User.UserCode, out errorMessage))
|
|
|
@@ -887,7 +890,7 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
//更新sninfo
|
|
|
sql.Clear();
|
|
|
- sql.Append("update sninfo set ");
|
|
|
+ sql.Append("update sninfo set "+(ChangeResult.Checked?("si_sn='"+sn+"',"):""));
|
|
|
sql.Append(toSi.ToString().Substring(0, toSi.ToString().Length - 1));
|
|
|
sql.Append(" where si_id='" + siid + "'");
|
|
|
dh.ExecuteSql(sql.GetString(), "update");
|
shim