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

修复显示作废（显示错误）订单无法作废重拍的问题

Browse Source
This commit is contained in:
wule committed 2026-10-24 20:56:08 +08:00
1 parent 04584600c8
commit e492457516
5 files changed
+181 -125
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AllBase/Model/DBModel/oms_wei_order_info.cs
+7 -1
View File
@@ -13,6 +13,7 @@ using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
@@ -896,6 +897,11 @@ namespace AllBase.Model.DBModel
public bool GetIsAbnormal()
{
if (order_id == "3740040052771291904")
{
}
// 三退或者两退，为退款完成单
//if (orderItems.All(oi => (oi.refund_status == 4 || oi.refund_status == 11) && (oi.ItemTransitOrder != null || string.IsNullOrWhiteSpace(out_order_no)) &&
// (oi.ItemTransitOrder == null || oi.ItemTransitOrder?.refund_status == "买手退款成功") && (string.IsNullOrWhiteSpace(out_order_no) || out_after_sale_status == "退款成功")))
@@ -917,7 +923,7 @@ namespace AllBase.Model.DBModel
return true;
// 订单无售后或者售后关闭，有未作废的仓库单且仓库单买手信息为退款成功
if (orderItems.Any(oi => oi.refund_status <= 1 && oi.ItemTransitOrder != null && oi.ItemTransitOrder.refund_status == "买手退款成功"))
if (orderItems.Any(oi => oi.refund_status <= 1 && oi.ItemTransitOrderWithVoid != null && oi.ItemTransitOrderWithVoid.refund_status == "买手退款成功"))
return true;
// 取号异常或无法调用发货也放在异常单（异常需重拍）
AllBase/Model/DBModel/oms_wei_order_item_info.cs
+7 -2
View File
@@ -1837,17 +1837,22 @@ namespace AllBase.Model.DBModel
/// <returns></returns>
public bool GetIsAbnormalOrderRebuy()
{
if (order_id == "3740040052771291904")
{
}
var order_item = this;
// 不是异常单的不可异常重拍
if (order_item?.ItemOrder?.IsAbnormal != true)
return false;
// 买手未退款的，中转正式取号以后的，不可异常重拍
if (order_item.ItemTransitOrder?.refund_status != "买手退款成功" ||
if (order_item.ItemTransitOrderWithVoid?.refund_status != "买手退款成功" ||
order_item.WarehouseWaybillStatusStr == "中转已取号" || order_item.WarehouseWaybillStatusStr == "中转已入库" || order_item.WarehouseWaybillStatusStr == "中转已出库")
return false;
// 已正式取号的，不可异常重拍
if (order_item.ItemTransitOrder?.pre_allocated_order_no == 1 || order_item.ItemTransitOrder?.pre_allocated_order_no == 3)
if (order_item.ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || order_item.ItemTransitOrderWithVoid?.pre_allocated_order_no == 3)
return false;
// 仓库异常的异常单不可异常重拍
List<string> rawMsgKeyWords = new List<string> { "取号异常", "无法调用" };