|
|
@@ -140,7 +140,7 @@ namespace UAS_MES.Make
|
|
|
}
|
|
|
//根据箱号查询表单数据
|
|
|
sql.Clear();
|
|
|
- sql.Append("select pa_totalqty,ma_code,ma_qty,ma_salecode,PA_STANDARDQTY,PA_CURRENTQTY,pr_detail,pr_cartonunit,pr_code,pr_cartongw,");
|
|
|
+ sql.Append("select pa_totalqty,ma_code,ma_qty,ma_salecode,PA_STANDARDQTY PA_STANDARDQTYCARTON,PA_CURRENTQTY,pr_detail,pr_cartonunit,pr_code,pr_cartongw,");
|
|
|
sql.Append("pr_cartonmaxw,pr_cartonminw,nvl(PR_CHECKCARTONW,'0') PR_CHECKCARTONW,nvl(pr_sendchecktype,'LineCode')pr_sendchecktype from package left join packagedetail ");
|
|
|
sql.Append("on pa_id=pd_paid left join makeserial on ms_sncode=pd_barcode and ms_makecode=pa_makecode left join product on pr_code=pd_prodcode left join make on ma_code=pd_makecode ");
|
|
|
sql.Append(" where pa_outboxcode='" + outboxcode.Text + "' and pa_nextstep='" + User.CurrentStepCode + "'");
|
|
|
@@ -156,7 +156,7 @@ namespace UAS_MES.Make
|
|
|
string _maxweight = dt.Rows[0]["pr_cartonmaxw"].ToString();
|
|
|
string _minweight = dt.Rows[0]["pr_cartonminw"].ToString();
|
|
|
string pa_pr_cartonunit = dt.Rows[0]["pr_cartonunit"].ToString();
|
|
|
- string PA_STANDARDQTY = dt.Rows[0]["PA_STANDARDQTY"].ToString();
|
|
|
+ string PA_STANDARDQTY = dt.Rows[0]["PA_STANDARDQTYCARTON"].ToString();
|
|
|
string PA_CURRENTQTY = dt.Rows[0]["PA_CURRENTQTY"].ToString();
|
|
|
Weight = double.Parse(_weight == "" ? "0" : _weight);
|
|
|
MaxWeight = double.Parse(_maxweight == "" ? "0" : _maxweight);
|
