|
|
@@ -145,7 +145,7 @@ namespace UAS_MES.Make
|
|
|
string Err = "";
|
|
|
sql.Clear();
|
|
|
sql.Append("select pa_prodcode,pr_cartonmaxw,pa_makecode,pr_cartonunit,pr_cartonminw,pr_cartongw,pa_outboxcode,pa_sccode,nvl(pa_downstatus,0) pa_downstatus,pa_checkno,");
|
|
|
- sql.Append("pa_status,pr_packrule,pr_detail,pa_packageqty,nvl(pa_standardqty,0)pa_standardqty,pa_currentqty from package left join ");
|
|
|
+ sql.Append("pa_status,pr_packrule,pr_detail,pa_packageqty,nvl(pa_standardqty,0)pa_standardqty,pr_outboxinnerqty,pa_currentqty from package left join ");
|
|
|
sql.Append("product on pa_prodcode=pr_code where pa_outboxcode='" + pa_outboxcode.Text + "'");
|
|
|
Err = "箱号";
|
|
|
DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
@@ -159,9 +159,9 @@ namespace UAS_MES.Make
|
|
|
Weight = double.Parse(_weight == "" ? "0" : _weight);
|
|
|
MaxWeight = double.Parse(_maxweight == "" ? "0" : _maxweight);
|
|
|
MinWeight = double.Parse(_minweight == "" ? "0" : _minweight);
|
|
|
+ //记录该数据保证在修改不被允许的前提下能偶回复之前的值
|
|
|
StandardQTY = decimal.Parse(dt.Rows[0]["pr_outboxinnerqty"].ToString());
|
|
|
BaseUtil.SetFormValue(this.Controls, dt);
|
|
|
- //保证按照箱内容量展示
|
|
|
if (pa_standardqty.Text != "0")
|
|
|
pr_outboxinnerqty.Text = pa_standardqty.Text;
|
|
|
if (Weight - MinWeight == MaxWeight - Weight)
|
|
|
@@ -330,12 +330,12 @@ namespace UAS_MES.Make
|
|
|
dh.UpdateByCondition("package", "pa_status=1,pa_weight='" + weight.Text + "'", "pa_outboxcode='" + pa_outboxcode.Text + "'");
|
|
|
pa_standardqty.Text = "";
|
|
|
pa_status.Text = "1";
|
|
|
+ OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "称量合格\n", Color.Green);
|
|
|
if (AutoPrint.Checked)
|
|
|
Print_Click(new object(), new EventArgs());
|
|
|
}
|
|
|
else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "重量不符合标准重量\n", Color.Red);
|
|
|
}
|
|
|
-
|
|
|
LoadGridData();
|
|
|
sn_code.Clear();
|
|
|
}
|
章政