|
|
@@ -43,6 +43,7 @@ namespace UAS_MES.Make
|
|
|
asc.controllInitializeSize(this);
|
|
|
dh = new DataHelper();
|
|
|
OperateResult.AppendText(">>请先勾选需要更新的项，通过采集栏输入SN,更新项具体数据\n", Color.Black);
|
|
|
+ inputValue.Focus();
|
|
|
}
|
|
|
|
|
|
private void Make_UpdateCollectCode_FormClosing(object sender, FormClosingEventArgs e)
|
|
|
@@ -65,6 +66,7 @@ namespace UAS_MES.Make
|
|
|
OperateResult.AppendText("<<输入不能为空\n", Color.Red);
|
|
|
return;
|
|
|
}
|
|
|
+ OperateResult.AppendText(">>"+inputValue.Text+"\n", Color.Black);
|
|
|
if (step == 0)
|
|
|
{
|
|
|
//判断是否有已勾选的项次
|
|
|
@@ -78,7 +80,7 @@ namespace UAS_MES.Make
|
|
|
if (list.Count==0)
|
|
|
{
|
|
|
//无勾选的内容
|
|
|
- OperateResult.AppendText("<<请先勾选需要更新的信息\n", Color.Red);
|
|
|
+ OperateResult.AppendText("<<请先勾选需要更新的信息\n", Color.Red,inputValue);
|
|
|
return;
|
|
|
}
|
|
|
//判断TSN或者SN是否存在
|
|
|
@@ -101,7 +103,7 @@ namespace UAS_MES.Make
|
|
|
sql.Append("select * from (select rownum rn, ms_prodcode,ms_makecode,ms_salecode,");
|
|
|
sql.Append("ms_mac,ms_imei1,ms_bt,ms_netcode,ms_imei2,ms_imei3 from makeserial ");
|
|
|
sql.Append("where ms_firstsn=(select ms_firstsn from makeserial where ms_id='"+ms_id+"')");
|
|
|
- sql.Append(" and (nvl(ms_mac,' ')<>' ' or nvl(ms_bt,' ')<>' ' or nvl(ms_imei1,' ')<>' ' ) order by ms_id asc)where rn=1;");
|
|
|
+ sql.Append(" and (nvl(ms_mac,' ')<>' ' or nvl(ms_bt,' ')<>' ' or nvl(ms_imei1,' ')<>' ' ) order by ms_id asc)where rn=1");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(),"select");
|
|
|
//无值则提示没有需要更新的信息
|
|
|
if (dt.Rows.Count == 0)
|
|
|
@@ -111,7 +113,7 @@ namespace UAS_MES.Make
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- info = (DataTable)dh.ExecuteSql("select psr_type,psr_prefix,psr_length from productsnrule where psr_prodcode='"+dt.Rows[0]["ms_prodcode"].ToString() +"'", "select");
|
|
|
+ info = (DataTable)dh.ExecuteSql("select psr_type,psr_prefix,psr_length from productsnrelation where psr_prodcode='"+dt.Rows[0]["ms_prodcode"].ToString() +"'", "select");
|
|
|
//查询规则显示
|
|
|
collectCodeRules.DataSource = info;
|
|
|
}
|
|
|
@@ -131,6 +133,8 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
//如果一样提示用户“MAC 不允许与原来的值一致”，“请采集MAC”；
|
|
|
OperateResult.AppendText("<<" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + "不允许与原来的值一致\n", Color.Red);
|
|
|
+ OperateResult.AppendText(">>请采集" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + "\n", Color.Black,inputValue);
|
|
|
+ return;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -150,7 +154,7 @@ namespace UAS_MES.Make
|
|
|
return;
|
|
|
}
|
|
|
//验证长度前缀通过,验证数据库
|
|
|
- if (dh.CheckExist("makeserial", "ms_status in (1,2,3) and nvl(ms_nextmacode,' ')<>' ' and ms_'"+ ((CheckBox)list[step - 1]).Text.Split('/')[0] + "'='"+inputValue.Text+"'"))
|
|
|
+ if (dh.CheckExist("makeserial", "ms_status in (1,2,3) and nvl(ms_nextmacode,' ')<>' ' and ms_"+ ((CheckBox)list[step - 1]).Text.Split('/')[0] + " ='"+inputValue.Text+"'"))
|
|
|
{
|
|
|
OperateResult.AppendText("<<" + ((CheckBox)list[step - 1]).Text + ":" + inputValue.Text + "错误，已被使用\n", Color.Red, inputValue);
|
|
|
return;
|
|
|
@@ -168,13 +172,13 @@ namespace UAS_MES.Make
|
|
|
return;
|
|
|
}
|
|
|
//验证长度前缀通过,验证数据库
|
|
|
- if (dh.CheckExist("makeserial", "ms_status in (1,2,3) and nvl(ms_nextmacode,' ')<>' ' and ms_'" + ((CheckBox)list[step - 1]).Text == "网标" ? "NETCODE" : ((CheckBox)list[step - 1]).Text + "'='" + inputValue.Text + "'"))
|
|
|
+ if (dh.CheckExist("makeserial", "ms_status in (1,2,3) and nvl(ms_nextmacode,' ')<>' ' and ms_" + (((CheckBox)list[step - 1]).Text == "网标" ? "NETCODE" : ((CheckBox)list[step - 1]).Text) + " ='" + inputValue.Text + "'"))
|
|
|
{
|
|
|
OperateResult.AppendText("<<" + ((CheckBox)list[step - 1]).Text + ":" + inputValue.Text + "错误，已被使用\n", Color.Red, inputValue);
|
|
|
return;
|
|
|
}
|
|
|
//通过校验
|
|
|
- sb.Append("ms_" + ((CheckBox)list[step - 1]).Text == "网标" ? "NETCODE" : ((CheckBox)list[step - 1]).Text+" = '"+inputValue.Text+"',");
|
|
|
+ sb.Append("ms_" + (((CheckBox)list[step - 1]).Text == "网标" ? "NETCODE" : ((CheckBox)list[step - 1]).Text)+" = '"+inputValue.Text+"',");
|
|
|
break;
|
|
|
}
|
|
|
//判断是否是最后一个
|
|
|
@@ -192,10 +196,10 @@ namespace UAS_MES.Make
|
|
|
LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, dt.Rows[0]["ms_makecode"].ToString(), User.UserLineCode, User.UserSourceCode, "更新烧录", "转换成功", sncode,"");
|
|
|
step = 0;
|
|
|
//清除规则
|
|
|
- dt = null;
|
|
|
+ BaseUtil.CleanDataTableData(info);
|
|
|
//聚焦，提示
|
|
|
inputValue.Focus();
|
|
|
- OperateResult.AppendText("<<请采集SN\n", Color.Black);
|
|
|
+ OperateResult.AppendText("<<请采集SN\n", Color.Black,inputValue);
|
|
|
//清除LIST
|
|
|
list.Clear();
|
|
|
}
|
|
|
@@ -203,7 +207,7 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
step++;
|
|
|
//请输入下一个
|
|
|
- OperateResult.AppendText(">>请采集" + ((CheckBox)list[step-1]).Text.Split('/')[0] + "\n", Color.Black);
|
|
|
+ OperateResult.AppendText(">>请输入" + ((CheckBox)list[step-1]).Text.Split('/')[0] + "\n", Color.Green,inputValue);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -220,7 +224,6 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
OperateResult.AppendText(">>" + info.Rows[i]["psr_type"] + "长度校验不通过,请重新输入\n", Color.Red);
|
|
|
OperateResult.AppendText(">>请重新输入" + info.Rows[i]["psr_type"] + "\n", Color.Black, inputValue);
|
|
|
- break;
|
|
|
return false;
|
|
|
}
|
|
|
//校验前缀
|
|
|
@@ -241,15 +244,12 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
OperateResult.AppendText(">>" + info.Rows[i]["psr_type"] + "前缀校验不通过,请重新输入\n", Color.Red);
|
|
|
OperateResult.AppendText(">>请重新输入" + info.Rows[i]["psr_type"] + "\n", Color.Black, inputValue);
|
|
|
- break;
|
|
|
return false;
|
|
|
}
|
|
|
- break;
|
|
|
return true;
|
|
|
}
|
|
|
}
|
|
|
- OperateResult.AppendText(">>无对应规则\n", Color.Red, inputValue);
|
|
|
- return false;
|
|
|
+ return true;
|
|
|
}
|
|
|
}
|
|
|
}
|
shim