From c1c12f31a0592dbd26958cd8f3fe259e457d7623 Mon Sep 17 00:00:00 2001
From: qian <feng.qian@ccwin-in.com>
Date: Thu, 13 Feb 2025 16:34:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 北京北汽/Controller/SCP_ASK_CONTROLLER.cs | 19 ++++++++++-----
 .../Controller/SCP_DC_UNI_CONTROLLER.cs       |  6 ++---
 .../WarehouseData/SCP_INVOICE_DELTAIL.aspx.cs | 24 +++++++++++++++----
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/北京北汽/Controller/SCP_ASK_CONTROLLER.cs b/北京北汽/Controller/SCP_ASK_CONTROLLER.cs
index 59d516f..5b968d9 100644
--- a/北京北汽/Controller/SCP_ASK_CONTROLLER.cs
+++ b/北京北汽/Controller/SCP_ASK_CONTROLLER.cs
@@ -1348,16 +1348,23 @@ namespace CK.SCP.Controller
                         _tDetail.SubSite = p_ask.SubSite;
                         _tDetail.Remark = itm.Remark;
                         _tDetail.GUID = Guid.NewGuid();
-                        String str = itm.PartCode.Substring(0, 3);
-                        if ((str == "EXP" || str == "SPA") && (_t.SubSite == "ZZ01" || _t.SubSite == "CQ01"))
+                        if (itm.PartCode.Length>=3)
                         {
-                            _tDetail.Batch = "000000";
+                            String str = itm.PartCode.Substring(0, 3);
+                            if ((str == "EXP" || str == "SPA") && (_t.SubSite == "ZZ01" || _t.SubSite == "CQ01"))
+                            {
+                                _tDetail.Batch = "000000";
+                            }
                         }
-                        String str2 = itm.PartCode.Substring(0, 5);
-                        if (str2 == "SPABJ" && _t.Site == "BJBMPT")
+                        if (itm.PartCode.Length >= 5)
                         {
-                            _tDetail.Batch = "000000";
+                            String str2 = itm.PartCode.Substring(0, 5);
+                            if (str2 == "SPABJ" && _t.Site == "BJBMPT")
+                            {
+                                _tDetail.Batch = "000000";
+                            }
                         }
+                        
                         db.TB_ASN_DETAIL.Add(_tDetail);
                         var _order_detail = db.TB_ASK_DETAIL.Where(p => p.UID == itm.UID).FirstOrDefault();
                         _order_detail.ShippedQty = (decimal)itm.ShippedQty;
diff --git a/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs b/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs
index 4907d20..6fdf14b 100644
--- a/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs
+++ b/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs
@@ -647,8 +647,8 @@ namespace CK.SCP.Controller
                 {
                     ScpEntities scpdb = EntitiesFactory.CreateScpInstance();
                     ExchangeCenterContext db = EntitiesFactory.CreateExchangeCenterInstance();
-                    var _list = scpdb.TS_UNI_API.Where(p => p.State == (int)DataState.Enabled && p.Domain == "CQBMPT").OrderBy(p => p.UID).ToList();
-                    var _list1 = scpdb.TS_UNI_API.Where(p => p.State == (int)DataState.Enabled && p.Domain == "CQBMPT" && p.InterfaceType == "Price").OrderBy(p => p.UID).ToList();
+                    var _list = scpdb.TS_UNI_API.Where(p => p.State == (int)DataState.Enabled && p.Domain == "BJBMPT").OrderBy(p => p.UID).ToList();
+                    var _list1 = scpdb.TS_UNI_API.Where(p => p.State == (int)DataState.Enabled && p.Domain == "BJBMPT" && p.InterfaceType == "Price").OrderBy(p => p.UID).ToList();
 
                     var apiii = _list1.Count();
                     if (apiii > 0)
@@ -3858,7 +3858,7 @@ namespace CK.SCP.Controller
                 foreach (var asn in _SCPAPASNlist)
                 {
                     TB_ASN b_ASN = new TB_ASN();
-                    b_ASN = scpdb.TB_ASN.FirstOrDefault(q => q.SubSite == "BJ02" && q.AsnBillNum == asn.BillNum);
+                    b_ASN = scpdb.TB_ASN.FirstOrDefault(q => q.Site == "BJBMPT" && q.AsnBillNum == asn.BillNum);
                     b_ASN.Reason = asn.Reason;
                     b_ASN.State = (int)AskState.Reject;
                     b_ASN.IsDeleted = true;
diff --git a/北京北汽/SCP/Views/WarehouseData/SCP_INVOICE_DELTAIL.aspx.cs b/北京北汽/SCP/Views/WarehouseData/SCP_INVOICE_DELTAIL.aspx.cs
index 5c6bf3b..5532da1 100644
--- a/北京北汽/SCP/Views/WarehouseData/SCP_INVOICE_DELTAIL.aspx.cs
+++ b/北京北汽/SCP/Views/WarehouseData/SCP_INVOICE_DELTAIL.aspx.cs
@@ -258,11 +258,27 @@ namespace SCP.WarehouseData
 
                 if (CurrentUser.ConfigList.Keys.Contains("供应商邮件"))
                 {
-                    SCP.Common.MailManager.SendMail(ro.Message, p_msg, p_msg);
+                    try
+                    {
+                        SCP.Common.MailManager.SendMail(ro.Message, p_msg, p_msg);
+                    }
+                    catch(Exception ex)
+                    {
+                        Alert.Show(p_msg + "成功！"+"但发送邮件失败！");
+                    }
+                    finally
+                    {
+                        GetInvoice();
+                        BindData();
+                    }
+
+                }
+                else
+                {
+                    GetInvoice();
+                    BindData();
+                    return;
                 }
-                GetInvoice();
-                BindData();
-                return;
             }
             else
             {