From 59ed3cccdb459d5a48798c1fe8bcb94e1f788425 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Sat, 27 Jan 2024 21:43:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=89=A9=E6=B5=81=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91=E8=A7=84=E5=88=99=20=E7=BF=BB=E8=AF=91=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8=E4=B8=93=E7=BA=BF?=
 =?UTF-8?q?=E7=89=A9=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseOrder/PurchaseOrderBusiness.cs    | 20 ++++++++++++-------
 SDKAdapter/ExpressCompanyNameConverter.cs     |  3 ---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index 1d21692..2c6e095 100644
--- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
@@ -2492,13 +2492,9 @@ namespace BBWYB.Server.Business
                     {
                         kuaidi100Company = expressCompanyNameConverter.ConverterToKuaiDi100Company(logisticsInfo.ExpressName);
                         if (kuaidi100Company == null)
-                            throw new Exception($"无翻译结果");
-
-                        if (!kuaidi100Company.IsNoSubscribeKD100)
-                        {
-                            kuaiDi100Manager.SubscribeKuaiDi100(logisticsInfo.WayBillNo, kuaidi100Company.TargetCode, "http://bbwyb.qiyue666.com/api/purchaseorder/kuaidi100publish");
-                            isSubscribeKD100 = true;
-                        }
+                            throw new Exception($"无翻译结果,默认使用专线物流发货,如发现非专线物流请联系技术员,进行调整");
+                        kuaiDi100Manager.SubscribeKuaiDi100(logisticsInfo.WayBillNo, kuaidi100Company.TargetCode, "http://bbwyb.qiyue666.com/api/purchaseorder/kuaidi100publish");
+                        isSubscribeKD100 = true;
                     }
                     catch (Exception ex)
                     {
@@ -2521,6 +2517,16 @@ namespace BBWYB.Server.Business
                             #endregion
 
                             if (ex.Message.Contains("无翻译结果"))
+                            {
+                                kuaidi100Company = new LogisticsCompanyRelationship()
+                                {
+                                    SecondTargetCode = logisticsInfo.ExpressId,
+                                    SourceName = logisticsInfo.ExpressName,
+                                    TargetCode = "zhuanxianwuliu",
+                                    TargetName = "专线物流"
+                                };
+                            }
+                            else
                                 throw;
                         }
                     }
diff --git a/SDKAdapter/ExpressCompanyNameConverter.cs b/SDKAdapter/ExpressCompanyNameConverter.cs
index 08dfb4c..0800251 100644
--- a/SDKAdapter/ExpressCompanyNameConverter.cs
+++ b/SDKAdapter/ExpressCompanyNameConverter.cs
@@ -128,7 +128,6 @@ namespace SDKAdapter
                 new LogisticsCompanyRelationship(){SourceName="京东物流",TargetName="京东物流",TargetCode="jd"},
                 new LogisticsCompanyRelationship(){SourceName="速腾快递",TargetName="速腾快递",TargetCode="suteng"},
                 new LogisticsCompanyRelationship(){SourceName="运通快运",TargetName="运通快运",TargetCode="ytky168"},
-                new LogisticsCompanyRelationship(){SourceName="运通货运",TargetName="zhuanxianwuliu",TargetCode="专线物流",IsNoSubscribeKD100=true},
                 new LogisticsCompanyRelationship(){SourceName="汇森速运",TargetName="汇森速运",TargetCode="huisenky"},
                 new LogisticsCompanyRelationship(){SourceName="丹鸟物流",TargetName="丹鸟物流",TargetCode="danniao"},
                 new LogisticsCompanyRelationship(){SourceName="丹鸟",TargetName="丹鸟物流",TargetCode="danniao"}
@@ -195,7 +194,5 @@ namespace SDKAdapter
         public string SecondTargetName { get; set; }
 
         public string SecondTargetCode { get; set; }
-
-        public bool IsNoSubscribeKD100 { get; set; }
     }
 }