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

1 退货物流信息如果中转表没有从买手单表读取 2仓库详细信息

Browse Source
This commit is contained in:
wule committed 2026-10-25 22:10:39 +08:00
1 parent e492457516
commit fda30c824a
5 files changed
+109 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AllBase/Model/DBModel/TransitWarehouseParam.cs
+20
View File
@@ -43,6 +43,26 @@ namespace AllBase.Model.DBModel
public class TransitWarehouseData
{
public static Dictionary<string, string> dicWarehouseIdName = new Dictionary<string, string>()
{
{ "XDYBJC", "北京仓" },
{ "XDYGZC", "广州仓" },
{ "XDYWHC", "武汉2仓" },
{ "XDYSHANDC", "山东2仓" },
{ "XDYSHC", "上海新仓" },
{ "XDYSZC", "深圳仓" },
{ "XDYYWC", "义乌仓" },
{ "XDYJJC", "晋江仓" },
{ "XDYCDC", "成都仓" },
{ "XDYCHONGQC", "重庆2仓" },
{ "XDYHEBC", "哈尔滨仓" },
{ "XDYXA", "西安仓" },
{ "XDYGYC", "贵阳仓" },
{ "XDYKMC", "昆明仓" },
{ "XDYSSC", "河北仓" },
{ "XDYZZC", "郑州仓" },
};
public static string TransitWarehouseDataStr = @"
XDYBJC ;北京仓 ;胡萍 ;18565773752 ;北京市顺义区光明街道滨河小区七区1号楼 ;2 ;52 ;511 ;北京市 ;北京市 ;顺义区 ;光明街道 ;滨河小区七区1号楼108室
XDYGZC ;广州仓 ;何外华 ;13826339849 ;广州市增城区朱村街道育山一路68号国际物流园 ;6 ;76 ;702 ;广东省 ;广州市 ;增城区 ;朱村街道 ;育山一路68号国际物流园
AllBase/Model/DBModel/oms_wei_order_item_transit_info.cs
+18 -4
View File
@@ -55,13 +55,17 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
OutOrderId = transitOrder.out_order_no,
OutBuyerName = transitOrder.OutOrderBuyerStr,
UpperWaybill = (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
//UpperWaybill = transitOrder.express_1_waybill != transitOrder.virtual_waybill_no ? "" : (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
UpperWaybill = transitOrder.pre_allocated_order_no != 1 && transitOrder.pre_allocated_order_no != 3 ? "" : (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
DownWaybill = (transitOrder.express_2_company + "-" + transitOrder.express_2_waybill).Trim('-'),
BuyReundStatus = transitOrder.refund_status,
PickUpTime = transitOrder.pickup_time == DateTime.MinValue ? null : transitOrder.pickup_time,
InboundTime = transitOrder.inbound_time,
OutboundTime = transitOrder.outbound_time,
WarehouseId = transitOrder.platform,
WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitOrder.platform) ? TransitWarehouseData.dicWarehouseIdName[transitOrder.platform] : transitOrder.platform,
};
if (!transitDetail.OutOrderId.StartsWith("tb_"))
@@ -116,6 +120,16 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
get { return this.GetValue(x => x.SourceCode); }
set { this.SetValue(x => x.SourceCode, value); }
}
public string WarehouseId
{
get { return this.GetValue(x => x.WarehouseId); }
set { this.SetValue(x => x.WarehouseId, value); }
}
public string WarehouseName
{
get { return this.GetValue(x => x.WarehouseName); }
set { this.SetValue(x => x.WarehouseName, value); }
}
/// <summary> 取号时间((中转单)创建时间) </summary>
public DateTime? PickUpTime
{
@@ -209,7 +223,7 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
public Visibility DownWaybillVisibility
{
get { return this.GetValue(x => x.DownWaybillVisibility); }
private set { this.SetValue(x => x.DownWaybillVisibility, value); }
set { this.SetValue(x => x.DownWaybillVisibility, value); }
}
public DateTime? InboundTime
@@ -220,7 +234,7 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
public string InboundTimeStr
{
get { return this.GetValue(x => x.InboundTimeStr); }
private set { this.SetValue(x => x.InboundTimeStr, value); }
set { this.SetValue(x => x.InboundTimeStr, value); }
}
public DateTime? OutboundTime
{
@@ -230,6 +244,6 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
public string OutboundTimeStr
{
get { return this.GetValue(x => x.OutboundTimeStr); }
private set { this.SetValue(x => x.OutboundTimeStr, value); }
set { this.SetValue(x => x.OutboundTimeStr, value); }
}
}