中转仓补发包裹

This commit is contained in:
wule committed 2026-09-24 22:03:52 +08:00
1 parent 02294e0ef6
commit 661f8c052e
10 files changed
+595 -9

No files matched your search

@@ -931,6 +931,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (order.order_sn == "260923-399088033421688")
{
}
if (order.ShopOrderIdStr == "3739357317247975936")
{
}
if (isUpdate && !string.IsNullOrEmpty(order.ShopOrderIdStr)/* && order.WxSendTypeStr != "直发"*/)
{
@@ -2136,6 +2140,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (shop == null)
throw new Exception("买手单对应店铺不存在!");
if (order.ShopOrderIdStr == "3739357317247975936")
{
}
var apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(shop, order.ShopOrderIdStr, 100);
if (!apiSearchDropship.Contains("\"errcode\":0"))
throw new Exception("同步单代发查询失败!" + BaseRegex.GetStringJson(ref apiSearchDropship, "msg"));
@@ -2167,6 +2177,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var html = GetHtml.PostUtf8(url, data);
if (!html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
// 更新拍单余额
StartUp.UpdateBalance();
}
else
{
@@ -294,6 +294,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
// 读取中转仓拍单订单
var transitOrderList = GetTransitWarehouseList(order_ids);
// 额外订单包裹补发
var transitExtraPackageList = GetTransitExtraPackageList(order_ids);
// 读取中转仓拍单订单售后状态
var transitAfterSaleList = GetTransitWarehouseAfterSaleList(order_ids);
@@ -363,6 +366,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
// 中转仓退货包裹订单
item.ItemTransitOrderAfterSales = transitAfterSaleList.Where(a => item.ItemTransitOrders.Any(t => t.out_order_no == a.order_code)).ToList();
item.DistribReturnOrderInfos = transitReturnOrderList.Where(tr => tr.order_code_source == item.order_id).ToList();
item.ItemTransitExtraOrders = transitExtraPackageList.Where(p => item.ItemTransitOrders.Any(t => t.order_code == p.order_code)).ToList();
// 中转仓买手订单(wx_send_type等于0)
item.PddBuyerOrders = pddBuyerOrders.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 0).ToList();
@@ -595,6 +599,33 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
return new List<oms_wei_external_procurement_log_info>();
}
public static List<oms_wei_transfer_extra_package> GetTransitExtraPackageList(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_transfer_extra_package>();
var url3 = BaseClass.Build29WxObjString("order/wx_get_transfer_extra_package");
var data3 = UserLogin.GetSignaturex();
data3 += "&order_no=" + order_ids;
var html3 = GetHtml.PostUtf8(url3, data3);
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
html3 = GetHtml.PostUtf8(url3, data3);
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单读取失败 " + BaseRegex.GetStringJson(ref html3, "msg"), "Error", 5);
}
List<oms_wei_transfer_extra_package> transitExtraPackageList = new List<oms_wei_transfer_extra_package>();
try
{
transitExtraPackageList = JsonHelper.DeserializeJsonToList<oms_wei_transfer_extra_package>(JObject.Parse(html3)["data"].ParseToString());
return transitExtraPackageList;
}
catch
{
}
return new List<oms_wei_transfer_extra_package>();
}
public static List<oms_wei_external_procurement_after_sale_info> GetTransitWarehouseAfterSaleList(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
@@ -39,9 +39,9 @@
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="2" />
<RowDefinition Height="0" />
<RowDefinition Height="*" />
<RowDefinition Height="2" />
<RowDefinition Height="0" />
</Grid.RowDefinitions>
<Grid
x:Name="gridListItem"
@@ -831,6 +831,31 @@
</WrapPanel>
</wpf:TitleContent>
<!-- 仓库物流 -->
<wpf:TitleContent Title="补发物流:" Visibility="{Binding TransitExtraPackageWaybillStr, Converter={StaticResource HasTextVisibility}}">
<WrapPanel>
<uc:UcWaterMarkTextBox1
Margin="-2,0"
Padding="0"
VerticalAlignment="Center"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding TransitExtraPackageWaybillStr}"
TextWrapping="Wrap"
WaterMark="补发物流" />
<Button
x:Name="btnVoidTransitExtraOrder"
Margin="4,0,0,0"
Padding="0,0,0,0"
d:Content="作废"
Click="btnVoidTransitExtraOrder_Click"
Content="{Binding TransitExtraPackageWaybillBtnStr}"
Style="{StaticResource LinkButton}"
Visibility="{Binding TransitExtraPackageWaybillBtnStr, Converter={StaticResource HasTextVisibility}}" />
</WrapPanel>
</wpf:TitleContent>
<!-- 外采买手 -->
<wpf:TitleContent Title="外采买手:" Visibility="{Binding ItemOrder.out_account, Converter={StaticResource HasTextVisibility}}">
<WrapPanel Orientation="Horizontal">
@@ -1433,12 +1458,13 @@
HorizontalAlignment="Right"
VerticalAlignment="Center"
Orientation="Vertical"
VerticalSpacing="4">
VerticalSpacing="3">
<Button
x:Name="btnChangeWaybill"
Height="22"
MinWidth="38"
MinHeight="20"
Margin="0,0,0,0"
Padding="0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnChangeWaybill_Click"
@@ -1448,7 +1474,7 @@
<Button
x:Name="btnAddEditTransitWarehouseReject_New"
MinWidth="38"
MinHeight="22"
MinHeight="20"
Margin="0,0,0,0"
Padding="0"
HorizontalAlignment="Center"
@@ -1463,7 +1489,7 @@
<Button
x:Name="btnAddEditTransitWarehouseAfterSale_n1"
MinWidth="38"
MinHeight="22"
MinHeight="20"
Margin="0,0,0,0"
Padding="0"
Click="btnAddEditTransitWarehouseAfterSale_Click"
@@ -1476,7 +1502,7 @@
<Button
x:Name="btnAddEditTransitWarehouseAfterSale_n2"
MinWidth="38"
MinHeight="22"
MinHeight="20"
Margin="0,0,0,0"
Padding="0"
Click="btnAddEditTransitWarehouseAfterSale_Click"
@@ -1486,6 +1512,19 @@
出库拦截<LineBreak />
退回仓库</TextBlock>
</Button>
<Button
x:Name="btnTransitExtraPackages"
Height="20"
MinWidth="38"
Margin="0,0,0,0"
Padding="0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnTransitExtraPackages_Click"
Content="滞留补发买家"
FontSize="11"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsShowTransitExtraPackagesBtn, Converter={StaticResource VisibleToVisibilityConverter}}" />
</wpf:SpacingStackPanel>
</wpf:SpacingStackPanel>
</Grid>
@@ -9,6 +9,7 @@ using _29WxOrderWpf.Windows.OrderWindows;
using AllBase;
using AllBase.Helper;
using AllBase.Model;
using AllBase.Model.Config;
using AllBase.Model.DBModel;
using AllBase.Model.Result;
using CefSharp.DevTools.DOM;
@@ -17,6 +18,7 @@ using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Security.Policy;
using System.Text;
using System.Threading;
@@ -1748,6 +1750,81 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
}
private void btnTransitExtraPackages_Click(object sender, RoutedEventArgs e)
{
if (this.DataContext is oms_wei_order_item_info orderItem)
{
// 不是中转仓,直接返回
var transitOrder = orderItem.ItemTransitOrder ?? orderItem.ItemTransitOrderWithVoid;
if (transitOrder == null)
{
BaseMsgWindow.ShowError("非中转仓订单不支持补发!");
return;
}
// string msg = $@"
//         滞留补发买家
//说  明:总店未在90小时到仓导致快递停滞退回, 货物
//     滞留云仓,可用补发继续发给买家。
//收  费:(与云仓发货价格一样)";
// if (BaseMsgWindow.ShowConfirm(msg, "滞留补发买家", null, MsgWindowLevel.LARGE, 300).DialogResult != true)
// return;
// string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (orderItem.ItemOrder?.province_name).ParseToString().Contains(pk));
// decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
// JObject body = new JObject();
// body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString();
// body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString();
// body["packType"] = "2";
// body["batchId"] = orderItem.order_id + "-" + DateTime.Now.ToString("yyMMddHHmmss");
// body["orderNo"] = orderItem.order_id;
// body["orderCode"] = transitOrder.order_code;
// body["logisticsCode"] = transitOrder.express_2_company;
// body["logisticsExpressCode"] = transitOrder.express_2_waybill;
// body["accountUser"] = BaseClass.UserName;
// body["purchaserNote"] = "测试订单13017678999";//采购人备注
// body["orderPlatformCode"] = "WEISHOP";
TransitExtraPackagesView transitExtraPackagesView = new TransitExtraPackagesView(orderItem.ItemOrder, orderItem);
new DialogWindow()
{
Title = "滞留补发买家",
Content = transitExtraPackagesView,
}.ShowDialog();
}
}
private async void btnVoidTransitExtraOrder_Click(object sender, RoutedEventArgs e)
{
if (this.DataContext is oms_wei_order_item_info orderItem && orderItem.ItemTransitExtraOrder.order_void_status != 1)
{
if (BaseMsgWindow.ShowConfirm("确定作废滞留补发包裹?").DialogResult != true)
return;
var data = new JObject();
data["batchId"] = orderItem.ItemTransitExtraOrder.batchId;
data["orderCode"] = orderItem.ItemTransitExtraOrder.order_code;
var dataStr = JsonHelper.SerializeObject(data);
var url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/extraOrders/void";
var rst = HttpResponseWXBLL.e57PostResponse(url, dataStr, "");
if (BaseRegex.GetStringXml(ref rst, "code") != "0" && BaseRegex.GetStringXml(ref rst, "code") != "200")
{
BaseMsgWindow.ShowError(BaseRegex.GetStringXml(ref rst, "msg"));
return;
}
await Task.Run(() =>
{
StartUp.UpdateBalance();
});
orderItem.ItemTransitExtraOrder.order_void_status = 1;
orderItem.SetOrderItemTextProperty();
MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.order_id);
}
}
}
}