|
|
@@ -17,6 +17,7 @@ namespace UAS_MES.Make
|
|
|
DataTable dt;
|
|
|
LogStringBuilder sql = new LogStringBuilder();
|
|
|
AutoSizeFormClass asc = new AutoSizeFormClass();
|
|
|
+ System.DateTime[] indate;
|
|
|
//保存StepProduct查询出来的数据
|
|
|
// DataTable ListA = new DataTable();
|
|
|
//保存make left join makecraftdetail left join product的数据
|
|
|
@@ -80,7 +81,7 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
//获取工单的其他信息
|
|
|
sql.Clear();
|
|
|
- sql.Append("select ma_code,nvl(mcd_okqty,0),ma_prodcode,pr_detail,");
|
|
|
+ sql.Append("select ma_code,ma_prodcode,pr_detail,");
|
|
|
sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
|
|
|
sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + oMakeCode + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
|
|
|
mapB = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
@@ -105,17 +106,18 @@ namespace UAS_MES.Make
|
|
|
if (PrintLabel.SelectedValue != null)
|
|
|
{
|
|
|
//按照打印张数打印
|
|
|
- Print.CodeSoft(lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text));
|
|
|
+ Print.CodeSoft(lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text),indate[PrintLabel.SelectedIndex]);
|
|
|
//提示用户打印成功
|
|
|
- OperateResult.AppendText(">>打印成功\n", Color.Green);
|
|
|
+ OperateResult.AppendText(">>序列号"+sncode.Text+"打印成功\n", Color.Green);
|
|
|
//更新打印的数据
|
|
|
- LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "机身标打印", User.UserSourceCode, User.UserName, "机身标打印成功", out oErrorMessage);
|
|
|
+ LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "机身标打印", User.UserSourceCode, User.UserCode, "机身标打印成功", out oErrorMessage);
|
|
|
//清空输入框的值,聚焦
|
|
|
sncode.Text = "";
|
|
|
sncode.Focus();
|
|
|
//刷新打印数量和剩余数量
|
|
|
- mcd_remainqty.Text = int.Parse(mcd_remainqty.Text) - 1 + "";
|
|
|
- mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
|
|
|
+ mcd_okqty.Text = int.Parse(mcd_okqty.Text) +1+ "";
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
|
|
|
+ BaseUtil.SetFormValue(Controls, dt);
|
|
|
|
|
|
//IF 剩余数=0,则清空form中的数据, 提示用户“工单:xx已经打印完成,>>请输入SN”, 清空mapB,listC 中的数据
|
|
|
if (int.Parse(mcd_remainqty.Text) == 0)
|
|
|
@@ -133,7 +135,7 @@ namespace UAS_MES.Make
|
|
|
//标签为空
|
|
|
else
|
|
|
{
|
|
|
- OperateResult.AppendText(">>无可用标签\n", Color.Red);
|
|
|
+ OperateResult.AppendText(">>产品编号:"+ ma_prodcode .Text+ "未维护机身标签\n", Color.Red);
|
|
|
sncode.Text = "";
|
|
|
}
|
|
|
}
|
|
|
@@ -151,19 +153,21 @@ namespace UAS_MES.Make
|
|
|
}
|
|
|
private void pr_code_TextChanged(object sender, EventArgs e)
|
|
|
{
|
|
|
- dt = (DataTable)dh.ExecuteSql("select pl_labelname,pl_labelcode,to_char(nvl(pl_indate,sysdate),'YYYY-MM-DD HH24:Mi:SS') pl_indate,pl_labelurl from productlabel where pl_prodcode='" + ma_prodcode.Text + "'and PL_LABELTYPE='机身标' order by pl_isdefault desc", "select");
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select pl_labelname,pl_labelcode,pl_indate,pl_labelurl from productlabel where pl_prodcode='" + ma_prodcode.Text + "'and PL_LABELTYPE='机身标' order by pl_isdefault desc", "select");
|
|
|
if (dt.Rows.Count == 0)
|
|
|
{
|
|
|
- OperateResult.AppendText(">>该序列号对应的产品未维护机身标标签模板\n", Color.Red);
|
|
|
+ OperateResult.AppendText(">>产品编号:"+ma_prodcode.Text+"未维护机身标标签模板\n", Color.Red);
|
|
|
}
|
|
|
PrintLabel.DataSource = dt;
|
|
|
PrintLabel.DisplayMember = "pl_labelname";
|
|
|
PrintLabel.ValueMember = "pl_labelcode";
|
|
|
ftpOperater ftp = new ftpOperater();
|
|
|
+ indate = new System.DateTime[dt.Rows.Count];
|
|
|
for (int i = 0; i < dt.Rows.Count; i++)
|
|
|
{
|
|
|
//ftp.Download(dt.Rows[i]["pl_labelname"].ToString());
|
|
|
BaseUtil.GetPrintLabel(dt.Rows[i]["pl_labelname"].ToString(), dt.Rows[i]["pl_labelurl"].ToString(), dt.Rows[i]["pl_indate"].ToString());
|
|
|
+ indate[i] = Convert.ToDateTime(dt.Rows[i]["pl_indate"].ToString());
|
|
|
}
|
|
|
}
|
|
|
|