订单仓库状态优化,调整文件位置

This commit is contained in:
wule committed 2026-07-15 10:00:44 +08:00
1 parent ed3545e376
commit d6f81f9ef4
47 files changed
+251 -84

No files matched your search

@@ -188,7 +188,7 @@
</Grid>
<Grid x:Name="lstTitle" Grid.Row="2" Margin="8,0,8,0" Background="{StaticResource ListHeadBackColorBrush}">
<Border BorderThickness="0,0,1,0" BorderBrush="{StaticResource ListHeadBorderColorBrush}">
<DataGrid Margin="0,0,30,0" x:Name="dgOrderHeader" Grid.ColumnSpan="100" AutoGenerateColumns="False" CanUserReorderColumns="False"
<DataGrid Margin="0,0,28,0" x:Name="dgOrderHeader" Grid.ColumnSpan="100" AutoGenerateColumns="False" CanUserReorderColumns="False"
ColumnHeaderHeight="{Binding ElementName=lstTitle, Path=ActualHeight}" BorderThickness="0"
ColumnDisplayIndexChanged="dgOrderHeader_ColumnDisplayIndexChanged"
LayoutUpdated="dgOrderHeader_LayoutUpdated">
@@ -217,9 +217,9 @@
<DataGridTextColumn Width="95*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="交易时间"/>
<DataGridTextColumn Width="75*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="利润"/>
<DataGridTextColumn Width="170*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="状态/地址"/>
<DataGridTextColumn Width="110*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="单号"/>
<DataGridTextColumn Width="120*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="单号"/>
<DataGridTextColumn Width="120*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="备注"/>
<DataGridTextColumn Width="82*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header=" 操作"/>
<DataGridTextColumn Width="72*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header=" 操作"/>
</DataGrid.Columns>
</DataGrid>
</Border>
@@ -5,7 +5,7 @@ using AllBase;
using AllBase.Extension;
using AllBase.Helper;
using AllBase.Model;
using AllBase.Model.Local;
using AllBase.Model.DBModel;
using NaiBa.Util.Extension;
using Newtonsoft.Json.Linq;
using System;
@@ -208,7 +208,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
data3 += "&order_no=" + order_ids;
var html3 = GetHtml.PostUtf8(url3, data3);
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
GetHtml.PostUtf8(url3, data3);
html3 = GetHtml.PostUtf8(url3, data3);
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
{
Dispatcher.Invoke(new Action(() =>
@@ -217,15 +217,16 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}));
break;
}
List<oms_wei_external_procurement_log> transitOrderList = new List<oms_wei_external_procurement_log>();
List<oms_wei_external_procurement_log_info> transitOrderList = new List<oms_wei_external_procurement_log_info>();
try
{
transitOrderList = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_log>(JObject.Parse(html3)["data"].ParseToString());
transitOrderList = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_log_info>(JObject.Parse(html3)["data"].ParseToString());
// 直接过滤掉仓库作废单
//transitOrderList = transitOrderList.Where(t => t.order_void_status != 1).ToList();
}
catch { }
// 读取暂时记录的买手订单,后面想办法放到中转订单库里去
// 读取中转仓拍单订单
var url4 = BaseClass.Build29WxObjString("order/wx_get_buyer_order_list");
@@ -233,7 +234,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
data4 += "&wx_order_id_in=" + order_ids;
var html4 = GetHtml.PostUtf8(url4, data4);
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
GetHtml.PostUtf8(url4, data4);
html4 = GetHtml.PostUtf8(url4, data4);
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
{
Dispatcher.Invoke(new Action(() =>
@@ -250,6 +251,29 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
catch { }
// 读取中转仓处理售后单
var url5 = BaseClass.Build29WxObjString("order/wx_get_transit_warehouse_aftersale_list");
var data5 = UserLogin.GetSignaturex();
data5 += "&wx_order_id_in=" + order_ids;
var html5 = GetHtml.PostUtf8(url5, data5);
if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
html5 = GetHtml.PostUtf8(url5, data5);
if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
{
Dispatcher.Invoke(new Action(() =>
{
BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
}));
break;
}
List<oms_wei_external_procurement_after_sale_info> pddTransitAfterSales = new List<oms_wei_external_procurement_after_sale_info>();
try
{
pddTransitAfterSales = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_after_sale_info>(JObject.Parse(html5)["data"].ParseToString())
.OrderByDescending(p => p.created_time).ToList();
}
catch { }
// 读取关联拍单商品
var urlMap = BaseClass.Build29WxObjString("order/wx_get_buy_prod_map");
@@ -1,5 +1,5 @@
using _29WxOrderWpf.BaseWindows;
using AllBase.Model.Local;
using AllBase.Model.DBModel;
using NaiBa.Util.Extension;
using System;
using System.Collections.Generic;
@@ -1,6 +1,6 @@
using _29WxOrderWpf.BaseWindows;
using AllBase.Helper;
using AllBase.Model.Local;
using AllBase.Model.DBModel;
using NaiBa.Util.Extension;
using System;
using System.Collections.Generic;
@@ -19,12 +19,12 @@
<ColumnDefinition Width="36"></ColumnDefinition>
<ColumnDefinition Width="28"></ColumnDefinition>
<ColumnDefinition Width="200*"></ColumnDefinition>
<ColumnDefinition Width="100*"></ColumnDefinition>
<ColumnDefinition Width="100*"></ColumnDefinition>
<ColumnDefinition Width="160*"></ColumnDefinition>
<ColumnDefinition Width="100*"></ColumnDefinition>
<ColumnDefinition Width="95*"></ColumnDefinition>
<ColumnDefinition Width="75*"></ColumnDefinition>
<ColumnDefinition Width="170*"></ColumnDefinition>
<ColumnDefinition Width="120*"></ColumnDefinition>
<ColumnDefinition Width="82*"></ColumnDefinition>
<ColumnDefinition Width="120*"></ColumnDefinition>
<ColumnDefinition Width="72*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Converter={StaticResource listBoxIndexConverter}}"
HorizontalAlignment="Center" VerticalAlignment="Center"></TextBlock>
@@ -237,7 +237,7 @@
<Border x:Name="borderWarehouseStatas" Grid.Row="1" Margin="4,0,0,0" Background="{Binding WarehouseWaybillStatusBackColor}" BorderBrush="{Binding WarehouseWaybillStatusBorderColor}"
BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" Visibility="{Binding WarehouseWaybillStatusStr,Converter={StaticResource HasTextVisibility}}">
<TextBox x:Name="txtWarehouseStatus" Grid.Column="1" Margin="2,0,2,1" Foreground="{Binding WarehouseWaybillStatusStrColor}" VerticalContentAlignment="Center" VerticalAlignment="Center"
Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding WarehouseWaybillStatusStr}" BorderThickness="0" />
Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding WarehouseWaybillStatusStr}" BorderThickness="0" MouseEnter="txtWarehouseStatus_MouseEnter"/>
</Border>
<!--TransitRefundStatusStr-->
<!--<Border x:Name="borderWarehouseStatas" Grid.Row="1" Margin="8,0,0,0" Background="{Binding WaybillStatusBackColor}" BorderBrush="{Binding WaybillStatusBorderColor}"
@@ -5,7 +5,7 @@ using _29WxOrderWpf.UserControls;
using AllBase;
using AllBase.Helper;
using AllBase.Model;
using AllBase.Model.Local;
using AllBase.Model.DBModel;
using AllBase.Model.Result;
using CefSharp.DevTools.DOM;
using NaiBa.Util.Extension;
@@ -48,6 +48,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
txtOutOrderBuyerStr.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtOutOrderNumStr_MouseLeftButtonUp), true);
txtOutOrderNumStr.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtOutOrderNumStr_MouseLeftButtonUp), true);
txtRefundId.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtRefundId_MouseLeftButtonUp), true);
txtWarehouseStatus.AddHandler(TextBox.MouseEnterEvent, new MouseEventHandler(txtWarehouseStatus_MouseEnter), true);
}
private void txtRefundId_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
@@ -749,5 +751,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
}
}
private void txtWarehouseStatus_MouseEnter(object sender, MouseEventArgs e)
{
if (txtWarehouseStatus.ToolTip == null)
{
if (this.DataContext is oms_wei_order_item_info orderItem)
{
if (orderItem.ItemTransitOrderWithVoid.raw_message != null && orderItem.ItemTransitOrderWithVoid.raw_message.Contains("取号异常"))
this.txtWarehouseStatus.ToolTip = orderItem.ItemTransitOrderWithVoid.raw_message;
}
}
}
}
}