修复部分拍单问题 优化拍单显示

This commit is contained in:
wule_5900x committed 2026-07-13 10:19:19 +08:00
1 parent 87c1b8fc79
commit 5571d227c8
13 files changed
+273 -108

No files matched your search

@@ -173,7 +173,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
var url1 = BaseClass.Build29WxObjString("order/get_erp_order_item_list");
var data1 = UserLogin.GetSignaturex();
data1 += "&erp_order_id_in=" + order_ids;
data1 += "&page_size=" + 1000;
data1 += "&page_size=" + 2000;
var html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
html1 = GetHtml.PostUtf8(url1, data1);
@@ -255,7 +255,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
// 读取关联拍单商品
var urlMap = BaseClass.Build29WxObjString("order/wx_get_buy_prod_map");
var dataMap = UserLogin.GetSignaturex()
+ "&spu_codes=" + string.Join(",", orderItems.Select(oi => oi.out_product_id)) + "," + string.Join(",", orderItems.Select(oi => oi.product_id));
+ "&spu_codes=" + string.Join(",", orderItems.Select(oi => GetHtml.UrlEncodeUtf8(oi.out_product_id))) + "," + string.Join(",", orderItems.Select(oi => oi.product_id));
dataMap += "&main_user_name=" + BaseClass.MainUserName;
var resultMap = GetHtml.PostUtf8(urlMap, dataMap);
if (string.IsNullOrEmpty(resultMap) || !resultMap.Contains("\"code\":200"))
@@ -282,7 +282,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
Dispatcher.Invoke(new Action(() =>
{
order = JsonHelper.DeserializeJsonToObject<oms_wei_order_info>(JsonHelper.SerializeObject(jObj));
if (order.order_id == "3737398647233862400")
if (order.order_id == "3737596572558051840")
{
}
@@ -354,7 +354,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
Dispatcher.Invoke(new Action(() =>
{
disPlayOrderTabCount();
disPlayOrderTabOrderCount();
}));
var totalCount = BaseRegex.GetIntJson(ref html, "count");
@@ -374,37 +374,39 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}));
}
public void disPlayOrderTabCount()
public void disPlayOrderTabOrderCount()
{
var tabItem = this.tabOrderType.Items.Cast<TabItem>().FirstOrDefault(t => t.Header.ParseToString().StartsWith("待采购"));
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o, false)));
var tabItems = this.tabOrderType.Items.Cast<TabItem>();
var tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待采购"));
if (tabItem != null)
{
tabItem.Header = "待采购(" + GlobalConfig.lstOrder.Where(r => r.IsWaitBuy).Count() + ")";
tabItem.Header = "待采购(" + GlobalConfig.lstOrder.Where(r => r.IsWaitBuy).Count() + "|" + filteLstTmp.Where(r => r.IsWaitBuy).Count() + ")";
}
tabItem = this.tabOrderType.Items.Cast<TabItem>().FirstOrDefault(t => t.Header.ParseToString().StartsWith("待发货"));
tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待发货"));
if (tabItem != null)
{
tabItem.Header = "待发货(" + GlobalConfig.lstOrder.Where(r => r.IsWaitSend).Count() + ")";
tabItem.Header = "待发货(" + GlobalConfig.lstOrder.Where(r => r.IsWaitSend).Count() + "|" + filteLstTmp.Where(r => r.IsWaitSend).Count() + ")";
}
tabItem = this.tabOrderType.Items.Cast<TabItem>().FirstOrDefault(t => t.Header.ParseToString().StartsWith("待收货"));
tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待收货"));
if (tabItem != null)
{
tabItem.Header = "待收货(" + GlobalConfig.lstOrder.Where(r => r.IsWaitReceive).Count() + ")";
tabItem.Header = "待收货(" + GlobalConfig.lstOrder.Where(r => r.IsWaitReceive).Count() + "|" + filteLstTmp.Where(r => r.IsWaitReceive).Count() + ")";
}
tabItem = this.tabOrderType.Items.Cast<TabItem>().FirstOrDefault(t => t.Header.ParseToString().StartsWith("退款单"));
tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("退款单"));
if (tabItem != null)
{
tabItem.Header = "退款单(" + GlobalConfig.lstOrder.Where(r => r.IsRefund).Count() + ")";
tabItem.Header = "退款单(" + GlobalConfig.lstOrder.Where(r => r.IsRefund).Count() + "|" + filteLstTmp.Where(r => r.IsRefund).Count() + ")";
}
tabItem = this.tabOrderType.Items.Cast<TabItem>().FirstOrDefault(t => t.Header.ParseToString().StartsWith("紧急单"));
tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("紧急单"));
if (tabItem != null)
{
tabItem.Header = "紧急单(" + GlobalConfig.lstOrder.Where(r => r.IsEmergency).Count() + ")";
tabItem.Header = "紧急单(" + GlobalConfig.lstOrder.Where(r => r.IsEmergency).Count() + "|" + filteLstTmp.Where(r => r.IsEmergency).Count() + ")";
}
tabItem = this.tabOrderType.Items.Cast<TabItem>().FirstOrDefault(t => t.Header.ParseToString().StartsWith("全部订单"));
tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("全部订单"));
if (tabItem != null)
{
tabItem.Header = "全部订单(" + GlobalConfig.lstOrder.Count() + ")";
tabItem.Header = "全部订单(" + GlobalConfig.lstOrder.Count() + "|" + filteLstTmp.Count() + ")";
}
txtFilterCount.Text = "当前条件共计 " + GlobalConfig.lstFilterOrder.Count() + " 条订单记录";
}
@@ -413,6 +415,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
try
{
if (this.lbxOrder == null)
return;
//foreach (var order in GlobalConfig.lstFilterOrder.ToList())
//{
// if (GetOrderIsFilter(order))
@@ -426,9 +431,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
//}
GlobalConfig.lstFilterOrder = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)));
this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
Dispatcher.Invoke(new Action(() => {
txtFilterCount.Text = "当前条件共计 " + GlobalConfig.lstFilterOrder.Count().ToString() + " 条订单记录";
}));
//Dispatcher.Invoke(new Action(() => {
// txtFilterCount.Text = "当前条件共计 " + GlobalConfig.lstFilterOrder.Count().ToString() + " 条订单记录";
//}));
disPlayOrderTabOrderCount();
}
catch (Exception ex)
{
@@ -458,13 +465,13 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
Dispatcher.Invoke(new Action(() =>
{
disPlayOrderTabCount();
disPlayOrderTabOrderCount();
}));
}
}
bool GetOrderIsFilter(oms_wei_order_info order)
bool GetOrderIsFilter(oms_wei_order_info order, bool isFilterTab = true)
{
if (order == null)
return true;
@@ -484,34 +491,48 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
return true;
}
// 过滤多件商品
if (chkNoMultiOrder.IsChecked.ParseToBool() && order.orderItems.Sum(o => o.sku_cnt) > 1)
{
return true;
}
if (chkOnlyWarehouseOrder.IsChecked.ParseToBool() && order.status >= 30 && order.orderItems.All(oi => oi.ItemTransitOrderWithVoid == null))
{
return true;
}
if (order.createDateTime < dateStart.SelectedDate.Value)
return true;
if (chkEndDate.IsChecked == true && order.createDateTime > dateEnd.SelectedDate.Value)
return true;
if (headerStr.StartsWith("待采购"))
// 过滤标签页
if (isFilterTab)
{
if (!order.IsWaitBuy)
if (headerStr.StartsWith("待采购"))
{
if (!order.IsWaitBuy)
return true;
if (chkMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap == null))
return true;
if (chkNoMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap != null))
return true;
}
if (headerStr.StartsWith("待发货") && !order.IsWaitSend)
{
return true;
if (chkMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap == null))
}
if (headerStr.StartsWith("待收货") && !order.IsWaitReceive)
{
return true;
if (chkNoMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap != null))
}
if (headerStr.StartsWith("退款单") && !order.IsRefund)
{
return true;
}
if (headerStr.StartsWith("待发货") && !order.IsWaitSend)
{
return true;
}
if (headerStr.StartsWith("待收货") && !order.IsWaitReceive)
{
return true;
}
if (headerStr.StartsWith("退款单") && !order.IsRefund)
{
return true;
}
if (headerStr.StartsWith("紧急单") && !order.IsEmergency)
{
return true;
}
if (headerStr.StartsWith("紧急单") && !order.IsEmergency)
{
return true;
}
}
return false;
@@ -665,5 +686,16 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
IsAutoReadOrder = chkAutoReadOrder.IsChecked == true;
}
private void TabItem_SizeChanged(object sender, SizeChangedEventArgs e)
{
var tabItems = this.tabOrderType.Items.Cast<TabItem>();
wpFilter.Margin = new Thickness(tabItems.Sum(t => t.ActualWidth) + 20, 6, 0, 0);
}
private void chkSubFilterSonditions_Checked(object sender, RoutedEventArgs e)
{
FilterOrders();
}
}
}