|
|
@@ -209,13 +209,13 @@ namespace UAS_MES_NEW.Make
|
|
|
WaitList.Clear();
|
|
|
ChoosedList.Clear();
|
|
|
|
|
|
- if (User.CurrentStepName == "程序烧写" && string.IsNullOrEmpty(new_softversion.Text))
|
|
|
- {
|
|
|
- OperateResult.AppendText(">>请输入软件版本号\n", Color.Red);
|
|
|
- new_softversion.Focus();
|
|
|
- new_softversion.SelectAll();
|
|
|
- return;
|
|
|
- }
|
|
|
+ //if (User.CurrentStepName == "程序烧写" && string.IsNullOrEmpty(new_softversion.Text))
|
|
|
+ //{
|
|
|
+ // OperateResult.AppendText(">>请输入软件版本号\n", Color.Red);
|
|
|
+ // new_softversion.Focus();
|
|
|
+ // new_softversion.SelectAll();
|
|
|
+ // return;
|
|
|
+ //}
|
|
|
|
|
|
if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
|
|
|
{
|
|
|
@@ -242,7 +242,7 @@ namespace UAS_MES_NEW.Make
|
|
|
LockMakeCode.Checked = true;
|
|
|
}
|
|
|
}
|
|
|
- if (dh.getRowCount("PRODUCTDEVICE left join product on pr_id=PDE_PRID", " pr_code='" + ma_prodcode.Text + "'") > 0)
|
|
|
+ if (dh.getRowCount("PRODUCTDEVICE left join product on pr_id=PDE_PRID", " pr_code='" + ma_prodcode.Text + "' and pde_stepcode='"+User.CurrentStepCode+"'") > 0)
|
|
|
{
|
|
|
if (device.Text == "")
|
|
|
{
|
callm