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

拒收逻辑修改

Browse Source
This commit is contained in:
wule_5900x committed 2026-08-10 07:16:26 +08:00
1 parent 71bc8d20b7
commit 56135b9a36
5 files changed
+19 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
+1 -1
View File
@@ -422,7 +422,7 @@
Click="btnAddEditTransitWarehouseReject_Click" Cursor="Hand"></Button>
</WrapPanel>
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="5" Visibility="{Binding AddEditTransitWarehouseAfterSaleStr,Converter={StaticResource HasTextVisibility}}">
<TextBox Text="退回中转仓：" Grid.Column="1" Grid.Row="2" Margin="0,1,-8,1" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderBrush="Transparent" BorderThickness="1"/>
<TextBox Text="中转仓退回：" Grid.Column="1" Grid.Row="2" Margin="0,1,-8,1" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderBrush="Transparent" BorderThickness="1"/>
<uc:UcWaterMarkTextBox1 x:Name="txtTransitWarehouseAfterSale" WaterMark="退回中转仓" Text="{Binding TransitWarehouseAfterSaleWayBillStr}" Grid.Column="1" Grid.Row="2" Margin="0,1,0,1"
VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="1" TextWrapping="Wrap"/>
<!--Visibility="{Binding Text,RelativeSource={RelativeSource Self},Converter={StaticResource HasTextVisibility}}"-->
AllBase/BaseClass.cs
+1 -1
View File
@@ -32,7 +32,7 @@ namespace AllBase
/// 版本ID
/// </summary>
public static int VersionCount = 215;
public static int VersionCount = 217;
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
public static string DebugUrl { get; set; } = "http://localhost:9000";
AllBase/Model/DBModel/TransitWaybillHelper.cs
+1 -1
View File
@@ -27,4 +27,4 @@ namespace AllBase.Model.DBModel
"赵", "钱", "孙", "李", "周", "吴", "郑", "王", "冯", "陈", "沈", "杨", "朱", "许", "何", "张",
};
}
}
}
AllBase/Model/DBModel/oms_wei_external_procurement_log_info.cs
+1 -1
View File
@@ -67,7 +67,7 @@ namespace AllBase.Model.DBModel
/// </summary>
public int? order_void_status { get; set; }
/// <summary>
/// 中转仓入库状态 0: 未使用, 1: 已入库, 2: 已出库
/// 中转仓入库状态 0: 未入库, 1: 已入库, 2: 已出库, 3: 拦截到仓
/// </summary>
public int? warehouse_status { get; set; }
/// <summary>
AllBase/Model/DBModel/oms_wei_order_item_info.cs
+15 -18
View File
@@ -260,18 +260,22 @@ namespace AllBase.Model.DBModel
AddEditTransitWarehouseRejectStr = "申请";
if (this.ItemTransitOrderWithVoid?.has_reject == 1)
AddEditTransitWarehouseRejectStr = "已申请拒收";
if (this.ItemTransitOrderWithVoid?.has_reject == 2)
AddEditTransitWarehouseRejectStr = "申请拒收失败";
if (this.ItemTransitOrderWithVoid == null || (!this.ItemOrder.IsEmergency && !this.ItemOrder.isAbnormal && !this.ItemOrder.IsRefund) || this.ItemTransitOrderWithVoid.warehouse_status == 2 ||
if (this.ItemTransitOrderWithVoid?.has_reject == 2)
AddEditTransitWarehouseRejectStr = "申请拒收失败";
if (this.ItemTransitOrderWithVoid?.has_reject == 3)
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 ||
string.IsNullOrEmpty(PddBuyerOrder?.order_sn))
{
if (AddEditTransitWarehouseRejectStr != "已申请拒收")
if (AddEditTransitWarehouseRejectStr == "申请")
AddEditTransitWarehouseRejectStr = "";
}
// 仓库物流售后按钮上的文字，仓库作废单不存在仓库物流，所以此处必须是有效的仓库单（含作废失败）
AddEditTransitWarehouseAfterSaleStr = this.ItemTransitOrderAfterSale == null ? "添加" : "已添加";
if (this.ItemTransitOrderWithVoid == null || (!this.ItemOrder.IsEmergency && !this.ItemOrder.isAbnormal && !this.ItemOrder.IsRefund) || this.ItemTransitOrderWithVoid.warehouse_status < 2)
if (this.ItemTransitOrderWithVoid == null || (!this.ItemOrder.IsEmergency && !this.ItemOrder.isAbnormal && !this.ItemOrder.IsRefund) || this.ItemTransitOrderWithVoid.warehouse_status < 1)
{
if (AddEditTransitWarehouseAfterSaleStr != "已添加")
AddEditTransitWarehouseAfterSaleStr = "";
@@ -340,21 +344,14 @@ namespace AllBase.Model.DBModel
string refund_status = (ItemTransitOrderWithVoid?.refund_status).ParseToString();
//if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("退款成功"))
//{
// BuyerTransitWaybillStatusStr = "买手已退款"; return;
//}
//else if (refund_status.Contains("退款成功"))
//{
// BuyerTransitWaybillStatusStr = "买手已退款"; return;
//}
// 已到中转仓的或者中转仓已正式发出的，买手（仓上游）状态显示为已到中转仓
if (ItemTransitOrderWithVoid?.warehouse_status == 1 || ItemTransitOrderWithVoid?.warehouse_status == 2)
{
BuyerTransitWaybillStatusStr = "已到中转仓";
}
//if (ItemTransitOrderWithVoid?.warehouse_status == 1 || ItemTransitOrderWithVoid?.warehouse_status == 2)
//{
// BuyerTransitWaybillStatusStr = "已到中转仓";
//}
// 拼多多买手状态为已签收的，为已到中转仓
else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("已签收"))
/*else*/
if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("已签收"))
{
BuyerTransitWaybillStatusStr = "买手已送达";
}