1同步物流单可以手动编辑取件码 2优化上海退货仓退货地址匹配逻辑

AllBase/Helper/GlobalConfig.cs

@@ -59,6 +59,10 @@ namespace AllBase.Helper
 		/// </summary>
 		public static string TransitReturnOrderReturnAddress { get; set; } = "真如镇街道真北路2653弄F区808号楼";
 		/// <summary>
+		/// 默认退货详细地址路和区(用于包含判断)
+		/// </summary>
+		public static string TransitReturnOrderReturnAddressLite { get; set; } = "真北路2653弄F区808号楼";
+		/// <summary>
 		/// 订单列表
 		/// </summary>
 		public static ConcurrentList<oms_wei_order_info> lstOrder { get; set; } = new ConcurrentList<oms_wei_order_info>();

AllBase/Model/DBModel/oms_wei_order_info.cs

@@ -139,7 +139,7 @@ namespace AllBase.Model.DBModel
 			{
 				//return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
 				//return this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
-				return this.orderItems.All(oi => oi.ItemRefund?.return_detail.StartsWith(GlobalConfig.TransitReturnOrderReturnAddress) == true);
+				return this.orderItems.All(oi => oi.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true);
 			}
 			set { }
 		}

AllBase/Model/DBModel/oms_wei_order_item_info.cs

@@ -421,7 +421,7 @@ namespace AllBase.Model.DBModel
 
 			// 退货仓退货
 			AddEditTransitWarehouseReturnOrderStr = "";
-			if (ItemRefund?.return_detail.StartsWith(GlobalConfig.TransitReturnOrderReturnAddress) == true)
+			if (ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true)
 			{
 				AddEditTransitWarehouseReturnOrderStr = DistribReturnOrderInfo == null ? "未创建" : "已创建";
 				if (DistribReturnOrderInfo?.warehouse_status == 1)