1显示最新一条物流信息和展示完整物流轨迹 2优化订单48小时或72小时过滤逻辑
This commit is contained in:
1 parent
f3fa093709
commit
db6774dbda
12 files changed
+749
-33
No files matched your search
@@ -102,17 +102,31 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
{
|
||||
// 回填库内信息
|
||||
btnAdd.Content = "创 建";
|
||||
txtProvince.Text = OrderItem.DistribReturnOrderInfo.receiver_province;
|
||||
txtCity.Text = OrderItem.DistribReturnOrderInfo.receiver_city;
|
||||
txtCounty.Text = OrderItem.DistribReturnOrderInfo.receiver_area;
|
||||
txtDetailAddress.Text = OrderItem.DistribReturnOrderInfo.receiver_address;
|
||||
txtUser.Text = OrderItem.DistribReturnOrderInfo.receiver_name;
|
||||
txtMobile.Text = OrderItem.DistribReturnOrderInfo.receiver_phone;
|
||||
if (OrderItem.DistribReturnOrderInfo != null)
|
||||
{
|
||||
txtProvince.Text = OrderItem.DistribReturnOrderInfo.receiver_province;
|
||||
txtCity.Text = OrderItem.DistribReturnOrderInfo.receiver_city;
|
||||
txtCounty.Text = OrderItem.DistribReturnOrderInfo.receiver_area;
|
||||
txtDetailAddress.Text = OrderItem.DistribReturnOrderInfo.receiver_address;
|
||||
txtUser.Text = OrderItem.DistribReturnOrderInfo.receiver_name;
|
||||
txtMobile.Text = OrderItem.DistribReturnOrderInfo.receiver_phone;
|
||||
}
|
||||
}
|
||||
|
||||
if (OrderItem.AddEditTransitWarehouseReturnOrderStr == "已创建未到仓" || OrderItem.AddEditTransitWarehouseReturnOrderStr == "已到仓" ||
|
||||
OrderItem.AddEditTransitWarehouseReturnOrderStr == "已发回")
|
||||
btnAdd.IsEnabled = false;
|
||||
{
|
||||
btnAdd.IsEnabled = btnAddressAnalysis.IsEnabled = false;
|
||||
if (OrderItem.DistribReturnOrderInfo != null)
|
||||
{
|
||||
txtProvince.Text = OrderItem.DistribReturnOrderInfo.receiver_province;
|
||||
txtCity.Text = OrderItem.DistribReturnOrderInfo.receiver_city;
|
||||
txtCounty.Text = OrderItem.DistribReturnOrderInfo.receiver_area;
|
||||
txtDetailAddress.Text = OrderItem.DistribReturnOrderInfo.receiver_address;
|
||||
txtUser.Text = OrderItem.DistribReturnOrderInfo.receiver_name;
|
||||
txtMobile.Text = OrderItem.DistribReturnOrderInfo.receiver_phone;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -134,6 +148,11 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
BaseMsgWindow.ShowError("缺少收货人信息!");
|
||||
return;
|
||||
}
|
||||
if (txtUser.Text.Trim().Length > 15)
|
||||
{
|
||||
BaseMsgWindow.ShowError("收货人姓名长度不能超过15!");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
JObject jObj = new JObject();
|
||||
|
||||
Reference in new issue
Block a user