停止监控分永久停止跟暂时停止。永久停止的自动删除已出的单

 美容调拨单 deadline 改成两个工作日

AutoTurnOver.DB/db_config.cs

@@ -581,6 +581,10 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
             {
                 throw new Exception("状态异常");
             }
+            if (monitor_status == 0)
+            {
+                time_type = 0;
+            }
             var datas = conn.Query<AutoTurnOver.Models.dc_auto_turnover>(" select * from dc_auto_turnover where id in @ids ", new { ids = ids.Split(',') }).AsList();
             foreach (AutoTurnOver.Models.dc_auto_turnover turnover_item in datas)
             {

AutoTurnOver.Models/dc_auto_purchase_advise.cs

@@ -359,14 +359,38 @@ namespace AutoTurnOver.Models
 
             return count;
         }
+        public static int WorkingDays2(DateTime date, DateTime date2)
+        {
+            var this_date = date;
+            var count = 0;
+            while ((date2 - this_date).TotalHours >= 24)
+            {
+                if (this_date.DayOfWeek == DayOfWeek.Monday||this_date.DayOfWeek == DayOfWeek.Wednesday||this_date.DayOfWeek == DayOfWeek.Friday)
+                {
+                    count++;
+                }
+                this_date = this_date.AddDays(1);
+            }
+
+            return count;
+        }
         /// <summary>
         /// 工作日
         /// </summary>
         public int working_days { get {
                 if (create_time != null)
                 {
+                    //如果是美容调拨单
+                    if ((buyer_name=="张莹霞"|| buyer_name=="张莹霞1") && hq_type!="国内仓")
+                    {
+                        return WorkingDays2(create_time.Value, DateTime.Now);
+                    }
+                    else
+                    {
                         return WorkingDays(create_time.Value, DateTime.Now);
                     }
+                    
+                }
                 else
                 {
                     return 0;