|
|
@@ -58,11 +58,11 @@ namespace UAS_MES.Make
|
|
|
|
|
|
//工单号放大镜配置
|
|
|
ma_code.TableName = "make left join product on ma_prodcode=pr_code";
|
|
|
- ma_code.SelectField = "ma_code # 工单号,ma_prodcode # 产品编号,ma_qty # 工单数量,ma_craftcode # 途程编号,pr_detail # 产品名称,ma_bomversion # Bom版本";
|
|
|
+ ma_code.SelectField = "ma_code # 工单号,pr_code # 产品编号,ma_qty # 工单数量,ma_craftcode # 途程编号,pr_detail # 产品名称,ma_bomversion # Bom版本";
|
|
|
ma_code.FormName = Name;
|
|
|
ma_code.DBTitle = "工单查询";
|
|
|
- ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "ma_qty", "pr_detail", "ma_craftcode", "ma_bomversion" };
|
|
|
- ma_code.Condition = "ma_statuscode='STARTED'";
|
|
|
+ ma_code.SetValueField = new string[] { "ma_code", "pr_code", "ma_qty", "pr_detail", "ma_craftcode", "ma_bomversion" };
|
|
|
+ ma_code.Condition = "ma_statuscode='STARTED' order by ma_updatedate desc";
|
|
|
ma_code.DbChange += Ms_makecode_DbChange;
|
|
|
|
|
|
Lock.GetMakeCodeCtl(ma_code);
|
|
|
@@ -114,7 +114,7 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
sql.Clear();
|
|
|
sql.Append("select ma_code,ma_craftcode,ms_sncode,ma_qty,pr_detail,pr_code,ma_bomversion from makeserial left join make on ");
|
|
|
- sql.Append("ms_makecode=ma_code left join product on ms_prodcode=pr_code where ms_id='" + Msid + "'");
|
|
|
+ sql.Append("ms_makecode=ma_code left join product on ms_prodcode=pr_code where ms_sncode='" + code.Text + "' and ms_makecode='" + ma_code.Text + "'");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
@@ -184,7 +184,7 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
CollectData.Add(code.Text);
|
|
|
CollectDataSonCode.Add(ListA.Rows[RemainIndex]["sp_soncode"].ToString());
|
|
|
- OperateResult.AppendText(">>采集成功\n", Color.Green, code);
|
|
|
+ OperateResult.AppendText(">>物料" + code.Text + "采集成功\n", Color.Green, code);
|
|
|
RemainIndex = RemainIndex + 1;
|
|
|
}
|
|
|
else
|
|
|
@@ -206,7 +206,7 @@ namespace UAS_MES.Make
|
|
|
sql.Append("and sp_craftcode=ma_craftcode and sp_mothercode = ma_prodcode left join makeserial on ms_makecode=ma_code ");
|
|
|
sql.Append("where ma_code='" + macode + "'and sp_id=" + sp_id + " and mcd_stepcode = '" + User.CurrentStepCode + "' and ms_sncode='" + ms_sncode.Text + "'");
|
|
|
dh.BatchInsert(sql.GetString(), new string[] { "soncode", "barcode" }, CollectDataSonCode.ToArray(), CollectData.ToArray());
|
|
|
- OperateResult.AppendText(">>序列号" + ms_sncode.Text + "对应的工单已经采集完成\n", Color.Green);
|
|
|
+ OperateResult.AppendText(">>序列号" + ms_sncode.Text + "对应的物料已经采集完成\n", Color.Green);
|
|
|
Print.CodeSoft(Tag.ToString(), lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, ms_sncode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
|
|
|
RemainIndex = 0;
|
|
|
CollectData.Clear();
|
章政