From b46664564095233ff84a02527c55cc2d5e646bdd Mon Sep 17 00:00:00 2001 From: wule Date: Sat, 24 Oct 2026 11:25:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E8=BD=AC=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OrderCtrls/OrderListRowItemCtrl.xaml.cs | 32 ++++----- .../OrderCtrls/OrderTransitListCtrl.xaml | 10 +++ .../OrderTransitListDetailCtrl.xaml | 66 ++++++++++++++++++- .../oms_wei_order_item_transit_info.cs | 9 +-- 4 files changed, 95 insertions(+), 22 deletions(-) diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs index c36ffd7..c5249fa 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs @@ -2135,23 +2135,23 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls private async void borderWarehouseStatas_MouseUp(object sender, MouseButtonEventArgs e) { - //if (this.DataContext is oms_wei_order_item_info orderItem) - //{ - // oms_wei_order_item_transit_info transitInfo = new oms_wei_order_item_transit_info() - // { - // OrderItem = orderItem, - // }; + if (this.DataContext is oms_wei_order_item_info orderItem) + { + oms_wei_order_item_transit_info transitInfo = new oms_wei_order_item_transit_info() + { + OrderItem = orderItem, + }; - // OrderTransitListCtrl OrderTransitListCtrl = new OrderTransitListCtrl(transitInfo); - // new DialogWindow() - // { - // Title = "仓库订单详情 - 当前订单 " + orderItem.order_id, - // Content = OrderTransitListCtrl, - // Width = SystemParameters.PrimaryScreenWidth < 1920 ? SystemParameters.PrimaryScreenWidth : SystemParameters.PrimaryScreenWidth * 90 / 100, - // Height = SystemParameters.PrimaryScreenHeight * 90 / 100, - // WindowStartupLocation = WindowStartupLocation.CenterScreen, - // }.ShowDialog(); - //} + OrderTransitListCtrl OrderTransitListCtrl = new OrderTransitListCtrl(transitInfo); + new DialogWindow() + { + Title = "仓库订单详情 - 当前订单 " + orderItem.order_id, + Content = OrderTransitListCtrl, + Width = SystemParameters.PrimaryScreenWidth < 1920 ? SystemParameters.PrimaryScreenWidth : SystemParameters.PrimaryScreenWidth * 90 / 100, + Height = SystemParameters.PrimaryScreenHeight * 90 / 100, + WindowStartupLocation = WindowStartupLocation.CenterScreen, + }.ShowDialog(); + } } } } diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListCtrl.xaml index 504e4a9..091b3ea 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListCtrl.xaml @@ -12,6 +12,16 @@ Foreground="DimGray" Loaded="OrderTransitListCtrl_Loaded" mc:Ignorable="d"> + + + + diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml index 24f1964..3b174b9 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml @@ -5,10 +5,21 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:wpf="WPFCommon" d:DesignHeight="280" d:DesignWidth="800" Background="White" mc:Ignorable="d"> + + + + + Text="{Binding SourceCode}" /> - + + + + + + + + + + + + + + + + + + + + diff --git a/AllBase/Model/DBModel/oms_wei_order_item_transit_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_transit_info.cs index 3a7ee12..6a7ec64 100644 --- a/AllBase/Model/DBModel/oms_wei_order_item_transit_info.cs +++ b/AllBase/Model/DBModel/oms_wei_order_item_transit_info.cs @@ -42,7 +42,7 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject var transitDetail = new oms_wei_order_item_transit_detail_info() { - + TransitTypeStr = "发货包裹", OrderCode = transitOrder.order_code, SourceCode = transitOrder.random_code, @@ -58,7 +58,8 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject UpperWaybill = (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'), DownWaybill = (transitOrder.express_2_company + "-" + transitOrder.express_2_waybill).Trim('-'), BuyReundStatus = transitOrder.refund_status, - + + PickUpTime = transitOrder.pickup_time == DateTime.MinValue ? null : transitOrder.pickup_time, InboundTime = transitOrder.inbound_time, OutboundTime = transitOrder.outbound_time, }; @@ -116,10 +117,10 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject set { this.SetValue(x => x.SourceCode, value); } } /// 取号时间((中转单)创建时间) - public DateTime PickUpTime + public DateTime? PickUpTime { get { return this.GetValue(x => x.PickUpTime); } - set { this.SetValue(x => x.PickUpTime, value); PickUpTimeStr = value.ToString("yyyy-MM-dd HH:mm:ss"); } + set { this.SetValue(x => x.PickUpTime, value); PickUpTimeStr = value == null ? "" : value.Value.ToString("yyyy-MM-dd HH:mm:ss"); } } public string PickUpTimeStr {