Skip to content

D
data-center-auto
Commit a7672bd1 by huangruiyao
Options

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

parents 8c3a1ab7 ffc40343
Showing with 691 additions and 21 deletions
AutoGeneratePurchaseAdvise/Program.cs
......@@ -13,8 +13,17 @@ namespace AutoGeneratePurchaseAdvise
static async Task Main(string[] args)
{
Console.WriteLine("采购建议计算任务启动...");
try
{
//PurchaseAdviseServices.AutoPushBuySys(2);
//PurchaseAdviseServices.AutoPushBuySys(6);
}
catch (Exception ex)
{
throw;
}
var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
{
services.AddHostedService<GeneratePurchaseAdviseBackgroundService>();
......
AutoTurnOver.DB/dc_auto_turnover.cs
......@@ -7,6 +7,7 @@ using Dapper;
using System.Linq;
using AutoTurnOver.Models.Base;
using AutoTurnOver.DB.Base;
using AutoTurnOver.Models.stock;
namespace AutoTurnOver.DB
{
......@@ -512,6 +513,19 @@ from dc_auto_turnover as dat
return _connection.QueryFirstOrDefault<dc_auto_inventory>(sql);
}
/// <summary>
/// 历史库存
/// </summary>
/// <returns></returns>
public static List<dc_daily_stock_dto> GetDailyStock(string bailun_sku,string warehouse_code,DateTime date)
{
return _connection.Query<dc_daily_stock_dto>(" select * from dc_daily_stock where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code and record_time>=@record_time ", new {
bailun_sku = bailun_sku,
warehouse_code = warehouse_code,
record_time = date
}).ToList();
}
#endregion
#region 预测入库
......
AutoTurnOver.DB/purchase_advise.cs
......@@ -138,7 +138,7 @@ dc_mid_transit as t2 ,
dc_base_sku as t3
set t1.quantity_final_advise=GREATEST(0,t1.quantity_final_advise-t2.quantity_out_stock)
where t1.bailun_sku = t2.bailun_sku and t1.warehouse_code = t2.warehouse_code and t1.bailun_sku=t3.bailun_sku
and t1.quantity_init_advise>=0 and ( t3.buyer_name in ('张莹霞1') and t1.warehouse_code!='GZBLWH' ) and t1.main_id=@main_id ", new { main_id = mainID }, commandTimeout: 0);
and t1.quantity_init_advise>=0 and ( t3.buyer_name in ('张莹霞1') and t1.warehouse_code='GZBLWH' ) and t1.main_id=@main_id ", new { main_id = mainID }, commandTimeout: 0);
// 调整因为舍弃小数导致的moq不足
......
AutoTurnOver.DB/report.cs
......@@ -199,7 +199,8 @@ t1.logistics_method_name,
t8.buy_ontheway_detail,
t9.items,
t6.brand,
t1.bailun_sku_quantity_shipped
t1.bailun_sku_quantity_shipped,
t1.shipping_deadline_real
from dc_base_oms_sku_outofstock as t1
left join dc_mid_transit as t2 on t1.bailun_sku = t2.bailun_sku and t1.warehouse_code = t2.warehouse_code
left join dc_base_warehouse as t_db on t1.warehouse_code = t_db.warehouse_code
......@@ -488,6 +489,7 @@ left join (
) as t4 on t1.bailun_sku = t4.bailun_sku and t_db.area_id = t4.area_id
left join dc_base_stock as t5 on t1.bailun_sku = t5.bailun_sku and t1.warehouse_code = t5.warehouse_code
left join dc_auto_config_sku_warehouse as t6 on t1.bailun_sku = t6.bailun_sku and t1.warehouse_code = t6.warehouse_code
left join ( select * from dc_auto_monitor_sku_type where warehouse_type='国内仓') as t7 on t1.bailun_sku = t7.bailun_sku
where
( t1.warehouse_code in ('GZBLWH','BLGZ03') or ( t1.warehouse_code in ('YWWH01') and ( t2.`status`=1 or t6.`status`=1 ) ) ) -- 义务仓 只要停止监控 或者停售就推送
and t1.bailun_sku not in ('942904501')
......@@ -495,7 +497,7 @@ and ( t1.quantity_purchase<=0 and (ifnull(t4.sum_unshipped_quantity,0) - ifnull(
and (ifnull(t4.sum_unshipped_quantity,0) - ifnull(t3.sum_usable_stock,0))>0 -- 有缺货
and ( case
when @platform!='aliexpress' then ( t2.buyer_name not in ('张莹霞','张莹霞1','赵美聪','黄镜洁','赵美聪','赵美聪1','秦振荣','李华娟','赵美聪-独立站') or t2.`status`=1 )
else ( t2.`status`=1 or t6.`status`=1)
else ( t2.`status`=1 or t7.bailun_sku is null)
end
) -- 速卖通的必须要停止监控才推送
and ( ifnull(t4.sum_quantity_purchase,0)<=0 or t2.buyer_name in ('张莹霞','张莹霞1','赵美聪','黄镜洁','赵美聪','赵美聪1','秦振荣','李华娟','赵美聪-独立站')
......@@ -533,11 +535,12 @@ left join (
GROUP BY t1.bailun_sku,t2.area_id
) as t5 on t1.bailun_sku = t5.bailun_sku and t_db.area_id = t5.area_id
left join dc_auto_config_sku_warehouse as t6 on t1.bailun_sku = t6.bailun_sku and t1.warehouse_code = t6.warehouse_code
left join ( select * from dc_auto_monitor_sku_type where warehouse_type='国内仓') as t7 on t1.bailun_sku = t7.bailun_sku
where t1.usable_stock<=0 and t1.bailun_sku!=''
and ( t1.warehouse_code in ('GZBLWH','BLGZ03') or ( t1.warehouse_code in ('YWWH01') and ( t3.`status`=1 or t6.`status`=1 ) ) ) -- 义务仓 只要停止监控 或者停售就推送
and t1.bailun_sku not in ('942904501')
and ( case
when @platform!='aliexpress' then ( t3.buyer_name not in ('张莹霞','张莹霞1','赵美聪','黄镜洁','赵美聪','赵美聪1','秦振荣','李华娟','赵美聪-独立站') or t3.`status`=1 ) else ( t3.`status`=1 or t6.`status`=1)
when @platform!='aliexpress' then ( t3.buyer_name not in ('张莹霞','张莹霞1','赵美聪','黄镜洁','赵美聪','赵美聪1','秦振荣','李华娟','赵美聪-独立站') or t3.`status`=1 ) else ( t3.`status`=1 or t7.bailun_sku is null)
end
) -- 速卖通的必须要停止监控才推送
and IFNULL(t4.sum_usable_stock,0)<=0 -- 无库存
......@@ -1203,7 +1206,8 @@ INSERT into dc_base_oms_sku_outofstock_temp (
t1.`refund_reference_id`,
t1.`has_fba_s`,
t1.`bailun_sku_quantity_pushed`,
( CASE WHEN ( `t1`.`warehouse_code` IN ( 'QYBLZZ', 'GZBLWH' ) ) THEN 'QYBLZZ-GZBLWH' ELSE `t1`.`warehouse_code` END ) as 'warehouse_code_extend'
( CASE WHEN ( `t1`.`warehouse_code` IN ( 'QYBLZZ', 'GZBLWH' ) ) THEN 'QYBLZZ-GZBLWH' ELSE `t1`.`warehouse_code` END ) as 'warehouse_code_extend',
t1.`shipping_deadline_real`
from dc_base_oms_sku as t1
left join dc_base_warehouse as t_db on t1.warehouse_code = t_db.warehouse_code
left join dc_base_sku as t6 on t1.bailun_sku = t6.bailun_sku
......@@ -1382,7 +1386,7 @@ t1.bailun_sku,
(
case
when t1.buyer_name='李华娟' then '无库普货推荐'
when t1.buyer_name='张莹霞' then '美甲'
when t1.buyer_name in ('张莹霞','黄境洁','古艳洋1') then '美甲'
when t1.buyer_name='张莹霞1' then '精油+美容'
when t1.buyer_name='赵美聪' and t1.source = 1 then '服装精准开发'
when t1.buyer_name='赵美聪' then '服装供应商推荐'
......@@ -1588,6 +1592,35 @@ alter table dc_auto_monitor_sku_temp rename dc_auto_monitor_sku;
alter table dc_auto_monitor_skuTemp rename dc_auto_monitor_sku_temp;
truncate table dc_auto_monitor_sku_temp; ", commandTimeout: 0);
_connection.Execute(@" -- 刷新 订单 dc_auto_monitor_sku_type_temp 映射表
set session transaction isolation level read uncommitted;
start transaction;
-- 清空视图表的数据
Truncate table dc_auto_monitor_sku_type_temp;
INSERT into dc_auto_monitor_sku_type_temp(`bailun_sku`,`warehouse_type`) (
SELECT DISTINCT `t1`.`bailun_sku` AS `bailun_sku` ,t3.hq_type as 'warehouse_type'
FROM `dc_base_stock` `t1`
LEFT JOIN `dc_auto_config_sku_warehouse` `t2` ON `t1`.`bailun_sku` = `t2`.`bailun_sku`
AND `t1`.`warehouse_code` = `t2`.`warehouse_code`
left join dc_base_warehouse as t3 on t1.warehouse_code =t3.warehouse_code
WHERE
(
isnull( `t2`.`bailun_sku` )
OR ( `t2`.`status` = 0 )
)
GROUP BY t1.bailun_sku,t3.hq_type
);
alter table dc_auto_monitor_sku_type rename dc_auto_monitor_sku_typeTemp;
alter table dc_auto_monitor_sku_type_temp rename dc_auto_monitor_sku_type;
alter table dc_auto_monitor_sku_typeTemp rename dc_auto_monitor_sku_type_temp;
truncate table dc_auto_monitor_sku_type_temp; ", commandTimeout: 0);
_connection.Execute(@" -- 刷新 订单 dc_view_stock_monitor_sku 映射表
set session transaction isolation level read uncommitted;
start transaction;
......@@ -1944,7 +1977,9 @@ 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);
_connection.Execute(@" update dc_base_stock as t1,
_connection.Execute(@"
update dc_base_stock set pay_amount_30=0,income_amount_30=0;
update dc_base_stock as t1,
( select bailun_sku,warehouse_code, abs(sum(case when data_type not in (2) then val else 0 end )) as 'pay_amount_30',
sum(case when data_type in (2) then val else 0 end ) as 'income_amount_30'
from dc_report_cash_flow_log where occur_time >=@btime and is_delete=0 and data_type in (2,3,5,8,9,10,11,12,13,14) GROUP BY bailun_sku,warehouse_code ) as t2
......@@ -1952,7 +1987,9 @@ set t1.pay_amount_30 =t2.pay_amount_30, t1.income_amount_30 = t2.income_amount_
where t1.bailun_sku = t2.bailun_sku and t1.warehouse_code = t2.warehouse_code;
", new { btime = DateTime.Now.AddDays(-30).ToDayHome()},commandTimeout: 0);
_connection.Execute(@" update dc_base_stock as t1,
_connection.Execute(@"
update dc_base_stock set available_days=0;
update dc_base_stock as t1,
dc_auto_turnover as t2
set t1.available_days = (t1.usable_stock / if(t2.daily_weighted_sales<=0,1,t2.daily_weighted_sales))
where t1.bailun_sku = t2.bailun_sku and t1.warehouse_code = t2.warehouse_code;
......@@ -2133,6 +2170,11 @@ truncate table dc_auto_stock_monitor_temp; ", commandTimeout: 0);
sql += " and t1.website = @website ";
parameters.Add("website", search_data.website);
}
if (!string.IsNullOrWhiteSpace(search_data.warehouse_code))
{
sql += " and t1.warehouse_code = @warehouse_code ";
parameters.Add("warehouse_code", search_data.warehouse_code);
}
if (!string.IsNullOrWhiteSpace(search_data.label))
{
sql += " and t2.label = @label ";
......@@ -2422,6 +2464,151 @@ left join dc_base_warehouse as tdb on t1.warehouse_code = tdb.warehouse_code whe
return datas;
}
public static List<bailun_sku_warehouse_code_dto> GetSkuWarehouseSales(bailun_sku_website_sales_search_dto search_data)
{
var tableName = "dc_base_oms_sku_7";
if (search_data.btime != null || search_data.etime != null)
{
tableName = "dc_base_oms_sku";
}
var sql = $@" select t1.*,ifnull(t2.label,'未知') as 'label',tdb.warehouse_name from {tableName} as t1 left join dc_auto_config_sku_label as t2 on t1.bailun_sku = t2.bailun_sku
left join dc_base_warehouse as tdb on t1.warehouse_code = tdb.warehouse_code where
t1.bailun_order_status != 'Canceled'
and t1.has_fba_s = 0
and t1.has_delete = 0
and t1.has_scalp = 0
-- and t1.has_buyer_remark = 0
-- and t1.has_platsku_remark = 0
and t1.has_innersale = 0 ";
DynamicParameters parameters = new DynamicParameters();
if (search_data != null)
{
if(search_data.btime!=null && search_data.etime!=null)
{
sql += " and t1.paid_time>=@btime and t1.paid_time<=@etime ";
parameters.Add("btime", search_data.btime.Value.ToString("yyyy-MM-dd 00:00:00"));
parameters.Add("etime", search_data.etime.Value.ToString("yyyy-MM-dd 23:59:59"));
}
if (!string.IsNullOrWhiteSpace(search_data.platform_type))
{
if("amazon".Equals(search_data.platform_type, StringComparison.OrdinalIgnoreCase))
{
sql += " and t1.platform_type in @platform_types ";
parameters.Add("platform_types", new List<string> { "Amazon", "FBA" });
}
else
{
sql += " and t1.platform_type = @platform_type ";
parameters.Add("platform_type", search_data.platform_type);
}
}
if (!string.IsNullOrWhiteSpace(search_data.warehousetype))
{
sql += " and tdb.hq_type=@warehousetype ";
parameters.Add("warehousetype", search_data.warehousetype);
}
if (search_data.warehousearea > 0)
{
sql += " and tdb.area_id = @area_id ";
parameters.Add("area_id", search_data.warehousearea);
}
if (!string.IsNullOrWhiteSpace(search_data.warehouse_code))
{
sql += " and t1.warehouse_code=@warehouse_code ";
parameters.Add("warehouse_code", search_data.warehouse_code);
}
}
var oms_sku_list = _connection.Query<dc_base_oms_sku_label>(sql, parameters);
List<bailun_sku_warehouse_code_dto> datas = new List<bailun_sku_warehouse_code_dto>();
var warehouse_code_list = oms_sku_list.GroupBy(s=>new { s.warehouse_name,s.warehouse_code}).OrderBy(s=>s.Key.warehouse_name);
if (search_data.has_sum == true)
{
datas.Add(new bailun_sku_warehouse_code_dto
{
label = "总计",
labels = new List<string> { "服装精准开发", "服装供应商推荐", "非服装精准开发", "无库普货推荐","美甲", "精油+美容","未知" },
warehouse_name = "总计",
warehouse_code = "",
days = new List<bailun_sku_warehouse_code_dto.bailun_sku_warehouse_code_date_dto>()
});
}
else
{
foreach (var item in warehouse_code_list)
{
datas.Add(new bailun_sku_warehouse_code_dto
{
label = "美甲",
labels = new List<string> { "美甲" },
warehouse_name = item.Key.warehouse_name,
warehouse_code = item.Key.warehouse_code,
days = new List<bailun_sku_warehouse_code_dto.bailun_sku_warehouse_code_date_dto>()
});
}
foreach (var item in warehouse_code_list)
{
datas.Add(new bailun_sku_warehouse_code_dto
{
label = "精油+美容",
labels = new List<string> { "精油+美容" },
warehouse_name = item.Key.warehouse_name,
warehouse_code = item.Key.warehouse_code,
days = new List<bailun_sku_warehouse_code_dto.bailun_sku_warehouse_code_date_dto>()
});
}
foreach (var item in warehouse_code_list)
{
datas.Add(new bailun_sku_warehouse_code_dto
{
label = "普货",
labels = new List<string> { "服装精准开发", "服装供应商推荐", "非服装精准开发", "无库普货推荐", "未知" },
warehouse_name = item.Key.warehouse_name,
warehouse_code = item.Key.warehouse_code,
days = new List<bailun_sku_warehouse_code_dto.bailun_sku_warehouse_code_date_dto>()
});
}
}
var b_time = DateTime.Now.AddDays(-1);
var e_time = b_time.AddDays(-7);
if(search_data.btime!=null && search_data.etime!=null)
{
e_time = search_data.btime.Value;
b_time = search_data.etime.Value;
}
var this_time = b_time;
while (this_time>= e_time)
{
foreach (var item in datas)
{
var temp_datas = oms_sku_list.Where(s=> s.pay_time!=null && s.pay_time.Year== this_time.Year && s.pay_time.Month == this_time.Month && s.pay_time.Day== this_time.Day);
if (!"总计".Equals(item.warehouse_name))
{
temp_datas = temp_datas.Where(s => item.labels.Contains(s.label) && s.warehouse_name == item.warehouse_name);
}
item.days.Add(new bailun_sku_warehouse_code_dto.bailun_sku_warehouse_code_date_dto
{
year = this_time.Year,
month = this_time.Month,
day = this_time.Day,
count = temp_datas.Sum(s=>s.bailun_sku_quantity_ordered),
sum = temp_datas.Sum(s => s.bailun_sku_quantity_ordered * s.amount_sales * s.order_to_usd_exchange_rate)
});
}
this_time = this_time.AddDays(-1);
}
return datas;
}
public static List<supplier_sales_dto> SupplierSalesList(supplier_sales_search_dto m, int offset, int limit, ref int total, string order = "", string sort = "")
{
var list = new List<supplier_sales_dto>();
......
AutoTurnOver.DB/report_cash_flow_dao.cs
......@@ -902,9 +902,10 @@ group by t1.transfer_order_id,t1.box_id
// 查询是否有真实费用
var is_real = 0;
var real_cost = order_item_sku.cost_first;
var real_data = conn.QuerySingleOrDefault<dc_base_transfer_cost_real>(" select * from dc_base_transfer_cost_real where bailun_sku=@bailun_sku and transfer_order_id=@transfer_order_id ",new {
var real_data = conn.QuerySingleOrDefault<dc_base_transfer_cost_real>(" select * from dc_base_transfer_cost_real where bailun_sku=@bailun_sku and transfer_order_id=@transfer_order_id and box_id=@box_id ",new {
bailun_sku = order_item_sku.bailun_sku,
transfer_order_id = order_item.transfer_order_id
transfer_order_id = order_item.transfer_order_id,
box_id = order_item.box_id
});
if (real_data != null)
{
......@@ -1788,7 +1789,8 @@ from dc_report_cash_flow_log as t1 left join dc_base_warehouse as t2 on t1.wareh
search.data_type = 1;
}
var sql = @" select t1.*,t2.sku_title_cn as 'sku_name',t2.`status` as 'sku_status',t2.buyer_name,ifnull(t3.warehouse_name,t3.warehouse_extend_name) as 'warehouse_name',ifnull(t4.usable_stock,0) as 'usable_stock',(ifnull(t5.quantity_transfer,0)+ifnull(t5.quantity_purchase,0)) as 'on_the_way',
(ifnull(t4.usable_stock,0) * t2.unit_price) as 'stock_amount',(ifnull(t5.quantity_transfer,0)+ifnull(t5.quantity_purchase,0)) as 'on_the_way_amount',ifnull(t8.history_sevenday_sales,0) as 'history_sevenday_sales',ifnull(t8.history_fourteenday_sales,0) as 'history_fourteenday_sales',ifnull(t8.history_thirtyday_sales,0) as 'history_thirtyday_sales'
(ifnull(t4.usable_stock,0) * t2.unit_price) as 'stock_amount',(ifnull(t5.quantity_transfer,0)+ifnull(t5.quantity_purchase,0)) as 'on_the_way_amount',ifnull(t8.history_sevenday_sales,0) as 'history_sevenday_sales',ifnull(t8.history_fourteenday_sales,0) as 'history_fourteenday_sales',ifnull(t8.history_thirtyday_sales,0) as 'history_thirtyday_sales',
(0-ifnull(t4.pay_amount_30,0)) as 'pay_amount_30',ifnull(t4.income_amount_30,0) as 'income_amount_30'
from dc_report_cash_flow_sku_group as t1
left join dc_base_sku as t2 on t1.bailun_sku=t2.bailun_sku
left join dc_base_warehouse as t3 on t1.warehouse_code = t3.warehouse_code
......@@ -1798,6 +1800,33 @@ left join dc_auto_config_sku_label as t6 on t1.bailun_sku = t6.bailun_sku
left join dc_auto_config_sku_warehouse as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code
left join dc_auto_turnover as t8 on t1.bailun_sku = t8.bailun_sku and t1.warehouse_code = t8.warehouse_code
where t1.type=@type ";
if (search.is_sum == true)
{
sql = @" select
sum(t1.balance) as 'balance',
sum(t1.current_balance) as 'current_balance',
sum(t1.current_income) as 'current_income',
sum(t1.current_expend) as 'current_expend',
sum(t1.last_balance) as 'last_balance',
sum(t1.last_income) as 'last_income',
sum(t1.last_expend) as 'last_expend',
sum(ifnull(t4.usable_stock,0)) as 'usable_stock',
sum(ifnull(t5.quantity_transfer,0)+ifnull(t5.quantity_purchase,0)) as 'on_the_way',
sum(ifnull(t4.usable_stock,0) * t2.unit_price) as 'stock_amount',
sum(ifnull(t5.quantity_transfer,0)+ifnull(t5.quantity_purchase,0)) as 'on_the_way_amount',
sum(0-ifnull(t4.pay_amount_30,0)) as 'pay_amount_30',
sum(ifnull(t4.income_amount_30,0)) as 'income_amount_30'
from dc_report_cash_flow_sku_group as t1
left join dc_base_sku as t2 on t1.bailun_sku=t2.bailun_sku
left join dc_base_warehouse as t3 on t1.warehouse_code = t3.warehouse_code
left join dc_base_stock as t4 on t1.bailun_sku = t4.bailun_sku and t1.warehouse_code = t4.warehouse_code
left join dc_mid_transit as t5 on t1.bailun_sku = t5.bailun_sku and t1.warehouse_code = t5.warehouse_code
left join dc_auto_config_sku_label as t6 on t1.bailun_sku = t6.bailun_sku
left join dc_auto_config_sku_warehouse as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code
left join dc_auto_turnover as t8 on t1.bailun_sku = t8.bailun_sku and t1.warehouse_code = t8.warehouse_code
where t1.type=@type";
}
DynamicParameters parameters = new DynamicParameters();
parameters.Add("type", search.data_type);
......@@ -1851,9 +1880,18 @@ where t1.type=@type ";
}
}
if (search.is_sum)
{
return new Page<dc_report_cash_flow_sku_group_dto>() {
Items = new List<dc_report_cash_flow_sku_group_dto> { _connection.QuerySingleOrDefault<dc_report_cash_flow_sku_group_dto>(sql, parameters) }
};
}
else
{
return _connection.Page<dc_report_cash_flow_sku_group_dto>(sql, search, parameters);
}
return _connection.Page<dc_report_cash_flow_sku_group_dto>(sql, search, parameters);
}
/// <summary>
......@@ -1881,11 +1919,13 @@ where t1.type=@type ";
{
bailun_sku = skuItem.sku,
sku_avg_cost = skuItem.skuAvgCost,
transfer_order_id = item.orderCode
transfer_order_id = item.orderCode,
box_id = item.boxCode
};
db_data.id = conn.QuerySingleOrDefault<int?>(" select id from dc_base_transfer_cost_real where bailun_sku=@bailun_sku and transfer_order_id=@transfer_order_id limit 1 ", new {
db_data.id = conn.QuerySingleOrDefault<int?>(" select id from dc_base_transfer_cost_real where bailun_sku=@bailun_sku and transfer_order_id=@transfer_order_id and box_id=@box_id limit 1 ", new {
bailun_sku = db_data.bailun_sku,
transfer_order_id = db_data.transfer_order_id
transfer_order_id = db_data.transfer_order_id,
box_id = item.boxCode
})??0;
if (db_data.id > 0)
{
......
AutoTurnOver.Models/Report/bailun_sku_website_sales_dto.cs
......@@ -25,6 +25,7 @@ namespace AutoTurnOver.Models.Report
public string label { get; set; }
public string website { get; set; }
public string warehouse_code { get; set; }
public int year { get; set; }
public int month { get; set; }
......@@ -56,6 +57,30 @@ namespace AutoTurnOver.Models.Report
}
}
public class bailun_sku_warehouse_code_dto
{
public string label { get; set; }
public string warehouse_name { get; set; }
public string warehouse_code { get; set; }
public List<string> labels { get; set; }
public List<bailun_sku_warehouse_code_date_dto> days { get; set; }
public class bailun_sku_warehouse_code_date_dto
{
public int year { get; set; }
public int month { get; set; }
public int day { get; set; }
public decimal count { get; set; }
public decimal sum { get; set; }
}
}
public class bailun_sku_goods_search_dto
{
public bool? has_sum { get; set; }
......
AutoTurnOver.Models/Report/quantity_out_stock_detail_dto.cs
......@@ -14,6 +14,8 @@ namespace AutoTurnOver.Models.Report
/// 【品牌
/// </summary>
public string brand { get; set; }
//实际最后发货时间
public DateTime shipping_deadline_real { get; set; }
/// <summary>
/// 缺货更新时间
/// </summary>
......
AutoTurnOver.Models/dc_base_oms_sku.cs
......@@ -25,6 +25,7 @@ namespace AutoTurnOver.Models
public string bailun_sku { get; set; }
public string warehouse_code { get; set; }
public string warehouse_name { get; set; }
public string bailun_sku_title_cn { get; set; }
......
AutoTurnOver.Models/dc_base_transfer_cost_real.cs
......@@ -13,5 +13,6 @@ namespace AutoTurnOver.Models
public string transfer_order_id { get; set; }
public string bailun_sku { get; set; }
public decimal sku_avg_cost { get; set; }
public string box_id { get; set; }
}
}
AutoTurnOver.Models/dc_report_cash_flow_log.cs
......@@ -92,7 +92,7 @@ namespace AutoTurnOver.Models
}
else if((int)dc_report_cash_flow_log_data_type_enum.新增头程费用 == data_type || (int)dc_report_cash_flow_log_data_type_enum.新增头程费用_首单 == data_type)
{
return "http://trans.bailuntec.com/#/allot-manage/ordinaryAllotOrderList?ordercode=" + no;
return "http://trans.bailuntec.com/#/allot-manage/ordinaryAllotOrderList?ordercode=" + item;
}
else if ((int)dc_report_cash_flow_log_data_type_enum.新增采购费用 == data_type || (int)dc_report_cash_flow_log_data_type_enum.新增采购费用_首单 == data_type)
{
......@@ -301,6 +301,20 @@ namespace AutoTurnOver.Models
}
public class dc_report_cash_flow_sku_group_dto : dc_report_cash_flow_sku_group
{
public string last_date_begin_30 { get
{
return DateTime.Now.AddDays(-30).ToString("yyyy-MM-dd 00:00:00");
} }
public string last_date_end_30
{
get
{
return DateTime.Now.ToString("yyyy-MM-dd 10:00:00");
}
}
public decimal pay_amount_30 { get; set; }
public decimal income_amount_30 { get; set; }
public string sku_name { get; set; }
public int sku_status { get; set; }
public string buyer_name { get; set; }
......@@ -359,6 +373,7 @@ namespace AutoTurnOver.Models
public string buyer_name { get; set; }
public string supplier_name { get; set; }
public string product_type { get; set; }
public bool is_sum { get; set; }
}
public class dc_report_cash_flow_platform_share_dto
......
AutoTurnOver.Models/stock/dc_daily_stock.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
namespace AutoTurnOver.Models.stock
{
/// <summary>
/// 每日库存
/// </summary>
public class dc_daily_stock_dto
{
public int id { get; set; }
public string bailun_sku { get; set; }
public string warehouse_code { get; set; }
public decimal usable_stock { get; set; }
public decimal occupy_stock { get; set; }
/// <summary>
/// 时间
/// </summary>
public DateTime record_time { get; set; }
}
}
AutoTurnOver.Services/CashFlowServices.cs
......@@ -24,6 +24,7 @@ namespace AutoTurnOver.Services
{
var dic = (IDictionary<string, object>)o;
dic["occur_" + (dat_item.date_title)] = new { val = Math.Round(dat_item.occur_val, 2), btime = dat_item.btime, etime = dat_item.etime, data_type = item.date_type };
dic["v_occur_" + (dat_item.date_title)] = Math.Round(dat_item.occur_val, 2);
if(
item.date_type .Contains( (int)dc_report_cash_flow_log_data_type_enum.销售数量)
//|| item.date_type==(int)dc_report_cash_flow_log_data_type_enum.利润
......@@ -33,11 +34,13 @@ namespace AutoTurnOver.Services
//|| item.date_type == (int)dc_report_cash_flow_log_data_type_enum.释放头程费用
)
{
dic["pay_" + (dat_item.date_title)] = null;
dic["v_pay_" + (dat_item.date_title)] = null;
}
else
{
dic["pay_" + (dat_item.date_title)] = new { val = Math.Round(dat_item.pay_val, 2), btime = dat_item.btime, etime = dat_item.etime, data_type = item.date_type };
dic["v_pay_" + (dat_item.date_title)] = Math.Round(dat_item.pay_val, 2);
}
}
......
AutoTurnOver.Services/ReportServices.cs
......@@ -42,6 +42,9 @@ namespace AutoTurnOver.Services
// 预计入库
var putin = DB.dc_auto_turnover.GetAutoInboundBySkuWH(sku, warehousecode, 0);
//历史库存
var dailyStock = DB.dc_auto_turnover.GetDailyStock(sku, warehousecode, DateTime.Now.AddDays(-7).ToDayHome());
//可用库存
var inventory = DB.dc_auto_turnover.GetAutoInventoryBySkuWH(sku, warehousecode);
......@@ -49,6 +52,26 @@ namespace AutoTurnOver.Services
var shortsupply = DB.dc_auto_turnover.GetAutoShortSupplyBySkuWH(sku, warehousecode);
if (sales.inventory_details!=null)
{
var tempinventory_details_list = sales.inventory_details.ToObj<List<decimal>>();
var tempinventory_details_list2 = sales.inventory_details.ToObj<List<decimal>>();
var i = 7;
foreach (var item in tempinventory_details_list)
{
if (i >= 1)
{
var this_date = DateTime.Now.AddDays(0 - i);
tempinventory_details_list2[7-i] = (dailyStock.FirstOrDefault(s => this_date.Year == s.record_time.Year && this_date.Month == s.record_time.Month && this_date.Day == s.record_time.Day) ?? new dc_daily_stock_dto()).usable_stock;
}
i--;
}
sales.inventory_details = tempinventory_details_list2.Select(s => (int)Math.Ceiling(s)).ToJson();
}
list.Add(sales != null ? sales.sales_details.ToObj<List<decimal>>().Select(s => (int)Math.Ceiling(s)).ToJson() : "[]");
list.Add(sales != null&& (!string.IsNullOrWhiteSpace(sales.sales_details_formula)) ? sales.sales_details_formula.ToObj<List<string>>().Select(s => s).ToJson() : "[]");
list.Add(sales != null ? sales.sales_explain_details.Replace("[", "").Replace("]", "").Split(',').ToJson() : "[]");
......@@ -609,6 +632,31 @@ namespace AutoTurnOver.Services
return datas;
}
public List<dynamic> GetSkuWarehouseSales(bailun_sku_website_sales_search_dto search_data)
{
var order_list = report.GetSkuWarehouseSales(search_data);
List<dynamic> datas = new List<dynamic>();
foreach (var item in order_list)
{
dynamic o = new ExpandoObject();
o.label = item.label;
o.warehouse_name = item.warehouse_name;
o.warehouse_code = item.warehouse_code;
foreach (var dat_item in item.days)
{
var dic = (IDictionary<string, object>)o;
dic["count_" + (dat_item.month + "-" + dat_item.day)] = new { val = Math.Round(dat_item.count, 2), year = dat_item.year, month = dat_item.month, day = dat_item.day };
dic["v_count_" + (dat_item.month + "-" + dat_item.day)] = Math.Round(dat_item.count, 2);
dic["sum_" + (dat_item.month + "-" + dat_item.day)] = Math.Round(dat_item.sum,2);
dic["v_sum_" + (dat_item.month + "-" + dat_item.day)] = Math.Round(dat_item.sum,2);
}
datas.Add(o);
}
return datas;
}
public MemoryStream SkuWebsiteSalesExport(bailun_sku_website_sales_detailed_search_dto search_data,UserData user)
{
......
AutoTurnOver/Controllers/CashFlowController.cs
......@@ -12,6 +12,7 @@ using AutoTurnOver.Utility;
using Dapper;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using AutoTurnOver.Utility;
namespace AutoTurnOver.Controllers
{
......@@ -40,6 +41,78 @@ namespace AutoTurnOver.Controllers
});
}
public FileResult ExportView(DateTime? btime, DateTime? etime, string platform_type, string web_site, string bailun_sku, string warehouse_code)
{
report_cash_flow_view_search_dto search_data = new report_cash_flow_view_search_dto
{
etime = etime,
btime = btime,
web_site = web_site,
platform_type = platform_type,
warehouse_code = warehouse_code,
bailun_sku = bailun_sku
};
var e_btime = DateTime.Now.AddDays(-8).ToDayHome();
var e_etime = DateTime.Now.AddDays(-1).ToDayEnd();
if (search_data.btime != null)
{
e_btime = search_data.btime.Value.ToDayHome();
}
if (search_data.etime != null)
{
e_etime = search_data.etime.Value.ToDayEnd();
}
var list = new CashFlowServices().GetView(search_data);
DataTable table = new DataTable();
string[] cols = new string[] { "类型", "汇总-发生", "汇总-支付"};
foreach (var item in cols)
{
table.Columns.Add(item);
}
var col_this_date =e_etime;
while (col_this_date.ToDayHome()> e_btime.ToDayHome())
{
table.Columns.Add($"{col_this_date.ToString("MM-dd")}-发生");
table.Columns.Add($"{col_this_date.ToString("MM-dd")}-支付");
col_this_date = col_this_date.AddDays(-1);
}
foreach (var itemDataD in list)
{
DataRow row = table.NewRow();
var itemData = (IDictionary<string, object>)itemDataD;
row["类型"] = itemData["date_type_str"];
row["汇总-发生"] = itemData["v_occur_汇总"];
row["汇总-支付"] = itemData["v_pay_汇总"];
var row_this_date = e_etime;
while (row_this_date.ToDayHome() > e_btime.ToDayHome())
{
row[$"{row_this_date.ToString("MM-dd")}-发生"] =itemData["v_occur_" + $"{row_this_date.Month}-{row_this_date.Day}"];
row[$"{row_this_date.ToString("MM-dd")}-支付"] =itemData["v_pay_" + $"{row_this_date.Month}-{row_this_date.Day}"];
row_this_date = row_this_date.AddDays(-1);
}
table.Rows.Add(row);
}
var fileName = AppContext.BaseDirectory + @"Result\RealtimeStock\现金流报表.csv";
DataTableHelper.SaveCSV(table, fileName);
var memory = new MemoryStream();
using (var stream = new FileStream(fileName, FileMode.Open))
{
stream.CopyTo(memory);
}
memory.Position = 0;
return File(memory, "text/csv", "现金流报表.csv");
}
public FileResult Export(DateTime? btime, DateTime? etime, string bailun_sku, string data_type = null, int? type = null, string platform_type = null, string warehouse_code = null, string web_site = "", int? view_type = 1)
{
var m = new dc_report_cash_flow_log_export_page_search_dto
......@@ -121,7 +194,8 @@ namespace AutoTurnOver.Controllers
warehouse_code = warehousecode,
monitor_status = monitor_status,
warehousearea = warehousearea,
warehousetype = warehousetype
warehousetype = warehousetype,
is_sum = false
};
var services = new CashFlowServices();
var page_data = services.SkuView(m);
......@@ -142,6 +216,105 @@ namespace AutoTurnOver.Controllers
}
public JsonResult SkuViewSumFooter(int? data_type, string sku_label, string bailun_sku, int offset, int limit, string order, string sort, string buyer_name, string warehousecode, string supplier_name, string warehousetype, int? warehousearea, int? monitor_status = null, string product_type = null)
{
var m = new dc_report_cash_flow_sku_group_search_dto
{
bailun_sku = bailun_sku,
page = 1,
rows = 1,
sidx = sort,
sord = order,
buyer_name = buyer_name,
sku_label = string.IsNullOrWhiteSpace(sku_label) ? null : WebUtility.UrlDecode(sku_label),
data_type = data_type,
supplier_name = supplier_name,
product_type = product_type,
warehouse_code = warehousecode,
monitor_status = monitor_status,
warehousearea = warehousearea,
warehousetype = warehousetype,
is_sum = true
};
var services = new CashFlowServices();
var list = services.SkuView(m);
return new JsonResult(list == null || list.Items.Count <= 0 ? new dc_report_cash_flow_sku_group_dto() : list.Items[0]);
}
public FileResult ExportSkuView(int? data_type, string sku_label, string bailun_sku, int offset, int limit, string order, string sort, string buyer_name, string warehousecode, string supplier_name, string warehousetype, int? warehousearea, int? monitor_status = null, string product_type = null)
{
var m = new dc_report_cash_flow_sku_group_search_dto
{
bailun_sku = bailun_sku,
page = 1,
rows = int.MaxValue,
sidx = sort,
sord = order,
buyer_name = buyer_name,
sku_label = string.IsNullOrWhiteSpace(sku_label) ? null : WebUtility.UrlDecode(sku_label),
data_type = data_type,
supplier_name = supplier_name,
product_type = product_type,
warehouse_code = warehousecode,
monitor_status = monitor_status,
warehousearea = warehousearea,
warehousetype = warehousetype
};
var services = new CashFlowServices();
var list = services.SkuView(m).Items;
DataTable table = new DataTable();
string[] cols = new string[] { "sku","仓库编码","仓库名称","名称","累计值","本月结余","本月正数","本月负数","上月结余","上月正数","上月负数","采购员","可用库存"
,"可用库存金额","在途数量","在途金额","7日日均","14日日均","30日日均","停售状态"
};
foreach (var item in cols)
{
table.Columns.Add(item);
}
foreach (var itemData in list)
{
DataRow row = table.NewRow();
row["sku"] = itemData.bailun_sku;
row["仓库编码"] = itemData.warehouse_code;
row["仓库名称"] = itemData.warehouse_name;
row["名称"] = itemData.sku_name;
row["累计值"] = itemData.balance;
row["本月结余"] = itemData.current_balance;
row["本月正数"] = itemData.current_income;
row["本月负数"] = itemData.current_expend;
row["上月结余"] = itemData.last_balance;
row["上月正数"] = itemData.last_income;
row["上月负数"] = itemData.last_expend;
row["采购员"] = itemData.buyer_name;
row["可用库存"] = itemData.usable_stock;
row["可用库存金额"] = itemData.stock_amount;
row["在途数量"] = itemData.on_the_way;
row["在途金额"] = itemData.on_the_way_amount;
row["7日日均"] = itemData.history_sevenday_sales;
row["14日日均"] = itemData.history_fourteenday_sales;
row["30日日均"] = itemData.history_thirtyday_sales;
row["停售状态"] = itemData.sku_status==1? "停售" : "在售";
table.Rows.Add(row);
}
var fileName = AppContext.BaseDirectory + @"Result\RealtimeStock\现金流明细.csv";
DataTableHelper.SaveCSV(table, fileName);
var memory = new MemoryStream();
using (var stream = new FileStream(fileName, FileMode.Open))
{
stream.CopyTo(memory);
}
memory.Position = 0;
return File(memory, "text/csv", "现金流明细.csv");
}
[HttpGet]
public JsonResult LogPage(int limit, int offset, string order, string sort, DateTime? btime, DateTime? etime, string bailun_sku, string data_type = null, int? type = null, string platform_type = null, string warehouse_code = null, string web_site = "", int? view_type = 1)
{
......
AutoTurnOver/Controllers/ReportsController.cs
......@@ -302,7 +302,7 @@ namespace AutoTurnOver.Controllers
DataTable table = new DataTable();
string[] cols = new string[] { "缺货统计时间", "平台订单号", "平台类型", "百伦订单号", "付款交易号", "站点", "付款时间", "销售账号","国家","sku","订单所有itemid",
"产品名称", "订单sku销量", "发货数量","发货仓库编码","发货仓库", "是否缺货", "仓库总缺货", "国内仓总缺货", "其他有库存仓库", "其他仓库库存数","国内仓是否缺货","采购员",
"平台物流方式", "发货物流方式", "sku监控状态", "销售状态", "总在途库存数", "最先到货采购单","最快到货时间","采购单供应商","采购单阿里巴巴单号","采购单物流单号","品牌"
"平台物流方式", "发货物流方式", "sku监控状态", "销售状态", "总在途库存数", "最先到货采购单","最快到货时间","采购单供应商","采购单阿里巴巴单号","采购单物流单号","品牌","订单最后发货时间"
};
foreach (var item in cols)
{
......@@ -347,6 +347,7 @@ namespace AutoTurnOver.Controllers
row["采购单阿里巴巴单号"] = itemData.min_buy.alibaba_order_id;
row["采购单物流单号"] = itemData.min_buy.logistics_order_id;
row["品牌"] = itemData.brand;
row["订单最后发货时间"] = itemData.shipping_deadline_real;
table.Rows.Add(row);
}
......@@ -651,7 +652,99 @@ namespace AutoTurnOver.Controllers
});
}
public FileResult SkuWebsiteSalesExport(string platform_type,string label,string website,int? year,int? month,int? day)
public JsonResult GetSkuWarehouseSales(string platform_type,string warehousetype, int? warehousearea, string warehousecode,DateTime? btime,DateTime? etime)
{
bailun_sku_website_sales_search_dto search_data = new bailun_sku_website_sales_search_dto {
platform_type = platform_type,
warehousetype = warehousetype,
etime = etime,
btime = btime,
warehousearea =warehousearea,
warehouse_code = warehousecode
};
var list = new ReportServices().GetSkuWarehouseSales(search_data);
return new JsonResult(new
{
rows = list,
total = 0,
});
}
public FileResult ExportTableSkuWarehouse(string platform_type, string warehousetype, int? warehousearea, string warehousecode, DateTime? btime, DateTime? etime)
{
bailun_sku_website_sales_search_dto search_data = new bailun_sku_website_sales_search_dto
{
platform_type = platform_type,
warehousetype = warehousetype,
etime = etime,
btime = btime,
warehousearea = warehousearea,
warehouse_code = warehousecode
};
var e_btime = DateTime.Now.AddDays(-8).ToDayHome();
var e_etime = DateTime.Now.AddDays(-1).ToDayEnd();
if (search_data.btime != null)
{
e_btime = search_data.btime.Value.ToDayHome();
}
if (search_data.etime != null)
{
e_etime = search_data.etime.Value.ToDayEnd();
}
var list = new ReportServices().GetSkuWarehouseSales(search_data);
DataTable table = new DataTable();
string[] cols = new string[] { "分类", "仓库"};
foreach (var item in cols)
{
table.Columns.Add(item);
}
var col_this_date = e_etime;
while (col_this_date.ToDayHome() > e_btime.ToDayHome())
{
table.Columns.Add($"{col_this_date.ToString("MM-dd")}-销量");
table.Columns.Add($"{col_this_date.ToString("MM-dd")}-销售额");
col_this_date = col_this_date.AddDays(-1);
}
foreach (var itemDataD in list)
{
DataRow row = table.NewRow();
var itemData = (IDictionary<string, object>)itemDataD;
row["分类"] = itemData["label"];
row["仓库"] = itemData["warehouse_name"];
var row_this_date = e_etime;
while (row_this_date.ToDayHome() > e_btime.ToDayHome())
{
row[$"{row_this_date.ToString("MM-dd")}-销量"] = itemData["v_count_" + $"{row_this_date.Month}-{row_this_date.Day}"];
row[$"{row_this_date.ToString("MM-dd")}-销售额"] = itemData["v_sum_" + $"{row_this_date.Month}-{row_this_date.Day}"];
row_this_date = row_this_date.AddDays(-1);
}
table.Rows.Add(row);
}
var fileName = AppContext.BaseDirectory + @"Result\RealtimeStock\商品汇总_仓库.csv";
DataTableHelper.SaveCSV(table, fileName);
var memory = new MemoryStream();
using (var stream = new FileStream(fileName, FileMode.Open))
{
stream.CopyTo(memory);
}
memory.Position = 0;
return File(memory, "text/csv", "商品汇总_仓库.csv");
}
public FileResult SkuWebsiteSalesExport(string platform_type,string label,string website,string warehouse_code, int? year,int? month,int? day)
{
var user = AutoUtility.GetUser();
var memory = new ReportServices().SkuWebsiteSalesExport(new bailun_sku_website_sales_detailed_search_dto {
......@@ -660,6 +753,7 @@ namespace AutoTurnOver.Controllers
month = month??0,
platform_type = platform_type,
website =website,
warehouse_code = warehouse_code,
year = year??0
}, AutoUtility.GetUser());
return File(memory, "text/csv", $"{user.UserAccount}商品分类数据信息.csv");
......@@ -683,6 +777,25 @@ namespace AutoTurnOver.Controllers
return new JsonResult(list == null || list.Count <= 0 ? new dc_base_stock_dto() : list[0]);
}
public JsonResult GetSkuWarehouseSalesSumFooter(string platform_type,string warehousetype, int? warehousearea, string warehousecode, DateTime? btime, DateTime? etime)
{
bailun_sku_website_sales_search_dto search_data = new bailun_sku_website_sales_search_dto
{
platform_type = platform_type,
warehousetype = warehousetype,
has_sum =true,
etime = etime,
btime = btime,
warehousearea = warehousearea,
warehouse_code = warehousecode
};
var list = new ReportServices().GetSkuWarehouseSales(search_data);
return new JsonResult(list == null || list.Count <= 0 ? new dc_base_stock_dto() : list[0]);
}
[UseAction]
[BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【报表】->【商品分类汇总】->【搜索】页面", 0)]
public JsonResult SupplierSalesList(string supplier_name, int offset, int limit, string order, string sort)
......
ResetOutofstock/Program.cs
......@@ -13,9 +13,17 @@ namespace ResetOutofstock
static async Task Main(string[] args)
{
Console.WriteLine("刷新缺货数据任务启动...");
try
{
var now = DateTime.Now;
//report_cash_flow_dao.CalculationTransferOrder(now.AddMonths(-3), DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")));
//report_cash_flow_dao.SynchroTransferCost();
}
catch (Exception ex)
{
throw;
}
var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
......
ResetOutofstock/ResetOutofstockBackgrounService.cs
......@@ -95,10 +95,19 @@ namespace ResetOutofstock
{
try
{
var now = DateTime.Now;
if (now.Hour>2 && now.Hour<=8)
{
Console.WriteLine(" 刷新缺货明细数据 * (数据库忙时，暂停)");
}
else
{
Console.WriteLine($"开始刷新缺货明细数据，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
report.ResetOutofstock();
Console.WriteLine($"结束刷新缺货明细数据任务，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
}
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
......
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