上一版本漏提交文件提交

AllBase/Model/DBModel/oms_wei_order_info.cs

@@ -376,14 +376,20 @@ namespace AllBase.Model.DBModel
 			set
 			{
 				this.SetValue(x => x.SyncLogisticsList, value);
-				SyncWaybillId = SyncLogisticsList.FirstOrDefault()?.tracking_number;
+				RealSyncWaybillId = SyncLogisticsList.FirstOrDefault()?.tracking_number;
+				SyncWaybillIdInfo = SyncLogisticsList.FirstOrDefault()?.tracking_number;
 				SyncWaybillPickNo = SyncLogisticsList.FirstOrDefault()?.pickup_code;
 			}
 		}
-		public string SyncWaybillId
+		public string RealSyncWaybillId
 		{
-			get { return this.GetValue(x => x.SyncWaybillId); }
-			set { this.SetValue(x => x.SyncWaybillId, value); }
+			get { return this.GetValue(x => x.RealSyncWaybillId); }
+			set { this.SetValue(x => x.RealSyncWaybillId, value); }
+		}
+		public string SyncWaybillIdInfo
+		{
+			get { return this.GetValue(x => x.SyncWaybillIdInfo); }
+			set { this.SetValue(x => x.SyncWaybillIdInfo, value); }
 		}
 		public string SyncWaybillPickNo
 		{

AllBase/Model/DBModel/oms_wei_order_item_info.cs

@@ -923,9 +923,9 @@ namespace AllBase.Model.DBModel
 				this.SetValue(x => x.DirectPddBuyerOrder, value);
 				SyncLogisticsMsg = DirectPddBuyerOrder?.sync_logistics_msg;
 				// 有单号就不显示错误，否则单号字段显示错误信息
-				if (ItemOrder.SyncWaybillId.IsNullOrEmpty())
+				if (ItemOrder.SyncWaybillIdInfo.IsNullOrEmpty())
 				{
-					ItemOrder.SyncWaybillId = SyncLogisticsMsg;
+					ItemOrder.SyncWaybillIdInfo = SyncLogisticsMsg;
 					SyncLogisticsMsg = "";
 				}
 				else