Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwyb

BBWYB.Server.API/Controllers/DataRepairController.cs

@@ -139,5 +139,15 @@ namespace BBWYB.Server.API.Controllers
         {
             dataRepairBusiness.BelongBarginTeam();
         }
+
+        /// <summary>
+        /// 比较不在B里的订单
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public List<string> RepairCBOrder()
+        { 
+            return dataRepairBusiness.RepairCBOrder();
+        }
     }
 }

BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs

@@ -1793,6 +1793,20 @@ namespace BBWYB.Server.Business
             }
             #endregion
         }
+
+        public List<string> RepairCBOrder()
+        {
+            var startTime = DateTime.Now.Date.AddDays(-3);
+            var endTime = startTime.AddDays(1).AddSeconds(-1);
+            var corderList = freeSqlMultiDBManager.BBWYCfsql.Select<Model.Db.BBWY.PurchaseOrderV2>()
+                                                            .Where(c => c.CreateTime >= startTime && c.CreateTime <= endTime)
+                                                            .ToList(c => c.Id);
+
+            var borderlist = fsql.Select<Order>(corderList).ToList(o => o.Id);
+
+            var exceptList = corderList.Except(borderlist).ToList();
+            return exceptList;
+        }
     }
 }
 

BBWYB.Server.Business/Extensions/OrderStateExtension.cs

@@ -115,9 +115,10 @@ namespace BBWYB.Server.Business
                 }
                 else if (order.IntoStoreType == Enums.IntoStoreType.厂商代发入仓)
                 {
-                    if (order.OrderState != Enums.OrderState.待核算)
-                        order.OrderState = Enums.OrderState.待验收;
+                    //if (order.OrderState != Enums.OrderState.待核算)
+                    //order.OrderState = Enums.OrderState.待验收;
 
+                    order.OrderState = Enums.OrderState.待核算;
                 }
                 else if (order.IntoStoreType == Enums.IntoStoreType.其他仓不包装)
                     order.OrderState = Enums.OrderState.待核算;

BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs

@@ -272,7 +272,8 @@ namespace BBWYB.Server.Business
                     }
                     else
                     {
-                        lessTime += 10800;
+                        //lessTime += 10800;
+                        lessTime += Convert.ToInt32((startTime.Date.AddHours(12) - startTime).TotalSeconds);
                         startTime = startTime.Date.AddHours(13);
                     }
                 }
@@ -287,7 +288,8 @@ namespace BBWYB.Server.Business
                     }
                     else
                     {
-                        lessTime += 18000;
+                        //lessTime += 18000;
+                        lessTime += Convert.ToInt32((startTime.Date.AddHours(18) - startTime).TotalSeconds);
                         startTime = startTime.Date.AddDays(CalculateAddDay(startTime.DayOfWeek)).AddHours(9);
                     }
                 }