|
|
@@ -94,28 +94,20 @@ namespace UAS_MES.Make
|
|
|
}
|
|
|
break;
|
|
|
case CheckState.Unchecked:
|
|
|
- //存在该序列号才去看是否曾经转换
|
|
|
- if (dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "'"))
|
|
|
+ string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + sncode.Text + "'").ToString().Trim();
|
|
|
+ //为空，就说明，没有进行过序列号的转换
|
|
|
+ if (beforesn == "" || beforesn == null)
|
|
|
{
|
|
|
- string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + sncode.Text + "'").ToString().Trim();
|
|
|
- //为空，就说明，没有进行过序列号的转换
|
|
|
- if (beforesn == "" || beforesn == null)
|
|
|
- {
|
|
|
- //记录转换前的序列号
|
|
|
- bsncode = sncode.Text;
|
|
|
- sncode.Text = "";
|
|
|
- OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green);
|
|
|
- }
|
|
|
- else
|
|
|
- //不为空，进行过转换。不勾选修改结果，就不能再修改
|
|
|
- {
|
|
|
- OperateResult.AppendText(">>序列号" + sncode.Text + "已进行了转换\n", Color.Red);
|
|
|
- sncode.Text = "";
|
|
|
- OperateResult.AppendText("<<请重新输入序列号\n", Color.Green);
|
|
|
- }
|
|
|
+ //记录转换前的序列号
|
|
|
+ bsncode = sncode.Text;
|
|
|
+ sncode.Text = "";
|
|
|
+ OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green);
|
|
|
}
|
|
|
- else {
|
|
|
- OperateResult.AppendText(">>序列号" + sncode.Text + "不存在\n", Color.Red);
|
|
|
+ else
|
|
|
+ //不为空，进行过转换。不勾选修改结果，就不能再修改
|
|
|
+ {
|
|
|
+ OperateResult.AppendText(">>序列号" + sncode.Text + "已进行了转换\n", Color.Red);
|
|
|
+ sncode.Text = "";
|
|
|
OperateResult.AppendText("<<请重新输入序列号\n", Color.Green);
|
|
|
}
|
|
|
break;
|
|
|
@@ -124,7 +116,7 @@ namespace UAS_MES.Make
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
- OperateResult.AppendText(">>zzzz" + errorMessage + "\n", Color.Red);
|
|
|
+ OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red);
|
|
|
}
|
|
|
//bsncode不为空,说明输入的是转换后的序列号
|
|
|
else
|
|
|
@@ -193,7 +185,7 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
macode = dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_sncode='" + sncode.Text + "' or ms_beforesn='" + sncode.Text + "'").ToString();
|
|
|
if (macode=="") {
|
|
|
- OperateResult.AppendText(">>无该序列号对应工单！", Color.Red);
|
|
|
+ OperateResult.AppendText(">>无该序列号对应工单！\n", Color.Red);
|
|
|
}
|
|
|
}
|
|
|
}
|
shim