修复关联失败问题 继续优化读单

AllBase/Model/DBModel/oms_wei_order_item_info.cs

@@ -272,12 +272,17 @@ namespace AllBase.Model.DBModel
         {
             get { return this.GetValue(x => x.ItemTransitOrderWithVoid); }
             set { this.SetValue(x => x.ItemTransitOrderWithVoid, value); }
-        }
+		}
 		public Visibility ItemTransitOutOrderBuyerStrVisibility
 		{
 			get { return this.GetValue(x => x.ItemTransitOutOrderBuyerStrVisibility); }
 			set { this.SetValue(x => x.ItemTransitOutOrderBuyerStrVisibility, value); }
 		}
+		public Visibility ItemTransitOutOrderNoStrVisibility
+		{
+			get { return this.GetValue(x => x.ItemTransitOutOrderNoStrVisibility); }
+			set { this.SetValue(x => x.ItemTransitOutOrderNoStrVisibility, value); }
+		}
 		public List<oms_wei_external_procurement_after_sale_info> ItemTransitOrderAfterSales { get; set; } = new List<oms_wei_external_procurement_after_sale_info>();
         public oms_wei_external_procurement_after_sale_info ItemTransitOrderAfterSale
         {
@@ -309,12 +314,22 @@ namespace AllBase.Model.DBModel
 		public string TransitExtraPackageWaybillStr
 		{
 			get { return this.GetValue(x => x.TransitExtraPackageWaybillStr); }
-			set { this.SetValue(x => x.TransitExtraPackageWaybillStr, value); }
+			set { this.SetValue(x => x.TransitExtraPackageWaybillStr, value); TransitExtraPackageWaybillStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
+		}
+		public Visibility TransitExtraPackageWaybillStrVisibility
+		{
+			get { return this.GetValue(x => x.TransitExtraPackageWaybillStrVisibility); }
+			set { this.SetValue(x => x.TransitExtraPackageWaybillStrVisibility, value); }
 		}
 		public string TransitExtraPackageWaybillBtnStr
 		{
 			get { return this.GetValue(x => x.TransitExtraPackageWaybillBtnStr); }
-			set { this.SetValue(x => x.TransitExtraPackageWaybillBtnStr, value); }
+			set { this.SetValue(x => x.TransitExtraPackageWaybillBtnStr, value); TransitExtraPackageWaybillBtnStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
+		}
+		public Visibility TransitExtraPackageWaybillBtnStrVisibility
+		{
+			get { return this.GetValue(x => x.TransitExtraPackageWaybillBtnStrVisibility); }
+			set { this.SetValue(x => x.TransitExtraPackageWaybillBtnStrVisibility, value); }
 		}
 		public List<order_pdd_buyer_order> PddBuyerOrders { get; set; } = new List<order_pdd_buyer_order>();
         public order_pdd_buyer_order PddBuyerOrder
@@ -336,7 +351,26 @@ namespace AllBase.Model.DBModel
 		public string PddBuyerAfterSaleAddressStr
 		{
 			get { return this.GetValue(x => x.PddBuyerAfterSaleAddressStr); }
-			set { this.SetValue(x => x.PddBuyerAfterSaleAddressStr, value); }
+			set
+			{
+				this.SetValue(x => x.PddBuyerAfterSaleAddressStr, value);
+				PddBuyerAfterSaleAddressStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible;
+
+				if (value.ParseToString().Length > 19)
+					PddBuyerAfterSaleAddressShortStr = string.Join("", value.ParseToString().Take(19)) + "…";
+				else
+					PddBuyerAfterSaleAddressShortStr = value.ParseToString();
+			}
+		}
+		public string PddBuyerAfterSaleAddressShortStr
+		{
+			get { return this.GetValue(x => x.PddBuyerAfterSaleAddressShortStr); }
+			set { this.SetValue(x => x.PddBuyerAfterSaleAddressShortStr, value); }
+		}
+		public Visibility PddBuyerAfterSaleAddressStrVisibility
+		{
+			get { return this.GetValue(x => x.PddBuyerAfterSaleAddressStrVisibility); }
+			set { this.SetValue(x => x.PddBuyerAfterSaleAddressStrVisibility, value); }
 		}
 
 
@@ -539,14 +573,19 @@ namespace AllBase.Model.DBModel
 		/// 拍单物流编号
 		/// </summary>
 		public string TransitOrderWaybillToWareHouseStr
-        {
-            get { return this.GetValue(x => x.TransitOrderWaybillToWareHouseStr); }
-            set { this.SetValue(x => x.TransitOrderWaybillToWareHouseStr, value); }
-        }
-        /// <summary>
-        /// 提前取号物流编号（虚拟）
-        /// </summary>
-        public string TransitOrderWaybillFakeStr
+		{
+			get { return this.GetValue(x => x.TransitOrderWaybillToWareHouseStr); }
+			set { this.SetValue(x => x.TransitOrderWaybillToWareHouseStr, value); TransitOrderWaybillToWareHouseStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
+		}
+		public Visibility TransitOrderWaybillToWareHouseStrVisibility
+		{
+			get { return this.GetValue(x => x.TransitOrderWaybillToWareHouseStrVisibility); }
+			set { this.SetValue(x => x.TransitOrderWaybillToWareHouseStrVisibility, value); }
+		}
+		/// <summary>
+		/// 提前取号物流编号（虚拟）
+		/// </summary>
+		public string TransitOrderWaybillFakeStr
         {
             get { return this.GetValue(x => x.TransitOrderWaybillFakeStr); }
             set { this.SetValue(x => x.TransitOrderWaybillFakeStr, value); }
@@ -557,7 +596,12 @@ namespace AllBase.Model.DBModel
         public string TransitOrderWaybillFromWareHouseStr
         {
             get { return this.GetValue(x => x.TransitOrderWaybillFromWareHouseStr); }
-            set { this.SetValue(x => x.TransitOrderWaybillFromWareHouseStr, value); }
+            set { this.SetValue(x => x.TransitOrderWaybillFromWareHouseStr, value); TransitOrderWaybillFromWareHouseStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
+		}
+		public Visibility TransitOrderWaybillFromWareHouseStrVisibility
+		{
+			get { return this.GetValue(x => x.TransitOrderWaybillFromWareHouseStrVisibility); }
+			set { this.SetValue(x => x.TransitOrderWaybillFromWareHouseStrVisibility, value); }
 		}
 		public string TransitWarehouseAfterSaleWayBillStr
 		{
@@ -788,20 +832,25 @@ namespace AllBase.Model.DBModel
 			get { return this.GetValue(x => x.WarehouseWaybillStatusBackColor); }
 			set { this.SetValue(x => x.WarehouseWaybillStatusBackColor, value); }
 		}
-        #endregion
+		#endregion
 
-        /// <summary>
-        /// 中转仓表买手售后字段文字显示
-        /// </summary>
-        public string TransitRefundStatusStr
+		/// <summary>
+		/// 中转仓表买手售后字段文字显示
+		/// </summary>
+		public string TransitRefundStatusStr
 		{
 			get { return this.GetValue(x => x.TransitRefundStatusStr); }
-			set { this.SetValue(x => x.TransitRefundStatusStr, value); }
+			set { this.SetValue(x => x.TransitRefundStatusStr, value); TransitRefundStatusStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
 		}
-        /// <summary>
-        /// 中转仓表买手售后字段文字显示背景颜色
-        /// </summary>
-        public SolidColorBrush TransitRefundStatusBackColor
+		public Visibility TransitRefundStatusStrVisibility
+		{
+			get { return this.GetValue(x => x.TransitRefundStatusStrVisibility); }
+			set { this.SetValue(x => x.TransitRefundStatusStrVisibility, value); }
+		}
+		/// <summary>
+		/// 中转仓表买手售后字段文字显示背景颜色
+		/// </summary>
+		public SolidColorBrush TransitRefundStatusBackColor
 		{
 			get { return this.GetValue(x => x.TransitRefundStatusBackColor); }
 			set { this.SetValue(x => x.TransitRefundStatusBackColor, value); }
@@ -860,13 +909,18 @@ namespace AllBase.Model.DBModel
 			else
 				TransitRefundVoidStatusStr = "";
 		}
-		
-		
+
+
 		// 仓库采购时间是否达标字段
-        public string OutOrderTimeQualifiedStr
+		public string OutOrderTimeQualifiedStr
 		{
 			get { return this.GetValue(x => x.OutOrderTimeQualifiedStr); }
-			set { this.SetValue(x => x.OutOrderTimeQualifiedStr, value); }
+			set { this.SetValue(x => x.OutOrderTimeQualifiedStr, value); OutOrderTimeQualifiedStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
+		}
+		public Visibility OutOrderTimeQualifiedStrVisibility
+		{
+			get { return this.GetValue(x => x.OutOrderTimeQualifiedStrVisibility); }
+			set { this.SetValue(x => x.OutOrderTimeQualifiedStrVisibility, value); }
 		}
 		void SetOutOrderTimeQualifiedStr()
 		{
@@ -1020,7 +1074,12 @@ namespace AllBase.Model.DBModel
 		public string DirectOrderBuyTimeStr
 		{
 			get { return this.GetValue(x => x.DirectOrderBuyTimeStr); }
-			set { this.SetValue(x => x.DirectOrderBuyTimeStr, value); }
+			set { this.SetValue(x => x.DirectOrderBuyTimeStr, value); DirectOrderBuyTimeStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
+		}
+		public Visibility DirectOrderBuyTimeStrVisibility
+		{
+			get { return this.GetValue(x => x.DirectOrderBuyTimeStrVisibility); }
+			set { this.SetValue(x => x.DirectOrderBuyTimeStrVisibility, value); }
 		}
 
 
@@ -1043,7 +1102,25 @@ namespace AllBase.Model.DBModel
 		public string DirectPddBuyerAfterSaleAddressStr
 		{
 			get { return this.GetValue(x => x.DirectPddBuyerAfterSaleAddressStr); }
-			set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStr, value); }
+			set
+			{
+				this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStr, value);
+				if (value.ParseToString().Length > 19)
+					DirectPddBuyerAfterSaleAddressShortStr = string.Join("", value.ParseToString().Take(19)) + "…";
+				else
+					DirectPddBuyerAfterSaleAddressShortStr = value.ParseToString();
+				DirectPddBuyerAfterSaleAddressStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible;
+			}
+		}
+		public string DirectPddBuyerAfterSaleAddressShortStr
+		{
+			get { return this.GetValue(x => x.DirectPddBuyerAfterSaleAddressShortStr); }
+			set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressShortStr, value); }
+		}
+		public Visibility DirectPddBuyerAfterSaleAddressStrVisibility
+		{
+			get { return this.GetValue(x => x.DirectPddBuyerAfterSaleAddressStrVisibility); }
+			set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStrVisibility, value); }
 		}
 		public string DirectRefundStatusStr
         {
@@ -1450,7 +1527,11 @@ namespace AllBase.Model.DBModel
         /// <summary>
         /// sku属性JSON
         /// </summary>
-        public string sku_attrs { get; set; }
+        public string sku_attrs
+		{
+			get { return this.GetValue(x => x.sku_attrs); }
+			set { this.SetValue(x => x.sku_attrs, value); SetSkuAttrStr(); }
+		}
         /// <summary>
         /// sku实付总价，取estimate_price和change_price中较小值
         /// </summary>
@@ -1572,7 +1653,6 @@ namespace AllBase.Model.DBModel
 			//    }));
 			//}
 
-			this.SetSkuAttrStr();
 			this.SetItemRefund();
             this.SetTransitOrder();
             this.SetDirectOrder();
@@ -1596,6 +1676,7 @@ namespace AllBase.Model.DBModel
 					tOrder.SetOutOrderBuyerStr();
 				}
 				ItemTransitOutOrderBuyerStrVisibility = (ItemTransitOrderWithVoid?.OutOrderBuyerStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
+				ItemTransitOutOrderNoStrVisibility = (ItemTransitOrderWithVoid?.OutOrderNumStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
 			}
 		}