diff --git a/29WxOrderWpf/29WxOrderWpf.csproj b/29WxOrderWpf/29WxOrderWpf.csproj
index 45a19db..42cb098 100644
--- a/29WxOrderWpf/29WxOrderWpf.csproj
+++ b/29WxOrderWpf/29WxOrderWpf.csproj
@@ -71,5 +71,10 @@
+
+
+ Code
+
+
diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderCtrl.xaml b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderCtrl.xaml
index 3f84585..b50f9cc 100644
--- a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderCtrl.xaml
@@ -72,217 +72,335 @@
ResizeBehavior="PreviousAndNext"
ShowsPreview="True" />
-
+
+
+
+
+
+
+
- 店铺商品信息：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ 店铺商品信息：
+
+
+
-
-
-
-
-
- 买手拍单信息：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Title="店铺SKUID："
+ TitleHorizontalAlignment="Right"
+ TitleWidth="{Binding ElementName=tcShopGoodsName, Path=TitleWidth}">
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+ 买手拍单信息：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+ 关联商品信息：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderCtrl.xaml.cs
index ee86dc0..2a9831a 100644
--- a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderCtrl.xaml.cs
@@ -62,4 +62,9 @@ public partial class TaobaoBuyOrderCtrl : UserControl
ViewModel.ReloadCommand.Execute(null);
}
}
+
+ private void cmbTransitWarehouse_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+
+ }
}
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
index 2cb0bf2..84741f1 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
@@ -497,6 +497,24 @@
Content="同步订单"
Style="{StaticResource BasePageButtonStyle}"
ToolTip="同步选中的订单或选中的店铺" />
+
+
{
@@ -2310,7 +2319,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
// 退货地址不是退货仓，跳过
- if (orderItem.ItemRefund?.return_detail.StartsWith(GlobalConfig.TransitReturnOrderReturnAddress) == false)
+ if (orderItem.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) != true)
continue;
if (orderItem.DistribReturnOrderInfo == null || orderItem.DistribReturnOrderInfo.warehouse_status == 0)
@@ -2360,7 +2369,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
// 退货地址不是退货仓，跳过
- if (orderItem.ItemRefund?.return_detail.StartsWith(GlobalConfig.TransitReturnOrderReturnAddress) == false)
+ if (orderItem.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) != true)
continue;
// 退货包裹未发货，跳过（仅退货退款已发货的才自动去申请拼多多退货退款）
if ((orderItem.ItemRefund?.return_waybill_id).IsNullOrEmpty())
@@ -3013,6 +3022,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
GlobalConfig.BuyConfig.IsSyncDirectBuyOrderWaybill = chkSyncDirectOrderWaybill.IsChecked.ParseToBool();
StartUp.SaveBuyConfig();
}
+
+ private void chkNoPickupNumOrder_Click(object sender, RoutedEventArgs e)
+ {
+ chkNoPickupNumOrderIsChecked = chkNoPickupNumOrder.IsChecked.ParseToBool();
+ FilterOrders();
+ }
}
public class OrderFilterConfig : PropertyNotifyObject
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
index bb04fa4..9e97f12 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
@@ -1047,6 +1047,8 @@
TextWrapping="Wrap"
WaterMark="取件码" />
+
+
+
+
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
index ce6f4d9..49adf09 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
@@ -1925,6 +1925,19 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
MainWindow.Instance.pddBuyerOrderReadCtrl.SendAsyncWaybillOrder(orderLiteInfo, true);
}
}
+
+ private void btnEditPickNo_Click(object sender, RoutedEventArgs e)
+ {
+ if (this.DataContext is oms_wei_order_item_info orderItem)
+ {
+ ChangePickNoView changeWaybillView = new ChangePickNoView(orderItem);
+ new DialogWindow()
+ {
+ Title = "填写取件码",
+ Content = changeWaybillView,
+ }.ShowDialog();
+ }
+ }
}
}
diff --git a/29WxOrderWpf/ViewModels/ChangePickNoViewModel.cs b/29WxOrderWpf/ViewModels/ChangePickNoViewModel.cs
new file mode 100644
index 0000000..f94b4a1
--- /dev/null
+++ b/29WxOrderWpf/ViewModels/ChangePickNoViewModel.cs
@@ -0,0 +1,117 @@
+using _29WxOrderWpf.BaseWindows;
+using _29WxOrderWpf.Commands;
+using AllBase;
+using AllBase.Model.DBModel;
+using AllBase.Model.MvvmBaseClasses;
+using AllBase.Model.Result;
+using NaiBa.Util.Extension;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Threading;
+using Work;
+using Work._29Tools.BLL;
+using Work._29Tools.Forms.ShopForms;
+
+namespace _29WxOrderWpf.ViewModels
+
+{
+ ///
+ /// 更改运单号ViewModel
+ ///
+ public class ChangePickNoViewModel : PropertyNotifyObject
+ {
+ public oms_wei_order_item_info OrderItem
+ {
+ get { return this.GetValue(x => x.OrderItem); }
+ set { this.SetValue(x => x.OrderItem, value); }
+ }
+ public string PickNo
+ {
+ get { return this.GetValue(x => x.PickNo); }
+ set { this.SetValue(x => x.PickNo, value); }
+ }
+ public bool IsChangeingPickNo
+ {
+ get { return this.GetValue(x => x.IsChangeingPickNo); }
+ set { this.SetValue(x => x.IsChangeingPickNo, value); }
+ }
+
+ ///
+ /// 请求关闭窗口
+ ///
+ public event Action RequestClose;
+
+ #region 命令
+
+ public ICommand ChangePickNoCommand { get; }
+
+ #endregion
+ private volatile bool _isWindowLoaded = false;
+
+ public ChangePickNoViewModel(oms_wei_order_item_info _orderItem)
+ {
+ OrderItem = _orderItem;
+ IsChangeingPickNo = false;
+ PickNo = (_orderItem?.ItemOrder?.SyncWaybillPickNo).ParseToString();
+ ChangePickNoCommand = new DelegateCommand(ChangePickNo);
+ }
+
+ ///
+ /// 窗口加载完成时调用
+ ///
+ public void Start()
+ {
+ _isWindowLoaded = true;
+ }
+ ///
+ /// 窗口关闭时调用，停止后台任务
+ ///
+ public void Stop()
+ {
+ _isWindowLoaded = false;
+ }
+
+ public void ChangePickNo()
+ {
+ IsChangeingPickNo = false;
+ string orderId = OrderItem.order_id;
+ ShopLoginInfo shop = OrderItem.Shop;
+ if (string.IsNullOrEmpty(PickNo))
+ {
+ BaseMsgWindow.ShowInfo("取件码不能为空");
+ return;
+ }
+
+ Task.Run(async () =>
+ {
+ var url4 = BaseClass.Build29WxObjString("vlc/UploadPickup");
+ var data4 = UserLogin.GetSignPostData(new
+ {
+ orderId = OrderItem.DirectPddBuyerOrder.order_sn,
+ pickupCode = PickNo,
+ });
+ var html4 = GetHtml.PostJson(url4, data4);
+ if (html4.Contains("\"code\":200"))
+ {
+ Application.Current?.Dispatcher.Invoke(new Action(() =>
+ {
+ OrderItem.ItemOrder.SyncWaybillPickNo = PickNo;
+ IsChangeingPickNo = false;
+ BaseMsgWindow.ShowInfo("修改取件码成功");
+ RequestClose?.Invoke();
+ }));
+ }
+ else
+ {
+ BaseMsgWindow.ShowInfo("修改取件码失败" + BaseRegex.GetStringJson(ref html4, "msg"));
+ }
+ });
+ }
+ }
+}
diff --git a/29WxOrderWpf/Views/ChangePickNoView.xaml b/29WxOrderWpf/Views/ChangePickNoView.xaml
new file mode 100644
index 0000000..16c33f9
--- /dev/null
+++ b/29WxOrderWpf/Views/ChangePickNoView.xaml
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/29WxOrderWpf/Views/ChangePickNoView.xaml.cs b/29WxOrderWpf/Views/ChangePickNoView.xaml.cs
new file mode 100644
index 0000000..1d05721
--- /dev/null
+++ b/29WxOrderWpf/Views/ChangePickNoView.xaml.cs
@@ -0,0 +1,63 @@
+using _29WxOrderWpf.ViewModels;
+using AllBase.Helper;
+using AllBase.Model.DBModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace _29WxOrderWpf.Views;
+
+///
+/// ChangeWaybillView.xaml 的交互逻辑
+///
+public partial class ChangePickNoView : UserControl
+{
+ ///
+ /// 视图模型
+ ///
+ public ChangePickNoViewModel ViewModel { get; }
+
+ public ChangePickNoView(oms_wei_order_item_info _orderItem)
+ {
+ InitializeComponent();
+
+ ViewModel = new ChangePickNoViewModel(_orderItem);
+ ViewModel.RequestClose += ViewModel_RequestClose;
+ DataContext = ViewModel;
+ }
+
+ private void ChangeWaybillView_Loaded(object sender, RoutedEventArgs e)
+ {
+ ViewModel.Start();
+ }
+
+ private void ChangeWaybillView_Closed(object sender, RoutedEventArgs e)
+ {
+ ViewModel.Stop();
+ }
+
+ private void ViewModel_RequestClose()
+ {
+ Window parentWindow = Window.GetWindow(this);
+ if (this.IsLoaded && parentWindow != null)
+ parentWindow.Close();
+
+ MainWindow.Instance.orderListCtrl.FilterOneOrder(ViewModel.OrderItem.ItemOrder);
+ }
+
+ private void Button_Click_1(object sender, RoutedEventArgs e)
+ {
+
+ }
+}
diff --git a/AllBase/Helper/GlobalConfig.cs b/AllBase/Helper/GlobalConfig.cs
index ad56205..1c73399 100644
--- a/AllBase/Helper/GlobalConfig.cs
+++ b/AllBase/Helper/GlobalConfig.cs
@@ -59,6 +59,10 @@ namespace AllBase.Helper
///
public static string TransitReturnOrderReturnAddress { get; set; } = "真如镇街道真北路2653弄F区808号楼";
///
+ /// 默认退货详细地址路和区(用于包含判断)
+ ///
+ public static string TransitReturnOrderReturnAddressLite { get; set; } = "真北路2653弄F区808号楼";
+ ///
/// 订单列表
///
public static ConcurrentList lstOrder { get; set; } = new ConcurrentList();
diff --git a/AllBase/Model/DBModel/oms_wei_order_info.cs b/AllBase/Model/DBModel/oms_wei_order_info.cs
index b1426d7..1039942 100644
--- a/AllBase/Model/DBModel/oms_wei_order_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_info.cs
@@ -139,7 +139,7 @@ namespace AllBase.Model.DBModel
{
//return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
//return this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
- return this.orderItems.All(oi => oi.ItemRefund?.return_detail.StartsWith(GlobalConfig.TransitReturnOrderReturnAddress) == true);
+ return this.orderItems.All(oi => oi.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true);
}
set { }
}
diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
index 8e3e0f5..4c14dfc 100644
--- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
@@ -421,7 +421,7 @@ namespace AllBase.Model.DBModel
// 退货仓退货
AddEditTransitWarehouseReturnOrderStr = "";
- if (ItemRefund?.return_detail.StartsWith(GlobalConfig.TransitReturnOrderReturnAddress) == true)
+ if (ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true)
{
AddEditTransitWarehouseReturnOrderStr = DistribReturnOrderInfo == null ? "未创建" : "已创建";
if (DistribReturnOrderInfo?.warehouse_status == 1)