Merge branch 'master' of http://193.112.143.129/bltdc/data-center-auto

AutoGeneratePurchaseAdvise/Dockerfile

-FROM microsoft/dotnet:2.1-runtime-alpine AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:2.1-stretch-slim AS base
 WORKDIR /app
 RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone 
 
-FROM microsoft/dotnet:2.1-sdk-alpine AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:2.1-stretch AS build
 WORKDIR /src
 COPY AutoGeneratePurchaseAdvise/AutoGeneratePurchaseAdvise.csproj AutoGeneratePurchaseAdvise/
 COPY AutoTurnOver.Services/AutoTurnOver.Services.csproj AutoTurnOver.Services/

AutoGeneratePurchaseAdvise/GeneratePurchaseAdviseBackgroundService.cs

@@ -155,7 +155,7 @@ namespace AutoGeneratePurchaseAdvise
                 }
 
 
-                if (now.Hour == 15 && now.Minute == 03)
+                if (now.Hour == 14 && now.Minute == 02)
                 {
                     // 要上班才推
                     if (ApiServices.GetSchedulings())

AutoTurnOver.DB/purchase_advise.cs

@@ -1461,7 +1461,7 @@ t9.quantity_transfer_temporary_storage as 'quantity_transfer_temporary_storage'
 	left join dc_base_sku as t6 on t1.bailun_sku = t6.bailun_sku
 	left join dc_mid_transit as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code
 left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse_code = t9.warehouse_code
-	where t6.`status`=2 and  ( t6.buyer_name in ('赵美聪','甄杰靖','赵美聪1','秦振荣','李华娟') and t1.warehouse_code in ('BLGZ03','GZBLWH') ) 
+	where t6.`status`=2 and  ( t6.buyer_name in ('马俊豪','李细标','赵美聪','甄杰靖','赵美聪1','秦振荣','李华娟') and t1.warehouse_code in ('BLGZ03','GZBLWH') ) 
     and ( t5.`status`=0 or t5.`status` is null )
 	and ((case when t7.quantity_out_stock>0 then 0 else  (t1.usable_stock+t1.occupy_order) end ) + t7.quantity_transfer + t7.quantity_purchase < t7.quantity_out_stock) ", new { main_id = mainID }, commandTimeout: 0).ToList();