Commit 28a8fc54 by 泽锋 李

fix

parent 8c4b0944
...@@ -1854,6 +1854,8 @@ alter table dc_report_cash_flow_sku_group_temp rename dc_report_cash_flow_sku_gr ...@@ -1854,6 +1854,8 @@ alter table dc_report_cash_flow_sku_group_temp rename dc_report_cash_flow_sku_gr
alter table dc_report_cash_flow_sku_groupTemp rename dc_report_cash_flow_sku_group_temp; alter table dc_report_cash_flow_sku_groupTemp rename dc_report_cash_flow_sku_group_temp;
truncate table dc_report_cash_flow_sku_group_temp; truncate table dc_report_cash_flow_sku_group_temp;
update dc_report_cash_flow_sku_group set current_balance=current_income+current_expend ,last_balance=last_income+last_expend;
", datePar, commandTimeout: 0); ", datePar, commandTimeout: 0);
} }
} }
......
...@@ -1054,16 +1054,16 @@ where t1.create_time>=@btime and t1.create_time<=@etime "; ...@@ -1054,16 +1054,16 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
return occur_time.GetWeekLastDaySun(); return occur_time.GetWeekLastDaySun();
case ((int)dc_report_logistics_company_config_payment_days_type.月结): case ((int)dc_report_logistics_company_config_payment_days_type.月结):
remarks = $" 供应商 {item_logistics_company.company_name}{item_logistics_company.payment_days_type_str}】 "; remarks = $" 供应商 {item_logistics_company.company_name}{item_logistics_company.payment_days_type_str}】 ";
return occur_time.LastDayOfMonth(); return occur_time.AddMonths(1).LastDayOfMonth();
case ((int)dc_report_logistics_company_config_payment_days_type.半月结): case ((int)dc_report_logistics_company_config_payment_days_type.半月结):
remarks = $" 供应商 {item_logistics_company.company_name}{item_logistics_company.payment_days_type_str}】 "; remarks = $" 供应商 {item_logistics_company.company_name}{item_logistics_company.payment_days_type_str}】 ";
if (occur_time.Day <= 15) if (occur_time.Day <= 15)
{ {
return DateTime.Parse(occur_time.ToString("yyyy-MM-15 HH:mm:ss")); return DateTime.Parse(occur_time.AddMonths(1).ToString("yyyy-MM-15 HH:mm:ss"));
} }
else else
{ {
return occur_time.LastDayOfMonth(); return occur_time.AddMonths(1).LastDayOfMonth();
} }
case ((int)dc_report_logistics_company_config_payment_days_type.固定天数): case ((int)dc_report_logistics_company_config_payment_days_type.固定天数):
remarks = $" 供应商 {item_logistics_company.company_name}{item_logistics_company.payment_days_type_str}】【{item_logistics_company.days}天】 "; remarks = $" 供应商 {item_logistics_company.company_name}{item_logistics_company.payment_days_type_str}】【{item_logistics_company.days}天】 ";
......
...@@ -23,7 +23,7 @@ namespace ResetOutofstock ...@@ -23,7 +23,7 @@ namespace ResetOutofstock
// throw; // throw;
//} //}
//report.ResetCashFlowData(); report.ResetCashFlowData();
var builder = new HostBuilder().ConfigureServices((hostContext, services) => var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
......
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