|
|
@@ -344,7 +344,7 @@ namespace UAS_MES.Make
|
|
|
//遍历判断已采集的信息是否已存在
|
|
|
foreach (DictionaryEntry de in hs)
|
|
|
{
|
|
|
- if (dh.CheckExist("makeserial", "MS_" + de.Key=="WIFI"?"MAC":de.Key + "='" + de.Value + "'"))
|
|
|
+ if (dh.CheckExist("makeserial", "MS_" + (de.Key=="WIFI"?"MAC":de.Key) + "='" + de.Value + "'"))
|
|
|
{
|
|
|
flag = false;
|
|
|
OperateResult.AppendText(">>" + de.Key + "已被使用,请重新输入TSN,重新转换\n", Color.Red);
|
|
|
@@ -364,7 +364,7 @@ namespace UAS_MES.Make
|
|
|
string updateSql = "update makeserial set ms_sncode='" + SN + "', ms_beforesn='" + TSN + "'," + s1.Remove(s1.Length - 1, 1).ToString() + " where ms_sncode='" + TSN + "'";
|
|
|
string insertSql = "insert into makesnrelation (BEFORESN,SN,FIRSTSN,MAKECODE,msr_indate, msr_inman)values('" + TSN + "','" + SN + "','" + firstsn + "','" + ms_macode.Text + "', sysdate ,'" + User.UserCode + "')";
|
|
|
dh.ExecuteSQLTran(updateSql, insertSql);
|
|
|
- OperateResult.AppendText(">>序列号转换成功\n关联采集成功", Color.Green);
|
|
|
+ OperateResult.AppendText(">>序列号转换成功\n>>关联采集成功\n", Color.Green);
|
|
|
//写入日志
|
|
|
LogManager.DoLog("修改序列号：" + TSN + "为" + SN + "成功！" + "操作人：" + User.UserCode);
|
|
|
//完成该道工序 setFinish
|
shim