From 3281fe78853a35a7323e560bce7648a2ec9e5063 Mon Sep 17 00:00:00 2001 From: wule Date: Tue, 25 Aug 2026 11:02:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=8D=E5=8D=95=E5=90=8E=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ctrls/OrderCtrls/OrderListCtrl.xaml.cs | 10 +++++++++- .../Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs | 3 +++ AllBase/BaseClass.cs | 2 +- AllBase/GetHtml.cs | 9 ++++++++- AllBase/Model/DBModel/oms_wei_order_info.cs | 14 ++++++++++++-- Work/_29Tools/Forms/PddMobileBuyOrderForm.cs | 2 ++ 6 files changed, 35 insertions(+), 5 deletions(-) diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs index 10b9b1d..a152367 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs +++ b/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 /// private bool FilterTabPage(oms_wei_order_info order, string filterHeadStr) { + if (order.order_id == "3738687160199289344") + { + + } + // 过滤标签页 if (filterHeadStr.IsNullOrEmpty()) filterHeadStr = GlobalConfig.OrderTabHeaderStr; diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs index 387c69d..973e69d 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs +++ b/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); }); } diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 752d56b..ee16bf1 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -36,7 +36,7 @@ namespace AllBase /// 版本ID /// - 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"; diff --git a/AllBase/GetHtml.cs b/AllBase/GetHtml.cs index 6b7f9a0..4d9b2f7 100644 --- a/AllBase/GetHtml.cs +++ b/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; + } } } } diff --git a/AllBase/Model/DBModel/oms_wei_order_info.cs b/AllBase/Model/DBModel/oms_wei_order_info.cs index a1dd286..2a536e9 100644 --- a/AllBase/Model/DBModel/oms_wei_order_info.cs +++ b/AllBase/Model/DBModel/oms_wei_order_info.cs @@ -142,8 +142,8 @@ namespace AllBase.Model.DBModel /// 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) diff --git a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs index 254333a..efc7343 100644 --- a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs +++ b/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);