|
@@ -452,7 +452,7 @@ namespace UAS_MES_NEW.Packing
|
|
|
if (Delete == "Yes")
|
|
if (Delete == "Yes")
|
|
|
{
|
|
{
|
|
|
sql.Clear();
|
|
sql.Clear();
|
|
|
- sql.Append("select nvl(pa_iostatus,0) pa_iostatus,pa_outno from package where pa_outboxcode='" + pa_outboxcode.Text + "' and pa_type=3");
|
|
|
|
|
|
|
+ sql.Append("select pa_tag,nvl(pa_iostatus,0) pa_iostatus,pa_outno from package where pa_outboxcode='" + pa_outboxcode.Text + "' and pa_type=3");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
{
|
|
@@ -466,6 +466,11 @@ namespace UAS_MES_NEW.Packing
|
|
|
OperateResult.AppendText(">>栈板" + pa_outboxcode.Text + "处于入库状态，不允许操作\n", Color.Red);
|
|
OperateResult.AppendText(">>栈板" + pa_outboxcode.Text + "处于入库状态，不允许操作\n", Color.Red);
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
+ if (dt.Rows[0]["pa_tag"].ToString() == "MidBox")
|
|
|
|
|
+ {
|
|
|
|
|
+ OperateResult.AppendText(">>栈板" + pa_outboxcode.Text + "类型为中箱，请在中箱装栈板界面解除\n", Color.Red);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
callm