订单仓库状态优化，调整文件位置

29WxOrder/FactoryExportForms/FactoryExportForm.cs

@@ -18,7 +18,7 @@ using Work;
 using Work.Api;
 using Work.BaseForms;
 using AllBase.Helper;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 
 namespace _29WxOrder.FactoryExportForms
 {

29WxOrder/MainForm.cs

@@ -41,7 +41,7 @@ using Work.Api;
 using Work.BaseForms;
 using Work.BuyUsers;
 using _29WxOrder.MyControl;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using Work._29Tools.BLL;
 
 namespace _29WxOrder

29WxOrder/OrderForms/AfterSaleOrderListForm.cs

@@ -3,7 +3,7 @@ using _29WxOrder.ShopForms;
 using AllBase;
 using AllBase.DouYinModel.Result;
 using AllBase.Helper;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using NaiBa.Util;
 using NaiBa.Util.Helper;

29WxOrder/OrderForms/AfterSaleReturnRefundForm.cs

@@ -1,6 +1,6 @@
 using AllBase;
 using AllBase.Helper;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using DevComponents.DotNetBar;
 using Newtonsoft.Json.Linq;

29WxOrder/OrderForms/BuyOrderForms.cs

@@ -24,7 +24,7 @@ using Work.Api;
 using Work.BaseForms;
 using Work.BuyUsers;
 using Work.Pinduoduo;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 
 namespace _29WxOrder.OrderForms
 {

29WxOrder/OrderForms/BuyOrderListForm.cs

@@ -1,7 +1,7 @@
 using AllBase;
 using AllBase.DouYinModel.Result;
 using AllBase.Helper;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using NaiBa.Util.Extension;
 using Newtonsoft.Json;

29WxOrder/OrderForms/OrderEdit.cs

@@ -1,7 +1,7 @@
 using AllBase;
 using AllBase.DouYinModel.Result;
 using AllBase.Helper;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using Newtonsoft.Json.Linq;
 using System;

29WxOrder/OrderForms/RemarkEditForm.cs

@@ -1,7 +1,7 @@
 using AllBase;
 using AllBase.DouYinModel.Result;
 using AllBase.Helper;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;

29WxOrder/OrderForms/SendOrderListForms.cs

@@ -2,7 +2,7 @@
 using AllBase;
 using AllBase.DouYinModel.Result;
 using AllBase.Helper;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using NaiBa.Util.Extension;
 using Newtonsoft.Json;

29WxOrder/OrderForms/SuccessOrderListForm.cs

@@ -20,7 +20,7 @@ using Work;
 using Work.Api;
 using Work.BaseForms;
 using Work.BuyUsers;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 
 namespace _29WxOrder.OrderForms
 {

29WxOrder/ShopForms/ShopBrower.cs

@@ -19,7 +19,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using Work.BaseForms;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 
 namespace _29WxOrder.ShopForms
 {

29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs

@@ -3,7 +3,7 @@ using _29WxOrderWpf.CefHelper;
 using AllBase;
 using AllBase.Helper;
 using AllBase.Model;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using CefSharp;
 using CefSharp.DevTools.LayerTree;
@@ -431,7 +431,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
         /// 读取中转仓拍单订单
         /// </summary>
         /// <param name="out_order_nos"></param>
-        List<oms_wei_external_procurement_log> GetOrderTransitWarehouseInfo(string out_order_nos)
+        List<oms_wei_external_procurement_log_info> GetOrderTransitWarehouseInfo(string out_order_nos)
         {
             var url3 = BaseClass.Build29WxObjString("order/wx_get_transit_order");
             var data3 = UserLogin.GetSignaturex();
@@ -447,10 +447,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
                 //}));
                 //break;
             }
-            List<oms_wei_external_procurement_log> transitOrderList = new List<oms_wei_external_procurement_log>();
+            List<oms_wei_external_procurement_log_info> transitOrderList = new List<oms_wei_external_procurement_log_info>();
             try 
             { 
-                transitOrderList = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_log>(JObject.Parse(html3)["data"].ParseToString());
+                transitOrderList = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_log_info>(JObject.Parse(html3)["data"].ParseToString());
                 // 直接过滤掉仓库作废单
                 //transitOrderList = transitOrderList.Where(t => t.order_void_status != 1).ToList();
             } 
@@ -557,7 +557,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
             return refunds;
         }
 
-        void UpdateOrderStatus(PddBuyerOrderLiteInfo pdd_order, oms_wei_order_item_info wx_order_item, oms_wei_refund_info wx_refund_item, oms_wei_external_procurement_log wx_transit_order)
+        void UpdateOrderStatus(PddBuyerOrderLiteInfo pdd_order, oms_wei_order_item_info wx_order_item, oms_wei_refund_info wx_refund_item, oms_wei_external_procurement_log_info wx_transit_order)
         {
             pdd_order.ShopOrderIdStr = wx_order_item?.order_id ?? wx_transit_order?.order_no;
             pdd_order.ShopOrderSkuIdStr = wx_order_item?.sku_id ?? wx_transit_order?.order_sku_id;
@@ -586,10 +586,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
                 pdd_order.sendStatus += " 已作废";
             }
             pdd_order.TransitCreateTime = wx_transit_order?.created_time ?? DateTime.MinValue;
+            pdd_order.TransitPickupTime = wx_transit_order?.pickup_time ?? DateTime.MaxValue.AddMonths(-1);
         }
 
 
-        void UpdateAfterSaleStatus(PddBuyerAfterSaleLiteInfo pdd_afterSale, oms_wei_order_item_info wx_order_item, oms_wei_refund_info wx_refund_item, oms_wei_external_procurement_log wx_transit_order)
+        void UpdateAfterSaleStatus(PddBuyerAfterSaleLiteInfo pdd_afterSale, oms_wei_order_item_info wx_order_item, oms_wei_refund_info wx_refund_item, oms_wei_external_procurement_log_info wx_transit_order)
         {
             pdd_afterSale.ShopOrderIdStr = wx_order_item?.order_id ?? wx_transit_order?.order_no;
             pdd_afterSale.ShopOrderSkuIdStr = wx_order_item?.sku_id ?? wx_transit_order?.order_sku_id;
@@ -614,6 +615,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
             // 更新订单中转取号状态
             pdd_afterSale.sendStatus = (pdd_afterSale.TransitOrderStatus + " " + pdd_afterSale.ShopOrderRefundStr).Trim();
             pdd_afterSale.TransitCreateTime = wx_transit_order?.created_time ?? DateTime.MinValue;
+            pdd_afterSale.TransitPickupTime = wx_transit_order?.pickup_time ?? DateTime.MaxValue.AddMonths(-1);
         }
 
 
@@ -740,10 +742,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
                         order.tracking_number = o.tracking_number;
 
                         order.TransitCreateTime = o.TransitCreateTime;
-                        if (o.TransitCreateTime > DateTime.MinValue)
+                        order.TransitPickupTime = o.TransitPickupTime;
-                        {
 
-                        }
                         order.WxOrderCreateTime = o.WxOrderCreateTime;
                         order.ShopOrderIdStr = o.ShopOrderIdStr;
                         order.ShopOrderSkuIdStr = o.ShopOrderSkuIdStr;
@@ -837,6 +837,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
                             pre_allocated_order_no = order.PreAllocatedOrderNoStr.ParseToInt(),
                             tracking_number = order.tracking_number,
                             TransitCreateTime = order.TransitCreateTime,
+                            TransitPickupTime = order.TransitPickupTime,
                             wx_order_id = order.ShopOrderIdStr,
                             wx_sku_id = order.ShopOrderSkuIdStr,
                         };
@@ -853,6 +854,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
                         data3 += "&pre_allocated_order_no=" + pddBuyerOrder.pre_allocated_order_no;
                         data3 += "&tracking_number=" + pddBuyerOrder.tracking_number;
                         data3 += "&TransitCreateTime=" + pddBuyerOrder.TransitCreateTime.ToString("yyyy-MM-dd HH:mm:ss");
+                        data3 += "&TransitPickupTime=" + pddBuyerOrder.TransitPickupTime.ToString("yyyy-MM-dd HH:mm:ss");
                         data3 += "&wx_order_id=" + pddBuyerOrder.wx_order_id;
                         data3 += "&wx_sku_id=" + pddBuyerOrder.wx_sku_id;
                         var html3 = GetHtml.PostUtf8(url3, data3);
@@ -964,6 +966,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
                         afterSale.listItemStatusVO = JsonHelper.DeserializeJsonToObject<ListItemStatusVO>(JsonHelper.SerializeObject(af.listItemStatusVO));
 
                         afterSale.TransitCreateTime = af.TransitCreateTime;
+                        afterSale.TransitPickupTime = af.TransitPickupTime;
                         afterSale.WxOrderCreateTime = af.WxOrderCreateTime;
                         afterSale.ShopOrderIdStr = af.ShopOrderIdStr;
                         afterSale.ShopOrderSkuIdStr = af.ShopOrderSkuIdStr;
@@ -1573,7 +1576,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
             // 修改提前取号
             else if (order.sendStatus == "提前取号" || order.sendStatus == "提前取号(旧订单)")
             {
-                if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
+                if (order.TransitPickupTime.AddHours(23) > DateTime.Now)
+                //if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
                 {
                     order.sendStatus = "提前取号流程进行中";
                     return;

29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs

@@ -1,7 +1,7 @@
 using _29WxOrderWpf.BaseWindows;
 using AllBase;
 using AllBase.Helper;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using System;
 using System.Collections.Generic;

29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml

@@ -188,7 +188,7 @@
         </Grid>
         <Grid x:Name="lstTitle" Grid.Row="2" Margin="8,0,8,0" Background="{StaticResource ListHeadBackColorBrush}">
             <Border BorderThickness="0,0,1,0" BorderBrush="{StaticResource ListHeadBorderColorBrush}">
-                <DataGrid Margin="0,0,30,0" x:Name="dgOrderHeader" Grid.ColumnSpan="100" AutoGenerateColumns="False" CanUserReorderColumns="False"
+                <DataGrid Margin="0,0,28,0" x:Name="dgOrderHeader" Grid.ColumnSpan="100" AutoGenerateColumns="False" CanUserReorderColumns="False"
                       ColumnHeaderHeight="{Binding ElementName=lstTitle, Path=ActualHeight}" BorderThickness="0" 
                       ColumnDisplayIndexChanged="dgOrderHeader_ColumnDisplayIndexChanged"
                       LayoutUpdated="dgOrderHeader_LayoutUpdated">
@@ -217,9 +217,9 @@
                         <DataGridTextColumn Width="95*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="交易时间"/>
                         <DataGridTextColumn Width="75*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="利润"/>
                         <DataGridTextColumn Width="170*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="状态/地址"/>
-                        <DataGridTextColumn Width="110*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="单号"/>
+                        <DataGridTextColumn Width="120*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="单号"/>
                         <DataGridTextColumn Width="120*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="备注"/>
-                        <DataGridTextColumn Width="82*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="    操作"/>
+                        <DataGridTextColumn Width="72*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="    操作"/>
                     </DataGrid.Columns>
                 </DataGrid>
             </Border>

29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs

@@ -5,7 +5,7 @@ using AllBase;
 using AllBase.Extension;
 using AllBase.Helper;
 using AllBase.Model;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using NaiBa.Util.Extension;
 using Newtonsoft.Json.Linq;
 using System;
@@ -208,7 +208,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                 data3 += "&order_no=" + order_ids;
                 var html3 = GetHtml.PostUtf8(url3, data3);
                 if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
-                    GetHtml.PostUtf8(url3, data3);
+                    html3 = GetHtml.PostUtf8(url3, data3);
                 if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
                 {
                     Dispatcher.Invoke(new Action(() =>
@@ -217,15 +217,16 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                     }));
                     break;
                 }
-                List<oms_wei_external_procurement_log> transitOrderList = new List<oms_wei_external_procurement_log>();
+                List<oms_wei_external_procurement_log_info> transitOrderList = new List<oms_wei_external_procurement_log_info>();
                 try 
                 { 
-                    transitOrderList = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_log>(JObject.Parse(html3)["data"].ParseToString());
+                    transitOrderList = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_log_info>(JObject.Parse(html3)["data"].ParseToString());
                     // 直接过滤掉仓库作废单
                     //transitOrderList = transitOrderList.Where(t => t.order_void_status != 1).ToList();
                 } 
                 catch { }
 
+
                 // 读取暂时记录的买手订单，后面想办法放到中转订单库里去
                 // 读取中转仓拍单订单
                 var url4 = BaseClass.Build29WxObjString("order/wx_get_buyer_order_list");
@@ -233,7 +234,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                 data4 += "&wx_order_id_in=" + order_ids;
                 var html4 = GetHtml.PostUtf8(url4, data4);
                 if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
-                    GetHtml.PostUtf8(url4, data4);
+                    html4 = GetHtml.PostUtf8(url4, data4);
                 if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
                 {
                     Dispatcher.Invoke(new Action(() =>
@@ -250,6 +251,29 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                 }
                 catch { }
 
+                // 读取中转仓处理售后单
+                var url5 = BaseClass.Build29WxObjString("order/wx_get_transit_warehouse_aftersale_list");
+                var data5 = UserLogin.GetSignaturex();
+                data5 += "&wx_order_id_in=" + order_ids;
+                var html5 = GetHtml.PostUtf8(url5, data5);
+                if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
+                    html5 = GetHtml.PostUtf8(url5, data5);
+                if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
+                {
+                    Dispatcher.Invoke(new Action(() =>
+                    {
+                        BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
+                    }));
+                    break;
+                }
+                List<oms_wei_external_procurement_after_sale_info> pddTransitAfterSales = new List<oms_wei_external_procurement_after_sale_info>();
+                try
+                {
+                    pddTransitAfterSales = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_after_sale_info>(JObject.Parse(html5)["data"].ParseToString())
+                        .OrderByDescending(p => p.created_time).ToList();
+                }
+                catch { }
+
 
                 // 读取关联拍单商品
                 var urlMap = BaseClass.Build29WxObjString("order/wx_get_buy_prod_map");

29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs

@@ -1,5 +1,5 @@
 using _29WxOrderWpf.BaseWindows;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using NaiBa.Util.Extension;
 using System;
 using System.Collections.Generic;

29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml.cs

@@ -1,6 +1,6 @@
 using _29WxOrderWpf.BaseWindows;
 using AllBase.Helper;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using NaiBa.Util.Extension;
 using System;
 using System.Collections.Generic;

29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml

@@ -19,12 +19,12 @@
                 <ColumnDefinition Width="36"></ColumnDefinition>
                 <ColumnDefinition Width="28"></ColumnDefinition>
                 <ColumnDefinition Width="200*"></ColumnDefinition>
-                <ColumnDefinition Width="100*"></ColumnDefinition>
+                <ColumnDefinition Width="95*"></ColumnDefinition>
-                <ColumnDefinition Width="100*"></ColumnDefinition>
+                <ColumnDefinition Width="75*"></ColumnDefinition>
-                <ColumnDefinition Width="160*"></ColumnDefinition>
+                <ColumnDefinition Width="170*"></ColumnDefinition>
-                <ColumnDefinition Width="100*"></ColumnDefinition>
                 <ColumnDefinition Width="120*"></ColumnDefinition>
-                <ColumnDefinition Width="82*"></ColumnDefinition>
+                <ColumnDefinition Width="120*"></ColumnDefinition>
+                <ColumnDefinition Width="72*"></ColumnDefinition>
             </Grid.ColumnDefinitions>
             <TextBlock Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Converter={StaticResource listBoxIndexConverter}}"
                        HorizontalAlignment="Center" VerticalAlignment="Center"></TextBlock>
@@ -237,7 +237,7 @@
                     <Border x:Name="borderWarehouseStatas" Grid.Row="1" Margin="4,0,0,0" Background="{Binding WarehouseWaybillStatusBackColor}" BorderBrush="{Binding WarehouseWaybillStatusBorderColor}" 
                             BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" Visibility="{Binding WarehouseWaybillStatusStr,Converter={StaticResource HasTextVisibility}}">
                         <TextBox x:Name="txtWarehouseStatus" Grid.Column="1" Margin="2,0,2,1" Foreground="{Binding WarehouseWaybillStatusStrColor}" VerticalContentAlignment="Center" VerticalAlignment="Center" 
-                                 Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding WarehouseWaybillStatusStr}" BorderThickness="0" />
+                                 Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding WarehouseWaybillStatusStr}" BorderThickness="0" MouseEnter="txtWarehouseStatus_MouseEnter"/>
                     </Border>
                     <!--TransitRefundStatusStr-->
                     <!--<Border x:Name="borderWarehouseStatas" Grid.Row="1" Margin="8,0,0,0" Background="{Binding WaybillStatusBackColor}" BorderBrush="{Binding WaybillStatusBorderColor}" 

29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs

@@ -5,7 +5,7 @@ using _29WxOrderWpf.UserControls;
 using AllBase;
 using AllBase.Helper;
 using AllBase.Model;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using CefSharp.DevTools.DOM;
 using NaiBa.Util.Extension;
@@ -48,6 +48,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
             txtOutOrderBuyerStr.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtOutOrderNumStr_MouseLeftButtonUp), true);
             txtOutOrderNumStr.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtOutOrderNumStr_MouseLeftButtonUp), true);
             txtRefundId.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtRefundId_MouseLeftButtonUp), true);
+
+            txtWarehouseStatus.AddHandler(TextBox.MouseEnterEvent, new MouseEventHandler(txtWarehouseStatus_MouseEnter), true);
         }
 
         private void txtRefundId_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
@@ -749,5 +751,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                 }
             }
         }
+
+        private void txtWarehouseStatus_MouseEnter(object sender, MouseEventArgs e)
+        {
+            if (txtWarehouseStatus.ToolTip == null)
+            {
+                if (this.DataContext is oms_wei_order_item_info orderItem)
+                {
+                    if (orderItem.ItemTransitOrderWithVoid.raw_message != null && orderItem.ItemTransitOrderWithVoid.raw_message.Contains("取号异常"))
+                        this.txtWarehouseStatus.ToolTip = orderItem.ItemTransitOrderWithVoid.raw_message;
+                }
+            }
+        }
     }
 }

29WxOrderWpf/Ctrls/ShopCtrls/ShopListCtrl.xaml.cs

@@ -1,6 +1,6 @@
 using _29WxOrderWpf.Utils;
 using AllBase.Helper;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using NaiBa.Util.Extension;
 using System;

29WxOrderWpf/MainWindow.xaml.cs

@@ -6,7 +6,7 @@ using AllBase.DouYinModel.Result;
 using AllBase.Extension;
 using AllBase.Helper;
 using AllBase.Model;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using CefSharp;
 using NaiBa.Util;

AllBase/29WxOrderAllBase.csproj

@@ -167,14 +167,15 @@
     <Compile Include="DouYinModel\Result\DouGoodsInfo.cs" />
     <Compile Include="DouYinModel\Result\DouOrderListInfo.cs" />
     <Compile Include="Model\Config\BuyConfig.cs" />
-    <Compile Include="Model\Local\ErpMerchantInfo.cs" />
+    <Compile Include="Model\DBModel\ErpMerchantInfo.cs" />
-    <Compile Include="Model\Local\oms_wei_external_procurement_log.cs" />
+    <Compile Include="Model\DBModel\oms_wei_external_procurement_after_sale_info.cs" />
-    <Compile Include="Model\Local\order_pdd_buyer_order.cs" />
+    <Compile Include="Model\DBModel\oms_wei_external_procurement_log_info.cs" />
-    <Compile Include="Model\Local\TransitWarehouseParam.cs" />
+    <Compile Include="Model\DBModel\order_pdd_buyer_order.cs" />
-    <Compile Include="Model\Local\WaybillHelper.cs" />
+    <Compile Include="Model\DBModel\TransitWarehouseParam.cs" />
+    <Compile Include="Model\DBModel\WaybillHelper.cs" />
     <Compile Include="Model\Result\PddBuyerAfterSaleLiteInfo.cs" />
     <Compile Include="Model\Result\PddBuyerOrderLiteInfo.cs" />
-    <Compile Include="Model\Local\ShopLoginInfo.cs" />
+    <Compile Include="Model\DBModel\ShopLoginInfo.cs" />
     <Compile Include="DouYinModel\Result\DouSubAccountModel.cs" />
     <Compile Include="DouYinModel\Result\DouYinAfterSaleOrderModel.cs" />
     <Compile Include="DouYinModel\Result\DouYinOrderModel.cs" />
@@ -191,13 +192,13 @@
     <Compile Include="LogSave.cs" />
     <Compile Include="Md5Base.cs" />
     <Compile Include="Model\MvvmBaseClasses\PropertyNotifyObject.cs" />
-    <Compile Include="Model\Local\oms_wei_order_info.cs" />
+    <Compile Include="Model\DBModel\oms_wei_order_info.cs" />
-    <Compile Include="Model\Local\oms_wei_order_item_info.cs" />
+    <Compile Include="Model\DBModel\oms_wei_order_item_info.cs" />
-    <Compile Include="Model\Local\oms_wei_refund_info.cs" />
+    <Compile Include="Model\DBModel\oms_wei_refund_info.cs" />
     <Compile Include="Model\Old\PddMultiBuyerInfo.cs" />
     <Compile Include="Model\Old\PddPifaShopInfo.cs" />
-    <Compile Include="Model\Local\BuyerLoginInfo.cs" />
+    <Compile Include="Model\DBModel\BuyerLoginInfo.cs" />
-    <Compile Include="Model\Local\WXBuyMapInfo.cs" />
+    <Compile Include="Model\DBModel\WXBuyMapInfo.cs" />
     <Compile Include="MultiThreadClient.cs" />
     <Compile Include="OutExcel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

AllBase/BaseClass.cs

@@ -22,7 +22,7 @@ namespace AllBase
         /// 版本ID
         /// </summary>
 
-        public static int VersionCount = 159;
+        public static int VersionCount = 160;
 
         public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
         public static string DebugUrl { get; set; } = "http://localhost:9000";

AllBase/Helper/GlobalConfig.cs

@@ -1,7 +1,7 @@
 using AllBase.DouYinModel.Param.ConfigManage;
 using AllBase.Model;
 using AllBase.Model.Config;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using NaiBa.Util;
 using System;

AllBase/Model/DBModel/BuyerLoginInfo.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media;
 
-namespace AllBase.Model.Local
+namespace AllBase.Model.DBModel
 {
     public class BuyerLoginInfo : PropertyNotifyObject
     {

AllBase/Model/DBModel/ErpMerchantInfo.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AllBase.Model.Local
+namespace AllBase.Model.DBModel
 {
     /// <summary>
     /// erp 账户信息

AllBase/Model/DBModel/ShopLoginInfo.cs

@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media;
 
-namespace AllBase.Model.Local
+namespace AllBase.Model.DBModel
 {
     /// <summary>
     /// 是否已绑定代发仓库

AllBase/Model/DBModel/TransitWarehouseParam.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AllBase.Model.Local
+namespace AllBase.Model.DBModel
 {
     public class TransitWarehouseParam
     {

AllBase/Model/DBModel/WXBuyMapInfo.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AllBase.Model.Local
+namespace AllBase.Model.DBModel
 {
     public class WXBuyMapInfo
     {

AllBase/Model/DBModel/WaybillHelper.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AllBase.Model.Local
+namespace AllBase.Model.DBModel
 {
     public class WaybillHelper
     {

AllBase/Model/DBModel/oms_wei_external_procurement_after_sale_info.cs

@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.DBModel
+{
+    public class oms_wei_external_procurement_after_sale_info
+    {
+        public long id { get; set; }
+        public string order_no { get; set; }
+        /// <summary>
+        /// 订单唯一值：OrderCode (外采单号)
+        /// </summary>
+        public string order_code { get; set; }
+        /// <summary>
+        /// 中转仓售后订单号
+        /// </summary>
+        public string external_order_no { get; set; }
+        /// <summary>
+        /// 售后订单号
+        /// </summary>
+        public string after_sale_no { get; set; }
+        /// <summary>
+        /// 1=转寄，2=换货， 3=退货
+        /// </summary>
+        public int? return_or_exchange { get; set; }
+        /// <summary>
+        /// 退款地址-省
+        /// </summary>
+        public string refund_province { get; set; }
+        /// <summary>
+        /// 退款地址-市
+        /// </summary>
+        public string refund_city { get; set; }
+        /// <summary>
+        /// 退款地址-县/区
+        /// </summary>
+        public string refund_county { get; set; }
+        public string refund_detail_address { get; set; }
+        /// <summary>
+        /// 退款的快递单号
+        /// </summary>
+        public string refund_waybill { get; set; }
+        /// <summary>
+        /// 退货的快递公司
+        /// </summary>
+        public string return_express_company { get; set; }
+        /// <summary>
+        /// 收货人姓名
+        /// </summary>
+        public string recipient_name { get; set; }
+        /// <summary>
+        /// 收货人电话
+        /// </summary>
+        public string recipient_phone { get; set; }
+        /// <summary>
+        /// 原始消息/扩展信息(JSON)
+        /// </summary>
+        public string raw_message { get; set; }
+        /// <summary>
+        /// 售后处理状态，0未处理，1处理中，2已完成，9异常
+        /// </summary>
+        public int? status { get; set; }
+        public DateTime? created_time { get; set; }
+        public DateTime? updated_time { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string create_user { get; set; }
+        /// <summary>
+        /// 更新人
+        /// </summary>
+        public string update_user { get; set; }
+        /// <summary>
+        /// 账户名
+        /// </summary>
+        public string account_user { get; set; }
+        /// <summary>
+        /// 1=入库 2=出库
+        /// </summary>
+        public int? warehouse_status { get; set; }
+        /// <summary>
+        /// 入库时间
+        /// </summary>
+        public DateTime? inbound_time { get; set; }
+        /// <summary>
+        /// 出库时间
+        /// </summary>
+        public DateTime? outbound_time { get; set; }
+        /// <summary>
+        /// 下游快递单号
+        /// </summary>
+        public string downstream_waybill { get; set; }
+        /// <summary>
+        /// 下游快递公司编码
+        /// </summary>
+        public string downstream_express_code { get; set; }
+    }
+}

AllBase/Model/DBModel/oms_wei_external_procurement_log_info.cs

@@ -4,9 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AllBase.Model.Local
+namespace AllBase.Model.DBModel
 {
-    public class oms_wei_external_procurement_log
+    public class oms_wei_external_procurement_log_info
     {
         public string OutOrderNumStr
         {

AllBase/Model/DBModel/oms_wei_order_info.cs

@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
 
-namespace AllBase.Model.Local
+namespace AllBase.Model.DBModel
 {
     public class oms_wei_order_info : PropertyNotifyObject
     {
@@ -96,6 +96,8 @@ namespace AllBase.Model.Local
                 {
                     return true;
                 }
+                else if (orderItems.Any(oi => (oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("取号异常")))
+                    return true;
                 return false;
             }
             set { }

AllBase/Model/DBModel/oms_wei_order_item_info.cs

@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
 
-namespace AllBase.Model.Local
+namespace AllBase.Model.DBModel
 {
     public class oms_wei_order_item_info : PropertyNotifyObject
     {
@@ -79,11 +79,11 @@ namespace AllBase.Model.Local
             set { this.SetValue(x => x.IsBuyGoodsBtnEnabled, value); }
         }
 
-        public List<oms_wei_external_procurement_log> ItemTransitOrders { get; set; } = new List<oms_wei_external_procurement_log>();
+        public List<oms_wei_external_procurement_log_info> ItemTransitOrders { get; set; } = new List<oms_wei_external_procurement_log_info>();
         /// <summary>
         /// 当前仓库订单（不可以是作废单）
         /// </summary>
-        public oms_wei_external_procurement_log ItemTransitOrder
+        public oms_wei_external_procurement_log_info ItemTransitOrder
         {
             get { return ItemTransitOrders.FirstOrDefault(t => t.order_void_status != 1); }
             set { }
@@ -91,7 +91,7 @@ namespace AllBase.Model.Local
         /// <summary>
         /// 当前仓库订单（可以是作废单）
         /// </summary>
-        public oms_wei_external_procurement_log ItemTransitOrderWithVoid
+        public oms_wei_external_procurement_log_info ItemTransitOrderWithVoid
         {
             get { return ItemTransitOrders.FirstOrDefault(); }
             set { }
@@ -251,9 +251,15 @@ namespace AllBase.Model.Local
         {
             get
             {
-                if(order_id == "3737596572558051840")
+                if (ItemTransitOrderWithVoid == null)
-                {
+                    return "";
 
+                if (ItemTransitOrderWithVoid.raw_message.ParseToString().Contains("取号异常"))
+                {
+                    if (ItemTransitOrderWithVoid.raw_message.Contains("超出派送范围"))
+                        return "取号异常-超出派送范围";
+                    else
+                        return "取号异常";
                 }
 
                 if (ItemTransitOrderWithVoid?.warehouse_status == 2)

AllBase/Model/DBModel/oms_wei_refund_info.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media;
 
-namespace AllBase.Model.Local
+namespace AllBase.Model.DBModel
 {
     public class oms_wei_refund_info
     {

AllBase/Model/DBModel/order_pdd_buyer_order.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AllBase.Model.Local
+namespace AllBase.Model.DBModel
 {
     public class order_pdd_buyer_order
     {
@@ -12,6 +12,7 @@ namespace AllBase.Model.Local
         public string wx_order_id { get; set; }
         public string wx_sku_id { get; set; }
         public DateTime TransitCreateTime { get; set; }
+        public DateTime TransitPickupTime { get; set; }
         public int? pre_allocated_order_no { get; set; }
         public string buyerId { get; set; }
         public string buyerName { get; set; }

AllBase/Model/Result/PddBuyerAfterSaleLiteInfo.cs

@@ -170,6 +170,14 @@ namespace AllBase.Model.Result
             get { return this.GetValue(x => x.TransitCreateTime); }
             set { this.SetValue(x => x.TransitCreateTime, value); }
         }
+        /// <summary>
+        /// 中转单取号时间
+        /// </summary>
+        public DateTime TransitPickupTime
+        {
+            get { return this.GetValue(x => x.TransitPickupTime); }
+            set { this.SetValue(x => x.TransitPickupTime, value); }
+        }
 
 
         public string ProdInfoStr

AllBase/Model/Result/PddBuyerOrderLiteInfo.cs

@@ -1,4 +1,4 @@
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.MvvmBaseClasses;
 using NaiBa.Util.Extension;
 using NaiBa.Util.Model;
@@ -39,8 +39,6 @@ namespace AllBase.Model.Result
             if (expressCompanyName.Contains("极兔快递")) return "JTSD";
             return "OTHER";
             //SF 顺丰 //EMS 邮政快递 //YTO 圆通 //ZTO 中通 //HTKY 百世 //STO 申通 //YUNDA 韵达 //JDKD 京东快递 //JTSD 极兔
-
-
         }
 
         // 微信快递编码
@@ -286,6 +284,14 @@ namespace AllBase.Model.Result
             get { return this.GetValue(x => x.TransitCreateTime); }
             set { this.SetValue(x => x.TransitCreateTime, value); }
         }
+        /// <summary>
+        /// 中转单取号时间
+        /// </summary>
+        public DateTime TransitPickupTime
+        {
+            get { return this.GetValue(x => x.TransitPickupTime); }
+            set { this.SetValue(x => x.TransitPickupTime, value); }
+        }
 
         /// <summary>
         /// 买手订单时间

Work/Api/DouYinApi.cs

@@ -1,5 +1,5 @@
 using AllBase;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using Newtonsoft.Json;
 using System;

Work/_29Tools/BLL/HttpResponseWXBLL.cs

@@ -1,5 +1,5 @@
 using AllBase;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using NaiBa.Util.Extension;
 using System;

Work/_29Tools/BLL/HttpResponseYkdBLL.cs

@@ -1,5 +1,5 @@
 using AllBase;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using NaiBa.Util.Extension;
 using System;

Work/_29Tools/BLL/SendBuyerOrder.cs

@@ -1,6 +1,6 @@
 using AllBase;
 using AllBase.Model;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using CefSharp.DevTools.LayerTree;
 using NaiBa.Util.Extension;
 using Newtonsoft.Json.Linq;

Work/_29Tools/BLL/ShopBLL.cs

@@ -1,6 +1,6 @@
 using AllBase;
 using AllBase.Helper;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using NaiBa.Util.Extension;
 using Newtonsoft.Json.Linq;
 using System;

Work/_29Tools/BLL/WxOrderSupplierBLL.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 
 namespace Work._29Tools.BLL
 {

Work/_29Tools/Forms/PddMobileBuyOrderForm.cs

@@ -1,7 +1,7 @@
 using AllBase;
 using AllBase.Helper;
 using AllBase.Model;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using CefSharp;
 using CefSharp.DevTools.IO;
@@ -845,7 +845,7 @@ namespace TemuKJD.ToolForms
             if (html.Contains("\"code\":200"))
                 BaseClass.Balance = BaseRegex.GetDecimalJson(ref html, "balance");
 
-            orderItem.ItemTransitOrders.Insert(0, new oms_wei_external_procurement_log()
+            orderItem.ItemTransitOrders.Insert(0, new oms_wei_external_procurement_log_info()
             {
                 buyer_account = buyer.buyer_nick,
                 id = 0,

Work/_29Tools/Forms/PddMobileLoginForm.cs

@@ -1,6 +1,6 @@
 using AllBase;
 using AllBase.Helper;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using CefSharp;
 using CefSharp.WinForms;

Work/_29Tools/Forms/ShopForms/WXShopLoginForm.cs

@@ -1,6 +1,6 @@
 using AllBase;
 using AllBase.Helper;
-using AllBase.Model.Local;
+using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using CefSharp;
 using CefSharp.WinForms;