支持在订单列表页面重试发送同步单功能
This commit is contained in:
1 parent
e1e118cc61
commit
d9c0749093
3 files changed
+34
-13
No files matched your search
@@ -2189,11 +2189,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
|||||||
//{"data":[{"orderId":"260923-399088033421688","trackingNumber":"37300000114322","sourceTrackingNumber":"JT5528345110252"}],"code":200,"msg":"操作成功","isSuccess":true}
|
//{"data":[{"orderId":"260923-399088033421688","trackingNumber":"37300000114322","sourceTrackingNumber":"JT5528345110252"}],"code":200,"msg":"操作成功","isSuccess":true}
|
||||||
//Result<JObject>
|
//Result<JObject>
|
||||||
|
|
||||||
if (html3.Contains("\"code\":200"))
|
if (html3.Contains("\"code\":200") || wxOrder.out_express_no != order.tracking_number)
|
||||||
{
|
{
|
||||||
var mainOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.ShopOrderIdStr);
|
var mainOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.ShopOrderIdStr);
|
||||||
if (mainOrder != null)
|
if (mainOrder != null)
|
||||||
mainOrder.SyncWaybillId = BaseRegex.GetStringJson(ref html3, "trackingNumber");
|
mainOrder.RealSyncWaybillId = mainOrder.SyncWaybillIdInfo = BaseRegex.GetStringJson(ref html3, "trackingNumber");
|
||||||
|
|
||||||
var url = BaseClass.Build29WxObjString("order/wx_update_erp_out_waybill_status");
|
var url = BaseClass.Build29WxObjString("order/wx_update_erp_out_waybill_status");
|
||||||
var data = UserLogin.GetSignaturex();
|
var data = UserLogin.GetSignaturex();
|
||||||
|
|||||||
@@ -980,13 +980,14 @@
|
|||||||
Margin="-2,2,4,2"
|
Margin="-2,2,4,2"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
d:Text="外采物流单号"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
Foreground="{Binding ItemOrder.OutExpressNoBrush}"
|
Foreground="{Binding ItemOrder.OutExpressNoBrush}"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding ItemOrder.OutExpressNoStr}"
|
Text="{Binding ItemOrder.OutExpressNoStr}"
|
||||||
TextWrapping="Wrap"
|
TextWrapping="Wrap"
|
||||||
WaterMark="外采物流" />
|
WaterMark="外采物流的那好" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
x:Name="btnGetDirectWaybillDetail"
|
x:Name="btnGetDirectWaybillDetail"
|
||||||
@@ -998,7 +999,7 @@
|
|||||||
Style="{StaticResource LinkButton}" />
|
Style="{StaticResource LinkButton}" />
|
||||||
</WrapPanel>
|
</WrapPanel>
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
<wpf:TitleContent Title="同步物流:" Visibility="{Binding ItemOrder.SyncWaybillId, Converter={StaticResource HasTextVisibility}}">
|
<wpf:TitleContent Title="同步物流:" Visibility="{Binding ItemOrder.SyncWaybillIdInfo, Converter={StaticResource HasTextVisibility}}">
|
||||||
<WrapPanel Orientation="Horizontal">
|
<WrapPanel Orientation="Horizontal">
|
||||||
<!--<uc:UcWaterMarkTextBox1
|
<!--<uc:UcWaterMarkTextBox1
|
||||||
Margin="-2,2"
|
Margin="-2,2"
|
||||||
@@ -1026,11 +1027,11 @@
|
|||||||
Margin="-2,2,4,2"
|
Margin="-2,2,4,2"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
d:Text="同步物流单"
|
d:Text="物流单"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding ItemOrder.SyncWaybillId}"
|
Text="{Binding ItemOrder.SyncWaybillIdInfo}"
|
||||||
TextWrapping="Wrap"
|
TextWrapping="Wrap"
|
||||||
WaterMark="同步物流" />
|
WaterMark="同步物流" />
|
||||||
|
|
||||||
@@ -1050,7 +1051,7 @@
|
|||||||
Margin="-2,2,4,2"
|
Margin="-2,2,4,2"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
d:Text="同步单信息"
|
d:Text="报错信息"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
@@ -1058,14 +1059,16 @@
|
|||||||
TextWrapping="Wrap"
|
TextWrapping="Wrap"
|
||||||
WaterMark="同步单信息" />
|
WaterMark="同步单信息" />
|
||||||
|
|
||||||
<!--<Button
|
<Button
|
||||||
x:Name="btnGetSyncWaybillDetail"
|
x:Name="btnTrySendSyncOrder"
|
||||||
Margin="4,0,0,0"
|
Margin="4,0,0,0"
|
||||||
Padding="0,0,0,0"
|
Padding="0,0,0,0"
|
||||||
d:Content="查看"
|
d:Content="发送"
|
||||||
Click="btnGetSyncWaybillDetail_Click"
|
Click="btnTrySendSyncOrder_Click"
|
||||||
Content="{Binding LatestDirectEWaybill.StatusStr}"
|
Content="发送"
|
||||||
Style="{StaticResource LinkButton}" />-->
|
Style="{StaticResource LinkButton}"
|
||||||
|
Tag="{Binding ItemOrder.OutExpressNoStr}"
|
||||||
|
Visibility="{Binding ItemOrder.RealSyncWaybillId, Converter={StaticResource NotHasTextVisibility}}" />
|
||||||
</WrapPanel>
|
</WrapPanel>
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
|
|
||||||
|
|||||||
@@ -1825,6 +1825,24 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.order_id);
|
MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.order_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void btnTrySendSyncOrder_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (this.DataContext is oms_wei_order_item_info orderItem && orderItem.ItemOrder != null && sender is Button btnSendSync && !btnSendSync.Tag.ParseToString().IsNullOrEmpty())
|
||||||
|
{
|
||||||
|
//var orderSn = btnSendSync.Tag.ParseToString();
|
||||||
|
var directOrder = orderItem.DirectPddBuyerOrder;
|
||||||
|
PddBuyerOrderLiteInfo orderLiteInfo = new PddBuyerOrderLiteInfo()
|
||||||
|
{
|
||||||
|
ShopOrderIdStr = orderItem.order_id,
|
||||||
|
WxOrderStatus = orderItem.ItemOrder.status,
|
||||||
|
order_sn = directOrder.order_sn,
|
||||||
|
outExpressCompanyMsg = directOrder.outExpressCompanyCode,
|
||||||
|
tracking_number = directOrder.tracking_number,
|
||||||
|
};
|
||||||
|
MainWindow.Instance.pddBuyerOrderReadCtrl.SendAsyncWaybillOrder(orderLiteInfo, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user