|
|
@@ -188,32 +188,6 @@ namespace UAS_MES.Make
|
|
|
pa_currentqty.Text = dh.getFieldDataByCondition("package", "pa_currentqty", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString();
|
|
|
}
|
|
|
|
|
|
- private void InsertDetail()
|
|
|
- {
|
|
|
- if (dh.getFieldDataByCondition("makeserial", "ms_sncode", "ms_id='" + oMsID + "'").ToString() == sn_code.Text)
|
|
|
- {
|
|
|
- if (int.Parse(pa_currentqty.Text == "" ? "0" : pa_currentqty.Text) < int.Parse(pr_outboxinnerqty.Text))
|
|
|
- {
|
|
|
- if (LogicHandler.SetStepResult(ms_makecode.Text, User.UserSourceCode, sn_code.Text, "包装采集", "装箱成功", User.UserCode, out ErrorMessage))
|
|
|
- {
|
|
|
- LoadCheckQTY();
|
|
|
- OperateResult.AppendText(">>序列号" + sn_code.Text + "采集成功!\n", Color.Green);
|
|
|
- //满箱更新状态为1
|
|
|
- if (int.Parse(pa_currentqty.Text == "" ? "0" : pa_currentqty.Text) + 1 == int.Parse(pr_outboxinnerqty.Text))
|
|
|
- {
|
|
|
- dh.UpdateByCondition("package", "pa_status=1,pa_weight='" + weight.Text + "'", "pa_outboxcode='" + pa_outboxcode.Text + "'");
|
|
|
- if (AutoPrint.Checked)
|
|
|
- Print_Click(new object(), new EventArgs());
|
|
|
- }
|
|
|
- LoadGridData();
|
|
|
- sn_code.Clear();
|
|
|
- }
|
|
|
- }
|
|
|
- else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "已采集满\n", Color.Red);
|
|
|
- }
|
|
|
- else OperateResult.AppendText("序列号" + sn_code.Text + "不存在", Color.Red, sn_code);
|
|
|
- }
|
|
|
-
|
|
|
private void Print_Click(object sender, EventArgs e)
|
|
|
{
|
|
|
if (PrintLabel.Items.Count != 0)
|
|
|
@@ -288,7 +262,6 @@ namespace UAS_MES.Make
|
|
|
BaseUtil.CleanDGVData(PackageDetail);
|
|
|
pa_outboxcode.GeneratePaCode_Click(new object(), new EventArgs());
|
|
|
}
|
|
|
- ////箱号不存在的情况
|
|
|
if (LogicHandler.Packing(sn_code.Text, pa_outboxcode.Text, AutoGenBoxCode.Checked, "特殊", User.UserSourceCode, User.UserCode, pr_outboxinnerqty.Text, Cancel.Checked, out oOutBoxCode, out ErrorMessage))
|
|
|
{
|
|
|
if (LogicHandler.SetStepResult(ms_makecode.Text, User.UserSourceCode, sn_code.Text, "包装采集", "装箱成功", User.UserCode, out ErrorMessage))
|