|
|
@@ -42,7 +42,7 @@ namespace UAS_MES.Make
|
|
|
ma_code.FormName = Name;
|
|
|
ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "ma_prodname", "pr_id" };
|
|
|
ma_code.TableName = "Make left join product on ma_prodcode=pr_code";
|
|
|
- ma_code.SelectField = "pr_id # 物料ID,ma_code # 工单号,ma_prodcode # 物料编号,ma_qty # 数量,ma_prodname # 物料名册,ma_wccode # 工作中心编号";
|
|
|
+ ma_code.SelectField = "ma_code # 工单号,ma_prodcode # 物料编号,ma_qty # 数量,ma_prodname # 物料名册,ma_wccode # 工作中心编号";
|
|
|
ma_code.Condition = "ma_statuscode='STARTED'";
|
|
|
ma_code.DbChange += Ma_code_DbChange;
|
|
|
PrintNum.Value = 1;
|
|
|
@@ -73,8 +73,8 @@ namespace UAS_MES.Make
|
|
|
BaseUtil.FillDgvWithDataTable(PackageDetail, dt);
|
|
|
//加载表单数据
|
|
|
sql.Clear();
|
|
|
- sql.Append("select pa_id,pa_totalqty,pa_packageqty,pa_totalqty-pa_packageqty pa_restqty,pr_detail,pr_colorboxmaxw,pr_colorboxminw,pr_code,pa_makecode as ma_code ");
|
|
|
- sql.Append("from package left join packagedetail on pd_paid=pa_id left join product on pa_prodcode=pr_code where pa_outboxcode='" + pa_code.Text + "' and rownum=1");
|
|
|
+ sql.Append("select pr_id,pa_id,pa_totalqty,pa_packageqty,pa_totalqty-pa_packageqty pa_restqty,ma_prodcode,pr_detail,pr_colorboxmaxw,pr_colorboxminw,pr_code,pa_makecode as ma_code ");
|
|
|
+ sql.Append("from package left join packagedetail on pd_paid=pa_id left join product left join make on ma_prodcode=pr_code on pa_prodcode=pr_code where pa_outboxcode='" + pa_code.Text + "' and rownum=1");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
BaseUtil.SetFormValue(this.Controls, dt);
|
|
|
}
|
|
|
@@ -84,7 +84,7 @@ namespace UAS_MES.Make
|
|
|
//插入工序表MakeSerial,如果是第一道工序的话
|
|
|
//插入PackageDetail从表信息
|
|
|
sql.Clear();
|
|
|
- sql.Append("insert into packagedetail (pd_id,pd_paid,pd_outboxcode,pd_innerqty,pd_barcode) ");
|
|
|
+ sql.Append("insert into packagedetail(pd_id,pd_paid,pd_outboxcode,pd_innerqty,pd_barcode) ");
|
|
|
sql.Append("select packagedetail_seq.nextval,pa_id,pa_outboxcode,pa_totalqty,'" + barcode.Text + "' from package where pa_outboxcode='" + pa_code.Text + "'");
|
|
|
dh.ExecuteSql(sql.GetString(), "insert");
|
|
|
dh.UpdateByCondition("Package", "pa_packageqty=pa_packageqty+1", "pa_outboxcode='" + pa_code.Text + "'");
|
|
|
@@ -108,7 +108,7 @@ namespace UAS_MES.Make
|
|
|
}
|
|
|
catch
|
|
|
{
|
|
|
- BaseUtil.ShowError("打印程序异常，请检查是否连接打印机或者打印软件是否安装");
|
|
|
+ OperateResult.AppendText(">>打印程序异常，请检查是否连接打印机或者打印软件是否安装\n", Color.Red);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -149,7 +149,8 @@ namespace UAS_MES.Make
|
|
|
//判断箱内总数必须大于0
|
|
|
if (pa_totalqty.Text == "" || pa_totalqty.Text == "0")
|
|
|
{
|
|
|
- BaseUtil.ShowError("箱内数量必须大于0");
|
|
|
+ OperateResult.AppendText(">>箱内数量必须大于0\n", Color.Red);
|
|
|
+ return;
|
|
|
}
|
|
|
//如果未勾选了取消录入
|
|
|
if (!Cancel.Checked)
|
|
|
@@ -188,19 +189,12 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
InsertDetail();
|
|
|
}
|
|
|
- else
|
|
|
- {
|
|
|
- OperateResult.AppendText("序列号" + barcode.Text + "无效！\n", Color.Red);
|
|
|
- }
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- OperateResult.AppendText(">>" + ErrorMessage + "!\n", Color.Red);
|
|
|
+ else OperateResult.AppendText("序列号" + barcode.Text + "无效！\n", Color.Red);
|
|
|
}
|
|
|
+ else OperateResult.AppendText(">>" + ErrorMessage + "!\n", Color.Red);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- //验证序列号，插入明细表的数据
|
|
|
InsertDetail();
|
|
|
}
|
|
|
}
|
|
|
@@ -220,16 +214,10 @@ namespace UAS_MES.Make
|
|
|
OperateResult.AppendText(">>已从该箱中移除该序列号\n", Color.Green);
|
|
|
LoadData();
|
|
|
}
|
|
|
- else
|
|
|
- {
|
|
|
- OperateResult.AppendText(">>序列号" + barcode.Text + "不在该箱内，请输入正确的序列号\n", Color.Red);
|
|
|
- }
|
|
|
+ else OperateResult.AppendText(">>序列号" + barcode.Text + "不在该箱内，请输入正确的序列号\n", Color.Red);
|
|
|
}
|
|
|
}
|
|
|
- else
|
|
|
- {
|
|
|
- OperateResult.AppendText(">>请先输入箱号和工单号\n", Color.Red);
|
|
|
- }
|
|
|
+ else OperateResult.AppendText(">>请先输入箱号和工单号\n", Color.Red);
|
|
|
}
|
|
|
}
|
|
|
|
章政