|
|
@@ -190,9 +190,20 @@ namespace UAS_MES_NEW.Make
|
|
|
bsncode = sncode.Text;
|
|
|
//显示序列号
|
|
|
show_sncode.Text = bsncode;
|
|
|
- OperateResult.AppendText(">>请输入SN号\n", Color.Green, sncode);
|
|
|
+ //OperateResult.AppendText(">>请输入SN号\n", Color.Green, sncode);
|
|
|
ChangeResult.Enabled = false;
|
|
|
onlyPass = true;
|
|
|
+ string SN = dh.getFieldDataByCondition("makesnlist", "nvl(min(msl_sncode,'0'))", "msl_makecode='" + ma_code.Text + "' and msl_type='after' and msl_status is null").ToString();
|
|
|
+ if (SN == "0")
|
|
|
+ {
|
|
|
+ OperateResult.AppendText("<<工单:" + ma_code.Text + "未导入转换后SN清单,无法自动录入\n", Color.Red, sncode);
|
|
|
+ OperateResult.AppendText(">>请输入SN号\n", Color.Green, sncode);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ sncode.Text = SN;
|
|
|
+ sncode_KeyDown(this, e);
|
|
|
+ }
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -301,6 +312,7 @@ namespace UAS_MES_NEW.Make
|
|
|
{
|
|
|
string firstsn = "";
|
|
|
string updateSql = "";
|
|
|
+ string updateSql2 = "";
|
|
|
//勾选了修改转换结果
|
|
|
if (ChangeResult.Checked)
|
|
|
{
|
|
|
@@ -310,6 +322,7 @@ namespace UAS_MES_NEW.Make
|
|
|
updateSql = "update makeserial set ms_sncode='" + sncode.Text + "' where ms_id='" + oMsId + "' and ms_beforesn='" + bsncode + "'";
|
|
|
//删除最近一条转换记录
|
|
|
dh.ExecuteSql("delete from makesnrelation where BEFORESN='" + bsncode + "' and makecode='" + ma_code.Text + "'", "delete");
|
|
|
+ updateSql2 = "update makesnlist set msl_status = -1 where msl_makecode = '" + ma_code.Text + "' and msl_sncode = '" + sncode.Text + "' and msl_type = 'after' ";
|
|
|
}
|
|
|
//未勾选修改转换结果
|
|
|
else
|
|
|
@@ -318,9 +331,10 @@ namespace UAS_MES_NEW.Make
|
|
|
firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_id='" + oMsId + "' and ms_sncode='" + bsncode + "'").ToString();
|
|
|
//记录本次修改，存入makesnrelation表中
|
|
|
updateSql = "update makeserial set ms_sncode='" + sncode.Text + "', ms_beforesn='" + bsncode + "' where ms_id='" + oMsId + "' and ms_sncode='" + bsncode + "'";
|
|
|
+ updateSql2 = "update makesnlist set msl_status = -1 where msl_makecode = '" + ma_code.Text + "' and msl_sncode = '" + sncode.Text + "' and msl_type = 'after' ";
|
|
|
}
|
|
|
string insertSql = "insert into makesnrelation (BEFORESN,SN,FIRSTSN,MAKECODE,msr_indate, msr_inman)values('" + bsncode + "','" + sncode.Text + "','" + firstsn + "','" + ma_code.Text + "', sysdate ,'" + User.UserCode + "')";
|
|
|
- dh.ExecuteSQLTran(updateSql, insertSql);
|
|
|
+ dh.ExecuteSQLTran(updateSql, insertSql, updateSql2);
|
|
|
}
|
|
|
onlyPass = false;
|
|
|
OperateResult.AppendText("<<序列号" + bsncode + "成功转换为" + sncode.Text + "\n", Color.Green);
|
callm