|
|
@@ -174,24 +174,25 @@ namespace UAS_MES.Make
|
|
|
else if (step == 1)
|
|
|
{
|
|
|
OperateResult.AppendText(">>" + code.Text + "\n", Color.Black);
|
|
|
+ //判断用户是否锁定输入SN长度，
|
|
|
+ if (!checkLengthOrPre(SNLength_checkBox, SNLength, "长度", "SN"))
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ //判断用户是否锁定输入SN前缀，
|
|
|
+ if (!checkLengthOrPre(SNPre_checkBox, SNPre, "前缀", "SN"))
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ //判断转换后序列号的范围是否合法
|
|
|
+ if (!checkStartAndEnd())
|
|
|
+ {
|
|
|
+ OperateResult.AppendText(">>序列号" + code.Text + "校验错误，不在工单防呆规则指定范围内!\n", Color.Red, code);
|
|
|
+ return;
|
|
|
+ }
|
|
|
//开始录入SN
|
|
|
if ((ChangeResult.Checked && dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id='"+oMsid+"'"))||!dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "'"))
|
|
|
{
|
|
|
- //判断用户是否锁定输入SN长度，
|
|
|
- if (!checkLengthOrPre(SNLength_checkBox, SNLength, "长度", "SN"))
|
|
|
- {
|
|
|
- return;
|
|
|
- }
|
|
|
- //判断用户是否锁定输入SN前缀，
|
|
|
- if (!checkLengthOrPre(SNPre_checkBox, SNPre, "前缀", "SN"))
|
|
|
- {
|
|
|
- return;
|
|
|
- }
|
|
|
- //判断转换后序列号的范围是否合法
|
|
|
- if (!checkStartAndEnd()) {
|
|
|
- OperateResult.AppendText(">>序列号" + code.Text + "校验错误，不在工单防呆规则指定范围内!\n", Color.Red,code);
|
|
|
- return;
|
|
|
- }
|
|
|
//SN校验成功，合法,记录下SN
|
|
|
SN = code.Text;
|
|
|
code.Text = "";
|
shim