Skip to content

D
data-center-auto
Commit 07edea89 by 泽锋 李
Options

库容改为跟账号

parent 5423ed14
Showing with 10 additions and 94 deletions
AutoTurnOver.DB/db_config.cs
......@@ -861,7 +861,6 @@ GROUP BY t1.bailun_sku,t3.hq_type
{
conn.Insert(new dc_base_storage_capacity_config_log
{
bailun_sku = turnover_item.bailun_sku,
create_user = user.UserAccount,
create_date = DateTime.Now,
status = status,
......@@ -894,7 +893,6 @@ GROUP BY t1.bailun_sku,t3.hq_type
{
var newData = new dc_base_storage_capacity_config
{
bailun_sku = turnover_item.bailun_sku,
warehouse_code = turnover_item.warehouse_code,
status = status,
bailun_sku_warehouse_code = $"{turnover_item.bailun_sku}{turnover_item.warehouse_code}"
......
AutoTurnOver.DB/dc_auto_turnover.cs
......@@ -139,11 +139,6 @@ from dc_auto_turnover as dat
{
sqlCount += " left join dc_auto_config_sku_warehouse as t5 on dat.bailun_sku = t5.bailun_sku and dat.warehouse_code = t5.warehouse_code ";
}
if (m.storage_capacity_status != null)
{
sqlCount += " left join dc_base_storage_capacity_config as t16 on dat.bailun_sku = t16.bailun_sku and dat.warehouse_code = t16.warehouse_code ";
sql += " left join dc_base_storage_capacity_config as t16 on dat.bailun_sku = t16.bailun_sku and dat.warehouse_code = t16.warehouse_code ";
}
if (m.returngoodspush_state != null)
{
sqlCount += " left join dc_return_goods_not_push as t12 on dat.bailun_sku = t12.bailun_sku and dat.warehouse_code = t12.warehouse_code ";
......@@ -160,11 +155,6 @@ from dc_auto_turnover as dat
{
sqlCount += " left join not_trans_view as t15 on dat.bailun_sku = t15.bailun_sku and dat.warehouse_code = t15.warehouse_code ";
}
if (m.storage_capacity_lack_quantity_max > 0 || m.storage_capacity_lack_quantity_min > 0)
{
sqlCount += " left join dc_mid_transit as t13 on dat.bailun_sku = t13.bailun_sku and dat.warehouse_code = t13.warehouse_code ";
sqlCount += " inner join dc_base_storage_capacity as t17 on dat.bailun_sku_warehouse_code = t17.bailun_sku_warehouse_code ";
}
sqlCount += " where 1=1 ";
sql += " where 1=1 ";
var whereSql = "";
......@@ -212,16 +202,7 @@ from dc_auto_turnover as dat
whereSql += " and ( t5.`status`=0 or t5.`status` is null ) ";
sqlCount += " and ( t5.`status`=0 or t5.`status` is null ) ";
}
if (m.storage_capacity_status == 1)
{
whereSql += " and t16.`status`=1 ";
sqlCount += " and t16.`status`=1 ";
}
if (m.storage_capacity_status == 0)
{
whereSql += " and t16.`status` is null ";
sqlCount += " and t16.`status` is null ";
}
if (m.returngoodspush_state == 1)
{
......@@ -360,18 +341,6 @@ from dc_auto_turnover as dat
sqlCount += " and t2.oneday_sales<=@oneday_sales_max ";
parameters.Add("oneday_sales_max", m.oneday_sales_max);
}
if (m.storage_capacity_lack_quantity_min != null)
{
whereSql += " and (dat.quantity_final_advise - t17.stock - ifnull(t13.quantity_purchase,0) - ifnull(t13.quantity_transfer_temp_schedule,0) - ifnull(t13.quantity_transfer_temporary_storage,0) )>=@storage_capacity_lack_quantity_min ";
sqlCount += " and (dat.quantity_final_advise - t17.stock - ifnull(t13.quantity_purchase,0) - ifnull(t13.quantity_transfer_temp_schedule,0) - ifnull(t13.quantity_transfer_temporary_storage,0) )>=@storage_capacity_lack_quantity_min ";
parameters.Add("storage_capacity_lack_quantity_min", m.storage_capacity_lack_quantity_min);
}
if (m.storage_capacity_lack_quantity_max != null)
{
whereSql += " and (dat.quantity_final_advise - t17.stock - ifnull(t13.quantity_purchase,0) - ifnull(t13.quantity_transfer_temp_schedule,0) - ifnull(t13.quantity_transfer_temporary_storage,0) )<=@storage_capacity_lack_quantity_max ";
sqlCount += " and (dat.quantity_final_advise - t17.stock - ifnull(t13.quantity_purchase,0) - ifnull(t13.quantity_transfer_temp_schedule,0) - ifnull(t13.quantity_transfer_temporary_storage,0) )<=@storage_capacity_lack_quantity_max ";
parameters.Add("storage_capacity_lack_quantity_max", m.storage_capacity_lack_quantity_max);
}
if (m.avg_type > 0)
{
var field_str = "";
......
AutoTurnOver.DB/dc_base_storage_capacity_dao.cs
......@@ -154,7 +154,7 @@ left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where
{
throw new Exception("无法识别的流水类型");
}
data.bailun_sku_warehouse_code = $"{data.bailun_sku}{data.warehouse_code}";
data.bailun_sku_warehouse_code = $"{data.warehouse_code}";
var conn = MyMySqlConnection._connection;
conn.Open();
using (var t = conn.BeginTransaction())
......@@ -171,7 +171,6 @@ left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where
mainData = new dc_base_storage_capacity
{
bailun_sku_warehouse_code = data.bailun_sku_warehouse_code,
bailun_sku = data.bailun_sku,
warehouse_code = data.warehouse_code,
create_user = data.create_user,
create_date = DateTime.Now,
......@@ -184,7 +183,6 @@ left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where
// 添加库容监控
conn.Insert<dc_base_storage_capacity_config>(new dc_base_storage_capacity_config
{
bailun_sku = mainData.bailun_sku,
bailun_sku_warehouse_code = mainData.bailun_sku_warehouse_code,
status = 1,
warehouse_code = mainData.warehouse_code
......
AutoTurnOver.DB/purchase_advise.cs
......@@ -579,7 +579,7 @@ and t1.quantity_init_advise>=0 and ( t3.buyer_name in ('张莹霞1') and t1.ware
// 调整因为舍弃小数导致的moq不足
var datas = MyMySqlConnection._connection.Query<dc_auto_purchase_advise_detailed>(" select * from dc_auto_purchase_advise_detailed where main_id=@main_id ", new { main_id = mainID }, commandTimeout: 0).AsList().Where(s=>s.storage_capacity_lack_quantity<=0).ToList();
var datas = MyMySqlConnection._connection.Query<dc_auto_purchase_advise_detailed>(" select * from dc_auto_purchase_advise_detailed where main_id=@main_id ", new { main_id = mainID }, commandTimeout: 0).AsList().ToList();
if (datas != null && datas.Count > 0)
{
foreach (var itemGoods in datas.GroupBy(s => new { s.suppliers_id, s.product_inner_code, s.warehouse_code }))
......@@ -1887,14 +1887,7 @@ where 1=1 ";
{
sql += " and t1.ispush=" + (m.ispush == true ? 1 : 0);
}
if (m.is_storage_capacity_lack == 1)
{
sql += " and t1.storage_capacity_lack_quantity>0 ";
}
if (m.is_storage_capacity_lack == 0)
{
sql += " and t1.storage_capacity_lack_quantity<=0 ";
}
if (!string.IsNullOrWhiteSpace(m.warehousetype))
{
sql += " and t2.hq_type=" + $"'{m.warehousetype}'";
......
AutoTurnOver.Models/dc_auto_purchase_advise.cs
......@@ -49,10 +49,6 @@ namespace AutoTurnOver.Models
{
public int id { get; set; }
/// <summary>
/// 可用库容
/// </summary>
public decimal? storage_capacity_quantity { get; set; }
/// <summary>
/// sku
......@@ -313,11 +309,6 @@ namespace AutoTurnOver.Models
public int is_mother_map_sku { get; set; }
/// <summary>
/// 库容缺少值
/// </summary>
public int storage_capacity_lack_quantity { get; set; }
}
......
AutoTurnOver.Models/dc_auto_turnover.cs
......@@ -620,8 +620,6 @@ namespace AutoTurnOver.Models
[Description("是否侵权")]
public int? has_tort { get; set; }
[Description("是否监控库容")]
public int? storage_capacity_status { get; set; }
/// <summary>
......@@ -718,11 +716,6 @@ namespace AutoTurnOver.Models
[Description("日均（最大）")]
public int? avg_sales_max { get; set; }
[Description("库容缺少值（最小）")]
public int? storage_capacity_lack_quantity_min { get; set; }
[Description("库容缺少值（最大）")]
public int? storage_capacity_lack_quantity_max { get; set; }
[Description("产品类型")]
public string product_type { get; set; }
......@@ -895,20 +888,7 @@ namespace AutoTurnOver.Models
}
private decimal? _storage_capacity_lack_quantity;
public decimal? storage_capacity { get; set; }
/// <summary>
/// 库容缺少值
/// </summary>
public decimal? storage_capacity_lack_quantity
{
get
{
if (_storage_capacity_lack_quantity == null) return null;
return Math.Max(0, _storage_capacity_lack_quantity.Value);
}
set { _storage_capacity_lack_quantity = value; }
}
/// <summary>
/// Walmart 过去7日销量（日均)
/// </summary>
......
AutoTurnOver.Models/dc_base_storage_capacity.cs
......@@ -10,7 +10,6 @@ namespace AutoTurnOver.Models
public class dc_base_storage_capacity
{
public int id { get; set; }
public string bailun_sku { get; set; }
public string warehouse_code { get; set; }
public DateTime create_date { get; set; }
public decimal stock { get; set; }
......@@ -65,7 +64,6 @@ namespace AutoTurnOver.Models
public class dc_base_storage_capacity_log
{
public int id { get; set; }
public string bailun_sku { get; set; }
public string warehouse_code { get; set; }
public DateTime create_date { get; set; }
......
AutoTurnOver.Models/dc_base_storage_capacity_config.cs
......@@ -11,7 +11,6 @@ namespace AutoTurnOver.Models
public class dc_base_storage_capacity_config
{
public int id { get; set; }
public string bailun_sku { get; set; }
public string warehouse_code { get; set; }
public string bailun_sku_warehouse_code { get; set; }
......@@ -23,7 +22,6 @@ namespace AutoTurnOver.Models
public class dc_base_storage_capacity_config_log
{
public int id { get; set; }
public string bailun_sku { get; set; }
public string warehouse_code { get; set; }
/// <summary>
......
AutoTurnOver.Models/dc_report_profit_analysis.cs
......@@ -377,8 +377,6 @@ namespace AutoTurnOver.Models
public string brand { get; set; }
public decimal? weight { get; set; }
public string product_name { get; set; }
public decimal? storage_capacity { get; set; }
public decimal? fba_storage_capacity { get; set; }
......
AutoTurnOver.Services/PurchaseAdviseServices.cs
......@@ -133,7 +133,7 @@ namespace AutoTurnOver.Services
"采购单价" ,"历史7天日均","历史14日均","历史30日均","加权日均","安全库存","今日实际缺货","供应链累积销量","供应链到货当天的销量"
,"预测销量","累积入库数量","实际库存","moq","多备天数","多备数量","预测销量配置","实际推送下单数量","总下单金额","转仓来源仓库编码","转仓来源仓库名称","仓库类型","最新计算时间"
,"首单日期","首单单号"
,"母sku" ,"母sku原始建议数" ,"库容缺少值" ,"可用库容","切换物流备注"
,"切换物流备注"
};
foreach (var item in cols)
{
......@@ -144,8 +144,6 @@ namespace AutoTurnOver.Services
{
DataRow row = table.NewRow();
row["切换物流备注"] = itemData.replace_logistics_remarks;
row["库容缺少值"] = itemData.storage_capacity_lack_quantity;
row["可用库容"] = itemData.storage_capacity_quantity;
row["首单日期"] =( itemData.first_order_date==null?"": itemData.first_order_date.Value.ToString("yyyy-MM-dd HH:mm:ss"));
row["首单单号"] = itemData.first_order_bailun_order_id;
......
AutoTurnOver.Services/SkuAutoTurnServices.cs
......@@ -320,7 +320,7 @@ namespace AutoTurnOver.Services
,"调拨陆运在途数量","调拨海运在途数量","调拨空运在途数量","调拨铁路在途数量","首次入库时间","供应链累计销量","销量预测规则","默认头程运输方式","默认头程渠道","计算时间",
"日均出单次数","首次出单日期","首次出单订单号",
"备货数量","产品类型","头程平均值取值来源","Walmart最近7天日均销量","Walmart最近14天日均销量","Walmart最近30天日均销量",
"平均交期","配置交期","库容缺少值","可用库容",
"平均交期","配置交期",
"库存可用天数","库存可用日期", "库存+在途可用天数","库存+在途可用日期","在途+库存可卖天数总目标销量","供应链长度总目标销量"
};
foreach (var item in cols)
......@@ -338,8 +338,7 @@ namespace AutoTurnOver.Services
row["库存+在途可用天数"] = itemData.full_stock_use_days;
row["库存+在途可用日期"] = itemData.full_stock_use_date.ToString("yyyy-MM-dd");
row["可用库容"] = itemData.storage_capacity;
row["库容缺少值"] = itemData.storage_capacity_lack_quantity;
row["平均交期"] = itemData.supplier_delivery;
row["配置交期"] = itemData.supplier_delivery_config;
......@@ -750,7 +749,7 @@ namespace AutoTurnOver.Services
DataTable table = new DataTable();
string[] cols = new string[] { "sku","产品名称","商品编码","品牌", "国家", "仓库类型", "仓库", "默认调拨方式", "180天日均", "90天日均", "30天日均","7天日均","加权日均销量","预测日均销量", "采购单价"
,"Fba库容值" ,"可用库容值","空运票数占比","空运数量占比" , "单位重量", "实际建议周转数",
,"空运票数占比","空运数量占比" , "单位重量", "实际建议周转数",
"实际建议周转金额", "实际周转数", "实际周转运费", "实际运费单价", "海运周转数（推荐海运）", "海运周转金额", "海运周转运费", "空运周转数（推荐空运）", "空运周转金额",
"空运周转运费","实际-海运运费差值", "实际-海运周转采购金额差值" ,"实际-空运运费差值", "实际-空运周转采购金额差值", "海运-空运运费差值", "海运-空运周转采购金额差值", "安全库存数量", "空运周转天数", "实际周转天数",
"海运周转天数", "30天预测销量海运运费-实际周转运费金额", "30天预测销量空运运费-实际周转运费金额", "30天预测销量空运运费-海运周转运费金额"
......@@ -776,8 +775,7 @@ namespace AutoTurnOver.Services
row["拟下单日期"] = itemData.now.ToString("yyyy-MM-dd");
row["可用日期"] = itemData.stock_available_date.ToString("yyyy-MM-dd");
row["Fba库容值"] = itemData.fba_storage_capacity;
row["可用库容值"] = itemData.storage_capacity;
row["空运票数占比"] = itemData.order_count_3_radio;
row["空运数量占比"] = itemData.product_count_3_radio;
......
AutoTurnOver.Services/StorageCapacityServices.cs
......@@ -56,11 +56,9 @@ namespace AutoTurnOver.Services
index++;
try
{
var bailun_sku = row["SKU"].ToString();
var warehouse_code = row["仓库编码"].ToString();
var stock_str = row["库容"].ToString();
if (string.IsNullOrWhiteSpace(bailun_sku)) throw new Exception("SKU必填");
if (string.IsNullOrWhiteSpace(warehouse_code)) throw new Exception("warehouse_code必填");
var warehouse_data = warehouse_list.SingleOrDefault(s => s.warehouse_code.Equals(warehouse_code, StringComparison.OrdinalIgnoreCase));
if (warehouse_data == null) { throw new Exception("仓库在系统中找不到"); }
......@@ -75,7 +73,6 @@ namespace AutoTurnOver.Services
dc_base_storage_capacity_dao.AddLog(new dc_base_storage_capacity_log
{
create_user = user.UserName,
bailun_sku = bailun_sku,
warehouse_code = warehouse_code,
order_no = "",
quantity = stock,
......
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