|
|
@@ -132,7 +132,7 @@ namespace UAS_MES.Make
|
|
|
return;
|
|
|
}
|
|
|
sql.Clear();
|
|
|
- sql.Append("select nvl(pa_iostatus,0)pa_iostatus,pa_outno,pa_makecode pd_makecode,nvl(pa_downstatus,0)pa_downstatus,pa_salecode pd_salecode,pr_packrule,pa_id,pa_prodcode pd_prodcode,pa_status,pa_mothercode,pa_nextstep ");
|
|
|
+ sql.Append("select nvl(pa_iostatus,0)pa_iostatus,pa_outno,pa_makecode pd_makecode,nvl(pa_downstatus,0)pa_downstatus,pa_salecode pd_salecode,pr_packrule,pa_id,pa_prodcode pd_prodcode,pa_status,pa_mothercode,pa_nextstep,pa_weight ");
|
|
|
sql.Append("from packagedetail left join package on pd_paid=pa_id left join product on pd_prodcode=pr_code where pd_outboxcode='" + outboxcode.Text + "'");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
@@ -158,6 +158,14 @@ namespace UAS_MES.Make
|
|
|
OperateResult.AppendText(">>箱号" + outboxcode.Text + "已入库不允许采集\n", Color.Red, outboxcode);
|
|
|
return;
|
|
|
}
|
|
|
+ if (dt.Rows[0]["pa_weight"].ToString() == ""&& dt.Rows[0]["pd_prodcode"].ToString() != "")
|
|
|
+ {
|
|
|
+ if(dh.getFieldDataByCondition("product", "pr_checkcartonw","pr_code = '"+ dt.Rows[0]["pd_prodcode"].ToString() + "'").ToString() == "-1")
|
|
|
+ {
|
|
|
+ OperateResult.AppendText(">>箱号" + outboxcode.Text + "未称重,对应产品"+ dt.Rows[0]["pd_prodcode"].ToString() + "需要称重,不允许采集\n", Color.Red, outboxcode);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
if (dt.Rows[0]["pa_mothercode"].ToString() != "")
|
|
|
{
|
|
|
if (pa_outboxcode.Text == "")
|