|
|
@@ -801,7 +801,7 @@ namespace UAS_MES_NEW.Packing
|
|
|
string Delete = MessageBox.Show(this.ParentForm, "是否确认拆箱？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
|
|
|
if (Delete == "Yes")
|
|
|
{
|
|
|
- DataTable dt = (DataTable)dh.ExecuteSql("select nvl(pa_iostatus,0)pa_iostatus,pa_type,pa_outno,pa_checkno,ob_status,pa_mothercode,nvl(pa_downstatus,0)pa_downstatus from package left join oqcbatch on pa_checkno=ob_checkno where pa_outboxcode='" + pa_outboxcode.Text + "'", "select");
|
|
|
+ DataTable dt = (DataTable)dh.ExecuteSql("select pa_tag,nvl(pa_iostatus,0)pa_iostatus,pa_type,pa_outno,pa_checkno,ob_status,pa_mothercode,nvl(pa_downstatus,0)pa_downstatus from package left join oqcbatch on pa_checkno=ob_checkno where pa_outboxcode='" + pa_outboxcode.Text + "'", "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
if (dt.Rows[0]["pa_outno"].ToString() != "")
|
|
|
@@ -809,6 +809,11 @@ namespace UAS_MES_NEW.Packing
|
|
|
OperateResult.AppendText(">>栈板" + pa_outboxcode.Text + "已被出货单" + dt.Rows[0]["pa_outno"].ToString() + "采集，不允许操作\n", Color.Red);
|
|
|
return;
|
|
|
}
|
|
|
+ if (dt.Rows[0]["pa_tag"].ToString() != "MidBox")
|
|
|
+ {
|
|
|
+ OperateResult.AppendText(">>栈板" + pa_outboxcode.Text + "类型非中箱，请在装栈板界面解除\n", Color.Red);
|
|
|
+ return;
|
|
|
+ }
|
|
|
if (dt.Rows[0]["pa_iostatus"].ToString() != "0")
|
|
|
{
|
|
|
OperateResult.AppendText(">>栈板" + pa_outboxcode.Text + "处于入库状态，不允许操作\n", Color.Red);
|
callm