|
|
@@ -302,13 +302,13 @@ namespace UAS_MES_NEW.Make
|
|
|
else
|
|
|
{
|
|
|
//满箱之后采集下一个之前自动清除内容，生成新的箱号
|
|
|
- if ((AutoGenBoxCode.Checked && pa_currentqty.Text != "" && pr_outboxinnerqty.Text == pa_currentqty.Text) || pa_status.Text == "1")
|
|
|
+ if ((AutoGenBoxCode.Checked && pa_currentqty.Text != "" && pr_outboxinnerqty.Text == pa_currentqty.Text) || (AutoGenBoxCode.Checked && pa_status.Text == "1"))
|
|
|
{
|
|
|
pa_currentqty.Text = "";
|
|
|
pa_outboxcode.Text = "";
|
|
|
pa_status.Text = "0";
|
|
|
BaseUtil.CleanDGVData(PackageDetail);
|
|
|
- pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", "", pr_code.Text, User.UserCode);
|
|
|
+ pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", ms_makecode, pr_code.Text, User.UserCode);
|
|
|
}
|
|
|
if (LogicHandler.Packing(sn_code.Text, pa_outboxcode.Text, AutoGenBoxCode.Checked, "特殊", User.UserSourceCode, User.UserCode, pr_outboxinnerqty.Text, Cancel.Checked, out oOutBoxCode, out ErrorMessage))
|
|
|
{
|
