1

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.待核算)
+                    //if (order.OrderState != Enums.OrderState.待核算)
-                        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);
                     }
                 }