chfei/29WxOrder
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:jtt-fan/29WxOrder

Browse Source
This commit is contained in:
chfei committed 2026-08-31 17:05:38 +08:00
2 parents b3790d70c2 ea4bdfba1e
commit 545a0751c8
4 files changed
+123 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
+44 -3
View File
@@ -955,7 +955,7 @@
Stroke="{StaticResource mainColorBrush}"
StrokeThickness="2" />
<wpf:TitleContent
Title="中转拒收状态"
Title="中转仓拒收状态"
Margin="4,0,4,0"
VerticalContentAlignment="Center"
FontSize="12"
@@ -967,7 +967,7 @@
Width="80"
Height="23"
SelectedIndex="0"
SelectionChanged="cmbRejectStatus_SelectionChanged"
SelectionChanged="cmbRejectOrReturnStatus_SelectionChanged"
Style="{StaticResource RoundedComboBox}">
<ComboBoxItem Content="请选择" />
<ComboBoxItem Content="未申请" />
@@ -976,7 +976,28 @@
<ComboBoxItem Content="拒收成功" />
</ComboBox>
</wpf:TitleContent>
<wpf:TitleContent
Title="拦截退回总店状态"
Margin="4,0,4,0"
VerticalContentAlignment="Center"
FontSize="12"
Foreground="Black"
Placement="Left"
TitleVerticalAlignment="Center">
<ComboBox
x:Name="cmbReturnPackageStatus"
Width="80"
Height="23"
SelectedIndex="0"
SelectionChanged="cmbRejectOrReturnStatus_SelectionChanged"
Style="{StaticResource RoundedComboBox}">
<ComboBoxItem Content="请选择" />
<ComboBoxItem Content="未拦截" />
<ComboBoxItem Content="拦截中" />
<!--<ComboBoxItem Content="拦截失败" />-->
<ComboBoxItem Content="拦截成功" />
</ComboBox>
</wpf:TitleContent>
<CheckBox
@@ -1059,6 +1080,26 @@
Click="chkShopIsRefund_Click"
Content="店铺未退款"
FontSize="12" />
<Polyline
Grid.Column="14"
Width="10"
Margin="5,0"
VerticalAlignment="Center"
Points="5,0 5,8 5,0"
Stroke="{StaticResource mainColorBrush}"
StrokeThickness="2"
Visibility="Visible" />
<CheckBox
x:Name="chkUpShopAddressAnalyseFailed"
Grid.Column="0"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkUpShopAddressAnalyseFailed_Click"
Content="总店地址解析失败"
FontSize="12" />
</WrapPanel>
</Grid>
</Border>
29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+58 -1
View File
@@ -1511,6 +1511,20 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (cmbRejectStatusText == "拒收失败" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr.StartsWith("申请拒收失败")))
return true;
if (order.order_id == "3738674216947317248")
{
}
var cmbReturnPackageStatusText = cmbReturnPackageStatus.SelectedItem.ParseToString().Replace("System.Windows.Controls.ComboBoxItem: ", "");
if (cmbReturnPackageStatusText == "未拦截" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseAfterSaleStr == "添加"))
return true;
if (cmbReturnPackageStatusText == "拦截中" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseAfterSaleStr == "已添加"))
return true;
if (cmbReturnPackageStatusText == "拦截成功" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseAfterSaleStr.StartsWith("拦截成功")))
return true;
if (cmbReturnPackageStatusText == "拦截失败" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseAfterSaleStr.StartsWith("拦截失败")))
return true;
if (chkEmergencyBuyerWaitAfterSale.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后")))
return true;
@@ -1563,6 +1577,38 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
// 退款中
else if (chkShopIsNotRefund.IsChecked == true && (order.DeliveryDeadlineStatusStr != "退款中"))
return true;
// 地址解析失败
if (chkUpShopAddressAnalyseFailed.IsChecked == true)
{
if (order.OrderBuyType == "云仓")
{
if (order.orderItems.Any(oi => string.IsNullOrEmpty(oi.PddBuyerAfterSale?.afterSaleAddress)))
return true;
foreach (var orderItem in order.orderItems)
{
for (int i = 0; i < 1000; i++)
{
var receiver = TransitReturnOrderWindow.PddAddressAnalysis(orderItem.PddBuyerAfterSale?.afterSaleAddress);
if (!receiver.receiver_address.IsNullOrEmpty())
return true;
}
}
}
else
{
if (order.orderItems.Any(oi => string.IsNullOrEmpty(oi.DirectPddBuyerAfterSale?.afterSaleAddress)))
return true;
foreach (var orderItem in order.orderItems)
{
var receiver = TransitReturnOrderWindow.PddAddressAnalysis(orderItem.DirectPddBuyerAfterSale?.afterSaleAddress);
if (!receiver.receiver_address.IsNullOrEmpty())
return true;
}
}
}
}
if (filterHeadStr.StartsWith("售后完成单"))
{
@@ -2544,7 +2590,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
}
private void cmbRejectStatus_SelectionChanged(object sender, SelectionChangedEventArgs e)
private void cmbRejectOrReturnStatus_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
FilterOrders();
}
@@ -2581,6 +2627,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
FilterOrders();
}
private void chkUpShopAddressAnalyseFailed_Click(object sender, RoutedEventArgs e)
{
if (sender is CheckBox chk)
{
var isCheck = !chk.IsChecked.ParseToBool();
chkUpShopAddressAnalyseFailed.IsChecked = false;
chk.IsChecked = !isCheck;
}
FilterOrders();
}
}
public class OrderFilterConfig : PropertyNotifyObject
AllBase/Model/DBModel/oms_wei_external_procurement_log_info.cs
+12
View File
@@ -106,5 +106,17 @@ namespace AllBase.Model.DBModel
/// 拒收时间
/// </summary>
public DateTime? rejected_time { get; set; }
/// <summary>
/// 拦截退回状态：0未处理，1已退回，2退回失败
/// </summary>
public int? intercept_return_status { get; set; }
/// <summary>
/// 拦截退回时间
/// </summary>
public DateTime? intercept_return_time { get; set; }
/// <summary>
/// 拦截退回操作信息/回调信息
/// </summary>
public string intercept_return_info { get; set; }
}
}
AllBase/Model/DBModel/oms_wei_order_item_info.cs
+9 -5
View File
@@ -284,8 +284,8 @@ namespace AllBase.Model.DBModel
{
if (AddEditTransitWarehouseRejectStr == "申请")
AddEditTransitWarehouseRejectStr = "";
else if (this.ItemTransitOrderWithVoid.platform == "XDYYWC") // 义务仓已申请拒收的全部显示失败
AddEditTransitWarehouseRejectStr = "申请拒收失败*";
//else if (this.ItemTransitOrderWithVoid.platform == "XDYYWC") // 义务仓已申请拒收的全部显示失败
// AddEditTransitWarehouseRejectStr = "申请拒收失败*";
}
if (order_id == "3738396781943865344")
@@ -297,19 +297,23 @@ namespace AllBase.Model.DBModel
AddEditTransitWarehouseAfterSaleStr = "添加";
if (this.ItemTransitOrderAfterSale != null)
AddEditTransitWarehouseAfterSaleStr = "已添加";
if (this.ItemTransitOrderAfterSale != null && (ItemTransitOrderWithVoid.intercept_return_status == 1 || !string.IsNullOrEmpty(ItemTransitOrderAfterSale.downstream_waybill)))
AddEditTransitWarehouseAfterSaleStr = "拦截成功";
//if (this.ItemTransitOrderAfterSale != null && ItemTransitOrderWithVoid.intercept_return_status == 2)
// AddEditTransitWarehouseAfterSaleStr = "拦截失败";
if (this.ItemTransitOrderWithVoid == null || this.ItemRefund?.type != "REFUND" ||
!(this.ItemRefund?.return_waybill_id).IsNullOrEmpty() || !(this.ItemRefund?.return_detail).IsNullOrEmpty() ||
(!this.ItemOrder.IsEmergency && !this.ItemOrder.isAbnormal && !this.ItemOrder.IsRefund) ||
this.ItemTransitOrderWithVoid.warehouse_status == 0 ||
(this.ItemTransitOrderWithVoid.warehouse_status == 1 && !AddEditTransitWarehouseRejectStr.IsNullOrEmpty() && !AddEditTransitWarehouseRejectStr.StartsWith("申请拒收失败")))
{
if (AddEditTransitWarehouseAfterSaleStr != "已添加")
if (AddEditTransitWarehouseAfterSaleStr == "添加")
AddEditTransitWarehouseAfterSaleStr = "";
}
// 退货退款的，不能拦截退回总店。如果是退到退货仓，则退货仓流程，否则店家自行收货退回总店。
if (!RefundAddressStr.ParseToString().Trim().IsNullOrEmpty() || this.ItemRefund?.type != "REFUND")
{
if (AddEditTransitWarehouseAfterSaleStr != "已添加")
if (AddEditTransitWarehouseAfterSaleStr == "添加")
AddEditTransitWarehouseAfterSaleStr = "";
}
if (this.ItemTransitOrderAfterSale != null)
@@ -324,7 +328,7 @@ namespace AllBase.Model.DBModel
}
// 关闭中转包裹退回，改为中转分销退货
if (AddEditTransitWarehouseAfterSaleStr != "已添加")
if (AddEditTransitWarehouseAfterSaleStr == "添加")
AddEditTransitWarehouseAfterSaleStr = "";
AddEditTransitWarehouseReturnOrderStr = DistribReturnOrderInfo == null ? "添加" : "已添加";
if (DistribReturnOrderInfo?.warehouse_status == 1)