diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs index 33e4ada..a1bf295 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs @@ -2189,11 +2189,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls //{"data":[{"orderId":"260923-399088033421688","trackingNumber":"37300000114322","sourceTrackingNumber":"JT5528345110252"}],"code":200,"msg":"操作成功","isSuccess":true} //Result - 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); 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 data = UserLogin.GetSignaturex(); diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml index d96eac6..ae07a48 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml @@ -980,13 +980,14 @@ Margin="-2,2,4,2" Padding="0" VerticalAlignment="Center" + d:Text="外采物流单号" Background="Transparent" BorderThickness="0" Foreground="{Binding ItemOrder.OutExpressNoBrush}" IsReadOnly="True" Text="{Binding ItemOrder.OutExpressNoStr}" TextWrapping="Wrap" - WaterMark="外采物流" /> + WaterMark="外采物流的那好" />