|
|
@@ -257,7 +257,7 @@ namespace UAS_MES.Warehouse
|
|
|
{
|
|
|
string pa_makecode = "";
|
|
|
sql.Clear();
|
|
|
- sql.Append("select pa_outboxcode,pa_status,nvl(pa_iostatus,0) pa_iostatus,pa_makecode,nvl(pa_downstatus,0)pa_downstatus,pa_outno from package where pa_outboxcode='" + input.Text + "' and pa_type=3");
|
|
|
+ sql.Append("select pa_outboxcode,pa_status,nvl(pa_iostatus,0) pa_iostatus,pa_makecode,pa_mothercode,nvl(pa_downstatus,0)pa_downstatus,pa_outno from package where pa_outboxcode='" + input.Text + "' and pa_type=3");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
@@ -800,7 +800,7 @@ namespace UAS_MES.Warehouse
|
|
|
}
|
|
|
if (needMakeIn != "0")
|
|
|
{
|
|
|
- if (dt.Rows[0]["pa_iostatus"].ToString() != "1")
|
|
|
+ if (dt.Rows[0]["pa_iostatus"].ToString() != "1" && dt.Rows[0]["pa_mothercode"].ToString() != "")
|
|
|
{
|
|
|
OperateResult.AppendText(type + inputmessage + "必须完工入库才允许出库\n", Color.Red, input);
|
|
|
return false;
|