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

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\Local\oms_wei_external_procurement_log.cs" />
-    <Compile Include="Model\Local\order_pdd_buyer_order.cs" />
-    <Compile Include="Model\Local\TransitWarehouseParam.cs" />
-    <Compile Include="Model\Local\WaybillHelper.cs" />
+    <Compile Include="Model\DBModel\ErpMerchantInfo.cs" />
+    <Compile Include="Model\DBModel\oms_wei_external_procurement_after_sale_info.cs" />
+    <Compile Include="Model\DBModel\oms_wei_external_procurement_log_info.cs" />
+    <Compile Include="Model\DBModel\order_pdd_buyer_order.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\Local\oms_wei_order_item_info.cs" />
-    <Compile Include="Model\Local\oms_wei_refund_info.cs" />
+    <Compile Include="Model\DBModel\oms_wei_order_info.cs" />
+    <Compile Include="Model\DBModel\oms_wei_order_item_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\Local\WXBuyMapInfo.cs" />
+    <Compile Include="Model\DBModel\BuyerLoginInfo.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>
         /// 买手订单时间