diff --git a/Common/MyWebSmtpMail.cs b/Common/MyWebSmtpMail.cs index a3c7ed8..82865e3 100644 --- a/Common/MyWebSmtpMail.cs +++ b/Common/MyWebSmtpMail.cs @@ -265,7 +265,7 @@ namespace CK.SCP.Common _client.Disconnect(true); Console.WriteLine("MailKit Send Success:" + _message.To.Mailboxes.First()); } - catch (Exception ex) + catch (SmtpException ex) { Console.WriteLine(ex.Message); Console.WriteLine(); diff --git a/Controller/SCP_MPO_CONTROLLER.cs b/Controller/SCP_MPO_CONTROLLER.cs index 55efac1..0fce65a 100644 --- a/Controller/SCP_MPO_CONTROLLER.cs +++ b/Controller/SCP_MPO_CONTROLLER.cs @@ -591,6 +591,11 @@ namespace CK.SCP.Controller } }); print.Total = SUM.ToString("F6"); + var detail = detailList.FirstOrDefault(q => !string.IsNullOrEmpty(q.Remake)); + if (detail != null) + { + print.Remake = detail.Remake; + } var dt = ConvertHelper.ToDataTable(new List { print }); ds.Tables.Add(dt); var dt1 = ConvertHelper.ToDataTable(lsDetail); diff --git a/Models/ScpEntity/TB_MATERIALORDERS_DETAIL.cs b/Models/ScpEntity/TB_MATERIALORDERS_DETAIL.cs index 84ed04b..fb6a21b 100644 --- a/Models/ScpEntity/TB_MATERIALORDERS_DETAIL.cs +++ b/Models/ScpEntity/TB_MATERIALORDERS_DETAIL.cs @@ -61,5 +61,7 @@ namespace CK.SCP.Models.ScpEntity public string CType_DESC { get; set; } [DisplayName("¶©µ¥ÐкÅ")] public string PURDOCITEMNO { get; set; } + [DisplayName("±¸×¢")] + public string Remake { get; set; } } } diff --git a/Models/ScpEntity/V_MPO_PRINT.cs b/Models/ScpEntity/V_MPO_PRINT.cs index 5944133..adba8e9 100644 --- a/Models/ScpEntity/V_MPO_PRINT.cs +++ b/Models/ScpEntity/V_MPO_PRINT.cs @@ -15,6 +15,7 @@ public string FIRSTTELNO { get; set; } public string STAGEDESC { get; set; } public string Total { get; set; } + public string Remake { get; set; } } diff --git a/UniApiGroup/Controller/OdbcApiQadController.cs b/UniApiGroup/Controller/OdbcApiQadController.cs index 63f75c6..5b5bf3c 100644 --- a/UniApiGroup/Controller/OdbcApiQadController.cs +++ b/UniApiGroup/Controller/OdbcApiQadController.cs @@ -1850,6 +1850,7 @@ namespace CK.SCP.GrupUniApi.Controller orderdetail.CostCenterDes = initem.COSTCENTERDES; orderdetail.StoreLocation = initem.STORELOCATION; orderdetail.PURDOCITEMNO = initem.PURDOCITEMNO; + orderdetail.Remake = initem.REMARK; InPoDetailList.Add(orderdetail); var maxlist1 = new xxDiMaxes_Order {