Commit 2a42bc8e by 泽锋 李

fix

parent 3e754640
...@@ -34,7 +34,7 @@ GROUP BY t1.bailun_sku,t1.warehouse_code,t1.supplier_id ", parameters); ...@@ -34,7 +34,7 @@ GROUP BY t1.bailun_sku,t1.warehouse_code,t1.supplier_id ", parameters);
//return _connection.Query<temp_sku_dto>("select t1.bailun_sku,t1.warehouse_code,t1.supplier_id from dc_base_purchase as t1 where t1.update_time>=@time group by t1.bailun_sku,t1.warehouse_code,t1.supplier_id ", parameters); //return _connection.Query<temp_sku_dto>("select t1.bailun_sku,t1.warehouse_code,t1.supplier_id from dc_base_purchase as t1 where t1.update_time>=@time group by t1.bailun_sku,t1.warehouse_code,t1.supplier_id ", parameters);
} }
public static IEnumerable<temp_sku_dto> GetTransferChangeSku(int day,string bailun_sku = "") public static IEnumerable<temp_sku_dto> GetTransferChangeSku(int day,string bailun_sku = "",bool is_transfer = false)
{ {
DynamicParameters parameters = new DynamicParameters(); DynamicParameters parameters = new DynamicParameters();
parameters.Add("c_time", DateTime.Now.AddDays(0 - day).ToString("yyyy-MM-dd 00:00:00")); parameters.Add("c_time", DateTime.Now.AddDays(0 - day).ToString("yyyy-MM-dd 00:00:00"));
...@@ -49,6 +49,10 @@ where t1.`update_time`>=@c_time ...@@ -49,6 +49,10 @@ where t1.`update_time`>=@c_time
sql += " and t1.bailun_sku=@bailun_sku "; sql += " and t1.bailun_sku=@bailun_sku ";
parameters.Add("bailun_sku", bailun_sku); parameters.Add("bailun_sku", bailun_sku);
} }
if (is_transfer)
{
sql += " and t2.hq_type!='国内仓' ";
}
sql += " group by t1.bailun_sku,t1.warehouse_code "; sql += " group by t1.bailun_sku,t1.warehouse_code ";
return _connection.Query<temp_sku_dto>(sql, parameters); return _connection.Query<temp_sku_dto>(sql, parameters);
......
...@@ -22,7 +22,7 @@ namespace AutoTurnOver.Purchase.AverageTarget ...@@ -22,7 +22,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
try try
{ {
Console.WriteLine($"开始 init ,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"); Console.WriteLine($"开始 init ,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
PurchaseAverageTargetServices.CalculationTransfer(days:(360*3)); PurchaseAverageTargetServices.CalculationTransfer(days:(360*3),has_transfer:true);
Console.WriteLine($"结束 init,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"); Console.WriteLine($"结束 init,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
} }
catch (Exception ex) catch (Exception ex)
......
...@@ -33,6 +33,7 @@ namespace AutoTurnOver.Purchase.AverageTarget ...@@ -33,6 +33,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
//dc_auto_return_goods_config_dao.NewCalculation(); //dc_auto_return_goods_config_dao.NewCalculation();
//PurchaseAverageTargetServices.Calculation("950282301", days: 360); //PurchaseAverageTargetServices.Calculation("950282301", days: 360);
//PurchaseAverageTargetServices.CalculationTransfer("LM-EO-007", 360); //PurchaseAverageTargetServices.CalculationTransfer("LM-EO-007", 360);
//PurchaseAverageTargetServices.CalculationTransfer(days: (360 * 3),has_transfer:true);
} }
catch (Exception ex) catch (Exception ex)
{ {
......
...@@ -321,7 +321,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp ...@@ -321,7 +321,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
return sku_sign_days; return sku_sign_days;
} }
public static void CalculationTransfer(string bailun_sku = "", int days = 30) public static void CalculationTransfer(string bailun_sku = "", int days = 30,bool has_transfer = false)
{ {
MyMySqlConnection conn = connectionHelper._connection; MyMySqlConnection conn = connectionHelper._connection;
...@@ -340,7 +340,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp ...@@ -340,7 +340,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
{ {
// 获取最近2天发送变化的SKU 用于计算 // 获取最近2天发送变化的SKU 用于计算
var chageSkuList = AveragePurchase.GetTransferChangeSku(days, bailun_sku); var chageSkuList = AveragePurchase.GetTransferChangeSku(days, bailun_sku, has_transfer);
foreach (var skuItem in chageSkuList) foreach (var skuItem in chageSkuList)
{ {
try try
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment