diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
index 5cfbef3..dc1da95 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
@@ -2135,7 +2135,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
private async void borderWarehouseStatas_MouseUp(object sender, MouseButtonEventArgs e)
{
- return;
+ //return;
if (this.DataContext is oms_wei_order_item_info orderItem)
{
oms_wei_order_item_transit_info transitInfo = new oms_wei_order_item_transit_info()
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml
index a878279..a95a542 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml
@@ -137,7 +137,7 @@
BorderThickness="0"
FontWeight="Normal"
IsReadOnly="True"
- Text="{Binding WxOrderId}"
+ Text="{Binding WarehouseStatus}"
TextWrapping="Wrap" />
@@ -146,7 +146,7 @@
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
- Text="{Binding PickUpTimeStr}"
+ Text="{Binding UpperWaybill}"
TextWrapping="Wrap" />
@@ -155,12 +155,51 @@
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
+ Text="{Binding DownWaybill}"
+ TextWrapping="Wrap" />
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs b/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs
index 3dff0ec..3404bdf 100644
--- a/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs
+++ b/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs
@@ -30,8 +30,9 @@ namespace _29WxOrderWpf.Windows.OrderWindows
public partial class TransitAfterSaleWindow : BaseWindow
{
public oms_wei_order_item_info OrderItem { get; set; }
+ public oms_wei_external_procurement_log_info TransitOrder { get; set; } = null;
- public TransitAfterSaleWindow(oms_wei_order_item_info orderItem)
+ public TransitAfterSaleWindow(oms_wei_order_item_info orderItem)
{
InitializeComponent();
@@ -54,9 +55,24 @@ namespace _29WxOrderWpf.Windows.OrderWindows
if (OrderItem != null)
{
- this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == OrderItem.ItemTransitOrderWithVoid?.platform)?.TransName;
- this.txtExpressName.Text = OrderItem.ItemTransitOrder?.express_2_company ?? OrderItem.ItemTransitOrderWithVoid?.express_2_company;
- this.txtWarehouseWaybill.Text = OrderItem.ItemTransitOrder?.express_2_waybill ?? OrderItem.ItemTransitOrderWithVoid?.express_2_waybill;
+ if (TransitOrder == null)
+ {
+ if (OrderItem.ItemTransitOrder != null)
+ TransitOrder = OrderItem.ItemTransitOrder;
+ else
+ TransitOrder = OrderItem.ItemTransitOrderWithVoid;
+ }
+ this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == TransitOrder?.platform)?.TransName;
+ this.txtExpressName.Text = TransitOrder?.express_2_company;
+ this.txtWarehouseWaybill.Text = TransitOrder?.express_2_waybill;
+ if (this.txtExpressName.Text.IsNullOrEmpty())
+ {
+ this.txtExpressName.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.outExpressCompanyCode;
+ }
+ if (this.txtWarehouseWaybill.Text.IsNullOrEmpty())
+ {
+ this.txtWarehouseWaybill.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.tracking_number;
+ }
if (OrderItem.ItemTransitOrderAfterSale != null)
{
@@ -73,8 +89,8 @@ namespace _29WxOrderWpf.Windows.OrderWindows
else
{
// 需要手动申请售后的，先去申请售后再提交拦截退回总店
- if (!string.IsNullOrEmpty(OrderItem.ItemTransitOrderWithVoid?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
- OrderItem.TransitRefundStatusStr.Contains("需手动申请售后") || OrderItem.TransitRefundStatusStr.Contains("待用户发货"))
+ if (!string.IsNullOrEmpty(TransitOrder?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
+ (OrderItem.TransitRefundStatusStr.Contains("需手动申请售后") || OrderItem.TransitRefundStatusStr.Contains("待用户发货")))
{
btnAdd.IsEnabled = false;
imgLoading.Visibility = Visibility.Visible;
@@ -89,7 +105,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
btnAdd.IsEnabled = true;
}
- if (OrderItem.PddBuyerAfterSale?.orderSn == OrderItem.ItemTransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress))
+ if (OrderItem.PddBuyerAfterSale?.orderSn == TransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress))
{
txtAddressAnalysis.Text = OrderItem.PddBuyerAfterSale?.afterSaleAddress;
btnAddressAnalysis_Click(null, null);
@@ -107,8 +123,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
}
}
- //if (OrderItem?.ItemTransitOrder?.warehouse_status != 0 && OrderItem?.ItemTransitOrder?.warehouse_status != 1)
- ////if (OrderItem?.ItemTransitOrderWithVoid?.warehouse_status != 0 && OrderItem?.ItemTransitOrderWithVoid?.warehouse_status != 1)
+ //if (TransitOrder?.warehouse_status != 0 && TransitOrder?.warehouse_status != 1)
//{
// btnAdd.IsEnabled = false;
// //BaseMsgWindow.ShowError("当前订单仓库状态不支持售后，请联系买家直接退回总店！");
@@ -116,7 +131,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
// return;
//}
- if ((OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1)
+ if ((TransitOrder?.warehouse_status).ParseToInt() < 1)
{
//btnAdd.IsEnabled = false;
//lblMsg.Content = "当前订单仓库状态不支持拦截退回总店，建议联系买家直接退回总店！";
@@ -151,7 +166,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
JObject data = new JObject();
data["orderNo"] = OrderItem.order_id;
- data["orderCode"] = OrderItem.ItemTransitOrderWithVoid?.order_code;
+ data["orderCode"] = TransitOrder?.order_code;
data["refundProvince"] = txtProvince.Text.Trim();
data["refundCity"] = txtCity.Text.Trim();
data["refundCounty"] = txtCounty.Text.Trim();
@@ -249,9 +264,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
public string AddWorkOrder()
{
- if (OrderItem.ItemTransitOrder?.warehouse_status == 3)
- return "\"success\":true,\"message\":\"已到仓，无需拦截工单\"";
- if (OrderItem.ItemTransitOrderWithVoid?.warehouse_status == 3)
+ if (TransitOrder?.warehouse_status == 3)
return "\"success\":true,\"message\":\"已到仓，无需拦截工单\"";
string url = HttpResponseTransitWorkOrderBLL.WorkOrderUrl + "/api/open/v1/customer-work-orders/intercept-return-cloud-warehouse-after-outbound";
@@ -259,7 +272,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
obj["appId"] = this.OrderItem.Shop?.ShopId;
obj["wechatOrderNo"] = this.OrderItem.order_id;
//obj["purchaseOrderNo"] = this.OrderItem.PddBuyerAfterSale?.orderSn;
- obj["purchaseOrderNo"] = OrderItem.ItemTransitOrderWithVoid?.order_code;
+ obj["purchaseOrderNo"] = TransitOrder?.order_code;
obj["creator"] = BaseClass.UserName;
obj["remark"] = "客户要求拦截并退回云仓";
diff --git a/AllBase/Model/DBModel/TransitWarehouseParam.cs b/AllBase/Model/DBModel/TransitWarehouseParam.cs
index afb547b..54cddac 100644
--- a/AllBase/Model/DBModel/TransitWarehouseParam.cs
+++ b/AllBase/Model/DBModel/TransitWarehouseParam.cs
@@ -43,6 +43,26 @@ namespace AllBase.Model.DBModel
public class TransitWarehouseData
{
+ public static Dictionary dicWarehouseIdName = new Dictionary()
+ {
+ { "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号国际物流园
diff --git a/AllBase/Model/DBModel/oms_wei_order_item_transit_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_transit_info.cs
index 6a7ec64..d357054 100644
--- a/AllBase/Model/DBModel/oms_wei_order_item_transit_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_item_transit_info.cs
@@ -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); }
+ }
/// 取号时间((中转单)创建时间)
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); }
}
}