分销退货优化 提交退货包裹逻辑优化
This commit is contained in:
1 parent
a7076e7f3f
commit
4161c94243
11 files changed
+1851
-1323
No files matched your search
@@ -271,7 +271,11 @@ namespace AllBase.Model.DBModel
|
||||
AddEditTransitWarehouseRejectStr = "申请拒收成功";
|
||||
if (this.ItemTransitOrderWithVoid?.has_reject == 5)
|
||||
AddEditTransitWarehouseRejectStr = "已取消拒收";
|
||||
if (this.ItemTransitOrderWithVoid == null || (!this.ItemOrder.IsEmergency && !this.ItemOrder.isAbnormal && !this.ItemOrder.IsRefund) || this.ItemTransitOrderWithVoid.warehouse_status >= 2 ||
|
||||
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) ||
|
||||
this.ItemTransitOrderWithVoid.platform == "XDYYWC" || // 义务仓不能申请拒收
|
||||
string.IsNullOrEmpty(PddBuyerOrder?.order_sn))
|
||||
{
|
||||
if (AddEditTransitWarehouseRejectStr == "申请")
|
||||
@@ -283,9 +287,15 @@ namespace AllBase.Model.DBModel
|
||||
|
||||
}
|
||||
|
||||
// 仓库物流售后按钮上的文字,仓库作废单不存在仓库物流,所以此处必须是有效的仓库单(含作废失败)
|
||||
AddEditTransitWarehouseAfterSaleStr = this.ItemTransitOrderAfterSale == null ? "添加" : "已添加";
|
||||
if (this.ItemTransitOrderWithVoid == null || (!this.ItemOrder.IsEmergency && !this.ItemOrder.isAbnormal && !this.ItemOrder.IsRefund) || this.ItemTransitOrderWithVoid.warehouse_status < 1)
|
||||
// 仓库物流售后拦截包裹按钮上的文字,仓库作废单不存在仓库物流,所以此处必须是有效的仓库单(含作废失败)
|
||||
AddEditTransitWarehouseAfterSaleStr = "添加";
|
||||
if (this.ItemTransitOrderAfterSale != null)
|
||||
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 != "申请拒收失败"))
|
||||
{
|
||||
if (AddEditTransitWarehouseAfterSaleStr != "已添加")
|
||||
AddEditTransitWarehouseAfterSaleStr = "";
|
||||
@@ -525,10 +535,10 @@ namespace AllBase.Model.DBModel
|
||||
WarehouseWaybillStatusStr = "中转拦截到仓";
|
||||
else if (ItemTransitOrderWithVoid?.warehouse_status == 2)
|
||||
WarehouseWaybillStatusStr = "中转已出库";
|
||||
// 老订单还用之前的逻辑判断
|
||||
else if (ItemTransitOrderWithVoid?.created_time < new DateTime(2026, 7, 14) && (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3) && !ItemTransitOrderWithVoid.express_2_company.IsNullOrEmpty() && !ItemTransitOrderWithVoid.express_2_waybill.IsNullOrEmpty())
|
||||
//WarehouseWaybillStatusStr = "中转已出库*";
|
||||
WarehouseWaybillStatusStr = "中转已出库";
|
||||
//// 老订单还用之前的逻辑判断
|
||||
//else if (ItemTransitOrderWithVoid?.created_time < new DateTime(2026, 7, 14) && (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3) && !ItemTransitOrderWithVoid.express_2_company.IsNullOrEmpty() && !ItemTransitOrderWithVoid.express_2_waybill.IsNullOrEmpty())
|
||||
// //WarehouseWaybillStatusStr = "中转已出库*";
|
||||
// WarehouseWaybillStatusStr = "中转已出库";
|
||||
else if (ItemTransitOrderWithVoid?.warehouse_status == 1)
|
||||
WarehouseWaybillStatusStr = "中转已入库";
|
||||
//else if ((ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3) && !ItemTransitOrderWithVoid.express_2_company.IsNullOrEmpty() && !ItemTransitOrderWithVoid.express_2_waybill.IsNullOrEmpty())
|
||||
|
||||
Reference in new issue
Block a user