拍单后没有实时更新问题修复

29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs

@@ -240,6 +240,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 					BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
 					break;
 				}
+				if (html.Contains("3738686976228742912"))
+				{ 
+				}
 				var seconds = BaseRegex.GetDecimalJson(ref html, "seconds");
 
 				var jArr = JObject.Parse(html)["data"];
@@ -1255,7 +1258,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			if (order == null)
 				return true;
 
-			if (order.order_id == "3735242250991331072")
+			if (order.order_id == "3738687160199289344")
 			{
 
 			}
@@ -1409,6 +1412,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 		/// <returns></returns>
 		private bool FilterTabPage(oms_wei_order_info order, string filterHeadStr)
 		{
+			if (order.order_id == "3738687160199289344")
+			{
+
+			}
+
 			// 过滤标签页
 			if (filterHeadStr.IsNullOrEmpty())
 				filterHeadStr = GlobalConfig.OrderTabHeaderStr;

29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs

@@ -334,6 +334,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			if (!GetIsAbnormalOrderRebuy(orderItem) && GlobalConfig.lstOrder.Any(o => o.orderItems
 				.Any(oi => oi.ItemTransitOrder?.order_no == orderItem.order_id && oi.ItemTransitOrder?.order_sku_id == orderItem.sku_id)))
 			{
+				OrderListCtrl.InitOrderItemObservableProp(orderItem);
 				MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.ItemOrder);
 				BaseMsgWindow.ShowError("已存在中转拍单信息，请核对后再拍单");
 				return;
@@ -1018,6 +1019,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 				#endregion
 
 				#region 重新过滤订单
+				OrderListCtrl.InitOrderItemObservableProp(orderItem);
 				MainWindow.Instance.orderListCtrl.FilterOrders();
 				if (!isSilent)
 					BaseMsgWindow.ShowInfo("订单作废成功，请重新拍单");
@@ -1424,6 +1426,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 							Application.Current.Dispatcher.Invoke(() =>
 							{
 								orderItem.ItemOrder.gift_order_status = 1;
+								OrderListCtrl.InitOrderItemObservableProp(orderItem);
 								MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.ItemOrder, true);
 							});
 						}

AllBase/BaseClass.cs

@@ -36,7 +36,7 @@ namespace AllBase
 		/// 版本ID
 		/// </summary>
 
-        public static int VersionCount = 259;
+        public static int VersionCount = 260;
 
 		public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
 		public static string DebugUrl { get; set; } = "http://localhost:9000";

AllBase/GetHtml.cs

@@ -131,7 +131,14 @@ namespace AllBase
 				if (encoding == null) encoding = Encoding.UTF8;
 				using (StreamReader streamReader = new StreamReader(streamToRead, encoding))
 				{
-					return streamReader.ReadToEnd();
+					try
+					{
+						return streamReader.ReadToEnd();
+					}
+					catch (Exception ex)
+					{
+						return ex.Message;
+					}
 				}
 			}
 		}

AllBase/Model/DBModel/oms_wei_order_info.cs

@@ -142,8 +142,8 @@ namespace AllBase.Model.DBModel
 		/// </summary>
 		public bool isAbnormal
 		{
-			get { return this.GetValue(x => x.IsWaitReceive); }
-			set { this.SetValue(x => x.IsWaitReceive, value); }
+			get { return this.GetValue(x => x.isAbnormal); }
+			set { this.SetValue(x => x.isAbnormal, value); }
 		}
 
 		public string orderStatusStr
@@ -682,6 +682,10 @@ namespace AllBase.Model.DBModel
 
 		private bool GetIsWaitBuy()
 		{
+			if (order_id == "3738686976228742912")
+			{
+
+			}
 			if (status != 20 && status != 21)
 				return false;
 			if (refundItems?.Any(r => r.IsRefund) == true)
@@ -725,6 +729,12 @@ namespace AllBase.Model.DBModel
 
 		private bool GetIsWaitReceive()
 		{
+			if (order_id == "3738687160199289344")
+			{
+
+			}
+
+
 			if (refundItems?.Any(r => r.IsRefund) == true)
 				return false;
 			if (orderItems?.Any(oi => oi.refund_status > 1) == true)

Work/_29Tools/Forms/PddMobileBuyOrderForm.cs

@@ -1070,6 +1070,8 @@ namespace TemuKJD.ToolForms
                     // 利润计算重置为最小值，控件Resource更新时将计算利润
                     orderItem.ProfitCount = decimal.MinValue;
                     var order = orderItem?.ItemOrder;
+					orderItem.SetOrderItemTextProperty();
+					order.SetOrderTextProperty();
                     if (filterOrderAction != null && order != null)
                     {
                         filterOrderAction(order, true);