|
|
@@ -159,10 +159,18 @@ namespace UAS_MES.Make
|
|
|
return;
|
|
|
}
|
|
|
pa_status.Text = dh.getFieldDataByCondition("package", "nvl(pa_status,0)pa_status", "pa_outboxcode='" + palletcode.Text + "'").ToString();
|
|
|
- if (pa_status.Text == "1" && AutoOutBoxCode.Checked)
|
|
|
+ if (pa_status.Text == "1")
|
|
|
{
|
|
|
- palletcode.Text = LogicHandler.GetOutBoxCode("PALLET", "", pa_prodcode.Text, User.UserCode);
|
|
|
- pa_status.Text = "1";
|
|
|
+ if (AutoOutBoxCode.Checked)
|
|
|
+ {
|
|
|
+ palletcode.Text = LogicHandler.GetOutBoxCode("PALLET", "", pa_prodcode.Text, User.UserCode);
|
|
|
+ pa_status.Text = "1";
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ OperateResult.AppendText(">>栈板号" + outboxcode.Text + "已封,请采集其他栈板号\n", Color.Red, outboxcode);
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
else if (palletcode.Text == "" && AutoOutBoxCode.Checked)
|
|
|
{
|