Commit 8a026d65 by lizefeng

fix

parent 167667a0
......@@ -3,6 +3,7 @@ using AutoTurnOver.Models;
using AutoTurnOver.Models.ApiDto;
using AutoTurnOver.Models.auto;
using AutoTurnOver.Models.Base;
using AutoTurnOver.Utility;
using AutoTurnOver.Models.Report;
using Bailun.ServiceFabric;
using Dapper;
......@@ -10,6 +11,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
namespace AutoTurnOver.DB
{
public class db_config : connectionHelper
......@@ -2004,11 +2006,12 @@ and start_date<=@end_date and end_date>=@start_date
{
sales = m.sales,
create_date = DateTime.Now,
date_str = m.date.ToString("yyyy-MM-dd"),
date_str = m.date.ToString("yyyy-MM"),
bailun_sku = m.bailun_sku,
site = m.site_code,
create_user = user.UserName,
date = m.date,
bdate = m.date.GetMonthFirstDay(),
edate = m.date.LastDayOfMonth(),
update_date = DateTime.Now,
update_user = user.UserName,
project = m.project
......
......@@ -28,7 +28,8 @@ namespace AutoTurnOver.Models.auto
public string project { get; set; }
public string bailun_sku { get; set; }
public string site { get; set; }
public DateTime date { get; set; }
public DateTime bdate { get; set; }
public DateTime edate { get; set; }
public string date_str { get; set; }
public decimal sales { get; set; }
public DateTime create_date { get; set; }
......
......@@ -914,23 +914,16 @@ namespace AutoTurnOver.Services
}
// 取开始结束时间
var btime = DateTime.Parse(col.ColumnName.Substring(2, 10));
var etime = DateTime.Parse(col.ColumnName.Substring(13, 10));
var s_sales = (sales / ((int)Math.Ceiling((etime - btime).TotalDays + 1)));
while (btime.ToDayHome() <= etime.ToDayEnd())
var btime = DateTime.Parse(col.ColumnName.Substring(0, 7)+"-01");
var new_data = new sales_day_config_input_dto2
{
var new_data = new sales_day_config_input_dto2
{
bailun_sku = bailun_sku,
site_code = site_code,
sales = s_sales,
project = project,
date = btime
};
DB.db_config.SaveSalesDayConfig2(new_data, user, false);
btime = btime.AddDays(1);
}
bailun_sku = bailun_sku,
site_code = site_code,
sales = sales,
project = project,
date = btime
};
DB.db_config.SaveSalesDayConfig2(new_data, user, false);
}
......
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