Skip to content

D
data-center-auto
Commit 5423ed14 by 泽锋 李
Options

去除母sku

parent 2c511198
Showing with 1 addition and 496 deletions
AutoGeneratePurchaseAdvise/Program.cs
......@@ -26,8 +26,6 @@ namespace AutoGeneratePurchaseAdvise
//PurchaseAdviseServices.Generate($"下午的补充周转 {DateTime.Now.ToString("HH: mm")}", DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 12:00:00")));
//PurchaseAdviseServices.AutoPushBuySys(4);
}
catch (Exception ex)
{
......
AutoTurnOver.DB/db_config.cs
......@@ -673,15 +673,6 @@ GROUP BY t1.bailun_sku,t3.hq_type
bailun_sku_warehouse_codes = datas.Select(s => $"{s.bailun_sku}{s.warehouse_code}").ToList()
});
}
//停止监控之后，从母sku移除
if (monitor_status == 1)
{
dc_base_mother_sku_dao.RemoveMap(new remove_map_input_dto
{
map_ids = conn.Query<int>(" select t1.id from dc_base_mother_sku_map as t1 where t1.bailun_sku_warehouse_code in @bailun_sku_warehouse_codes ", new { bailun_sku_warehouse_codes = datas.Select(s => s.bailun_sku_warehouse_code).ToList() }).ToList()
}, new UserData { UserName = "system" });
}
return "";
......
AutoTurnOver.DB/dc_auto_turnover.cs
......@@ -223,17 +223,6 @@ from dc_auto_turnover as dat
sqlCount += " and t16.`status` is null ";
}
if (m.is_mother_sku == 1)
{
whereSql += " and dat.`is_mother_sku`=1 ";
sqlCount += " and dat.`is_mother_sku`=1 ";
}
if (m.is_mother_sku == 0)
{
whereSql += " and dat.`is_mother_sku` is null ";
sqlCount += " and dat.`is_mother_sku` is null ";
}
if (m.returngoodspush_state == 1)
{
whereSql += " and t12.`status`=1 ";
......@@ -289,21 +278,6 @@ from dc_auto_turnover as dat
whereSql += " and dat.sku_title like " + $"'%{m.key_words}%'";
sqlCount += " and dat.sku_title like" + $"'%{m.key_words}%'";
break;
case 8:
var mother_sku_warehouse_codes = _connection.Query<string>(@" select mother_sku_warehouse_code from dc_base_mother_sku_map as tm where tm.bailun_sku = @bailun_sku ", new { bailun_sku = m.key_words }).ToList();
if (mother_sku_warehouse_codes != null && mother_sku_warehouse_codes.Count >= 1)
{
whereSql += " and dat.bailun_sku_warehouse_code in @bailun_sku_warehouse_codes";
sqlCount += " and dat.bailun_sku_warehouse_code in @bailun_sku_warehouse_codes";
parameters.Add("bailun_sku_warehouse_codes", mother_sku_warehouse_codes);
}
else
{
whereSql += " and 1=2 ";
sqlCount += " and 1=2 ";
}
break;
default: break;
}
......@@ -500,24 +474,6 @@ from dc_auto_turnover as dat
item.storage_capacity_status = storage_capacity_config.status;
}
//太大了可能是导出，就不查了
if (obj.Count <= 200)
{
// 查询所有映射
var map_datas = _connection.Query<dc_base_mother_sku_map>(" select * from dc_base_mother_sku_map where mother_sku_warehouse_code in @mother_sku_warehouse_codes ", new
{
mother_sku_warehouse_codes = obj.Select(s => s.bailun_sku_warehouse_code).ToList()
}).ToList();
if (map_datas != null && map_datas.Count >= 1)
{
var map_turn_datas = _connection.Query<dc_auto_turnover_list_dto>(sql + " and dat.bailun_sku_warehouse_code in @bailun_sku_warehouse_codes ", new { bailun_sku_warehouse_codes = map_datas.Select(s => s.bailun_sku_warehouse_code).ToList() });
foreach (var item in obj)
{
item.maps = map_turn_datas.Where(s => map_datas.Any(v => v.mother_sku_warehouse_code == item.bailun_sku_warehouse_code && s.bailun_sku_warehouse_code == v.bailun_sku_warehouse_code)).ToList();
}
}
}
}
return obj;
......@@ -1356,10 +1312,6 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
var result = GetModel(bailun_sku, warehouse_code);
if (result.is_mother_sku == 1)
{
return null;
}
var result_air = GetModelAir(bailun_sku, warehouse_code);
var result_ocean = GetModelOcean(bailun_sku, warehouse_code);
var base_wa = _connection.QueryFirstOrDefault<string>(" select t2.`code` from dc_base_warehouse as t1 left join dc_base_country as t2 on t1.area_name = t2.`name` where warehouse_code=@warehouse_code ", new { warehouse_code });
......
AutoTurnOver.DB/dc_base_storage_capacity_dao.cs
......@@ -230,8 +230,6 @@ left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where
}
//更新母sku库容
dc_base_mother_sku_dao.ResetStorageCapacityByMapSku(data.bailun_sku, data.warehouse_code, new UserData { UserName = data.create_user });
if (type_enum == dc_base_storage_capacity_log_enum.导入)
{
......
AutoTurnOver.Models/dc_auto_purchase_advise.cs
......@@ -314,21 +314,6 @@ namespace AutoTurnOver.Models
/// <summary>
/// 母sku的原始下单需求
/// </summary>
public int? mother_sku_quantity { get; set; }
/// <summary>
/// 对应的母sku
/// </summary>
public string mother_sku { get; set; }
/// <summary>
/// 对应母sku+仓库编码
/// </summary>
public string mother_sku_warehouse_code { get; set; }
/// <summary>
/// 库容缺少值
/// </summary>
public int storage_capacity_lack_quantity { get; set; }
......
AutoTurnOver.Models/dc_auto_turnover.cs
......@@ -572,12 +572,6 @@ namespace AutoTurnOver.Models
[Description(@"调拨下单天数")]
public int transfer_order_days { get; set; }
/// <summary>
/// 是否为母sku
/// </summary>
[Description(@"是否为母sku")]
public int is_mother_sku { get; set; }
public string bailun_sku_warehouse_code { get; set; }
......@@ -629,8 +623,6 @@ namespace AutoTurnOver.Models
[Description("是否监控库容")]
public int? storage_capacity_status { get; set; }
[Description("子母sku类型")]
public int? is_mother_sku { get; set; }
/// <summary>
/// 仓库编码
......
AutoTurnOver.Models/dc_base_mother_sku.cs
......@@ -8,84 +8,7 @@ namespace AutoTurnOver.Models
/// <summary>
/// 子母sku
/// </summary>
public class dc_base_mother_sku
{
public int id { get; set; }
public string sku { get; set; }
public string warehouse_code { get; set; }
public string sku_warehouse_code { get; set; }
/// <summary>
/// 状态
/// </summary>
public int status { get; set; }
/// <summary>
/// 库容
/// </summary>
public int storage_capacity { get; set; }
}
public class dc_base_mother_sku_map
{
public int id { get; set; }
public string mother_sku { get; set; }
public string mother_warehouse_code { get; set; }
public string mother_sku_warehouse_code { get; set; }
public string bailun_sku { get; set; }
public string warehouse_code { get; set; }
public string bailun_sku_warehouse_code { get; set; }
/// <summary>
/// 是否主sku
/// </summary>
public int is_main { get; set; }
}
public class dc_base_mother_sku_log
{
public int id { get; set; }
public string sku { get; set; }
public string warehouse_code { get; set; }
public string sku_warehouse_code { get; set; }
public string action { get; set; }
public DateTime create_date { get; set; }
public string create_user { get; set; }
}
public class dc_base_mother_sku_dto: dc_base_mother_sku
{
public string warehouse_name { get; set; }
public List<dc_base_mother_sku_map_dto> maps { get; set; }
} public class dc_base_mother_sku_map_dto : dc_base_mother_sku_map
{
public string warehouse_name { get; set; }
public int storage_capacity { get; set; }
}
public class dc_base_mother_sku_log_dto : dc_base_mother_sku_log
{
public string warehouse_name { get; set; }
}
public class dc_base_mother_sku_search_dto
{
public string sku { get; set; }
public string bailun_sku { get; set; }
[Description("仓库类型")]
public string warehousetype { get; set; }
[Description("仓库国家")]
public int? warehousearea { get; set; }
[Description("仓库编码")]
public string warehousecode { get; set; }
}
public class dc_base_mother_sku_log_search_dto
{
public string sku { get; set; }
[Description("仓库编码")]
public string warehousecode { get; set; }
}
public class update_status_input_dto
{
......
AutoTurnOver.Services/MotherSkuServices.cs
......@@ -16,124 +16,6 @@ namespace AutoTurnOver.Services
/// </summary>
public class MotherSkuServices
{
public List<dc_base_mother_sku_dto> Page(dc_base_mother_sku_search_dto search, int offset, int limit, ref int total)
{
return dc_base_mother_sku_dao.Page(search, offset, limit, ref total);
}
public List<dc_base_mother_sku_log_dto> LogPage(dc_base_mother_sku_log_search_dto search, int offset, int limit, ref int total)
{
return dc_base_mother_sku_dao.LogPage(search, offset, limit, ref total);
}
public void Save(dc_base_mother_sku data, UserData user)
{
dc_base_mother_sku_dao.Save(data, user);
}
public void UpdateStatus(update_status_input_dto data, UserData user)
{
dc_base_mother_sku_dao.UpdateStatus(data, user);
}
public void RemoveMap(remove_map_input_dto data, UserData user)
{
dc_base_mother_sku_dao.RemoveMap(data, user);
}
public void SetMainMap(remove_map_input_dto data, UserData user)
{
dc_base_mother_sku_dao.SetMainMap(data, user);
}
public void BatchSet(batch_set_input_dto input_data, UserData user)
{
dc_base_mother_sku_dao.BatchSet(input_data, user);
}
public List<dc_base_mother_sku_dto> SearchSku(string name)
{
return dc_base_mother_sku_dao.SearchSku(name);
}
public DataTable Import(Stream fileInfo, UserData user)
{
var conn = MyMySqlConnection._connection;
var data_set = EPPlusHelper.ReadExcel(fileInfo);
var table = data_set.Tables[0];
if (!table.Columns.Contains("导入结果")) table.Columns.Add("导入结果");
if (!table.Columns.Contains("导入异常")) table.Columns.Add("导入异常");
var warehouse_list = DB.common.ListWareHouse(null, null);
DateTime now = DateTime.Now;
int index = 1;
foreach (DataRow row in table.Rows)
{
index++;
try
{
var mother_bailun_sku = row["母SKU"].ToString();
var month_warehouse_code = row["母仓库编码"].ToString();
var bailun_sku = row["子SKU"].ToString();
var warehouse_code = row["子仓库编码"].ToString();
var is_main = row["是否主sku"].ToString();
if (string.IsNullOrWhiteSpace(mother_bailun_sku)) throw new Exception("母SKU必填");
if (string.IsNullOrWhiteSpace(month_warehouse_code)) throw new Exception("母warehouse_code必填");
if (string.IsNullOrWhiteSpace(bailun_sku)) throw new Exception("SKU必填");
if (string.IsNullOrWhiteSpace(warehouse_code)) throw new Exception("warehouse_code必填");
var m_warehouse_data = warehouse_list.SingleOrDefault(s => s.warehouse_code.Equals(month_warehouse_code, StringComparison.OrdinalIgnoreCase));
if (m_warehouse_data == null) { throw new Exception("母仓库在系统中找不到"); }
var warehouse_data = warehouse_list.SingleOrDefault(s => s.warehouse_code.Equals(warehouse_code, StringComparison.OrdinalIgnoreCase));
if (warehouse_data == null) { throw new Exception("仓库在系统中找不到"); }
var warehouse_name = warehouse_data.warehouse_name;
var trun_data_id = (conn.QueryFirstOrDefault<int?>("select id from dc_auto_turnover where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code", new
{
bailun_sku = bailun_sku,
warehouse_code = warehouse_code
}) ?? 0);
if (trun_data_id <= 0)
{
throw new Exception("子sku不存在");
}
try
{
dc_base_mother_sku_dao.Save(new dc_base_mother_sku()
{
warehouse_code = month_warehouse_code,
sku = mother_bailun_sku,
}, user);
}
catch (Exception)
{
}
dc_base_mother_sku_dao.BatchSet(new batch_set_input_dto
{
mother_id = conn.QueryFirstOrDefault<int?>("select id from dc_base_mother_sku where sku_warehouse_code=@sku_warehouse_code", new
{
sku_warehouse_code = $"M-{mother_bailun_sku}{month_warehouse_code}"
}) ?? 0,
ids = new List<int> {
trun_data_id
},
is_main = (is_main=="是"?1:0)
}, user);
row["导入结果"] = "成功";
row["导入异常"] = "";
}
catch (Exception ex)
{
row["导入结果"] = "失败";
row["导入异常"] = ex.Message;
}
}
return table;
}
}
}
AutoTurnOver.Services/PurchaseAdviseServices.cs
......@@ -28,12 +28,6 @@ namespace AutoTurnOver.Services
//等待后台重算任务
purchase_advise.WaitReplaceLogisticsTask();
foreach (var item in change_datas)
{
//刷新母sku
dc_base_mother_sku_dao.ResetTurnOverByMapSku(item.bailun_sku, item.warehouse_code);
}
// 创建一个采购计划
var mainID = purchase_advise.Add(new dc_auto_purchase_advise { create_time = DateTime.Now, no = purchase_advise.GenerateOrderNo() ,buy_sys_plan_no = "Generate", title = title });
if (mainID == null) throw new Exception("创建采购建议失败");
......@@ -150,8 +144,6 @@ namespace AutoTurnOver.Services
{
DataRow row = table.NewRow();
row["切换物流备注"] = itemData.replace_logistics_remarks;
row["首单日期"] = itemData.mother_sku;
row["母sku原始建议数"] = itemData.mother_sku_quantity;
row["库容缺少值"] = itemData.storage_capacity_lack_quantity;
row["可用库容"] = itemData.storage_capacity_quantity;
......
AutoTurnOver/Controllers/MotherSkuController.cs
......@@ -19,166 +19,5 @@ namespace AutoTurnOver.Controllers
public class MotherSkuController : Controller
{
[HttpGet]
[BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【配置】->【子母sku】->【搜索】页面", 0)]
public JsonResult Page([FromQuery]dc_base_mother_sku_search_dto search, [FromQuery]int limit, [FromQuery]int offset)
{
var total = 0;
var service = new Services.MotherSkuServices();
var list = service.Page(search, offset, limit, ref total);
return new JsonResult(new
{
rows = list,
total = total,
});
}
[HttpGet]
[BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【配置】->【子母sku 日志】->【搜索】页面", 0)]
public JsonResult LogPage([FromQuery]dc_base_mother_sku_log_search_dto search, [FromQuery]int limit, [FromQuery]int offset)
{
var total = 0;
var service = new Services.MotherSkuServices();
var list = service.LogPage(search, offset, limit, ref total);
return new JsonResult(new
{
rows = list,
total = total,
});
}
[HttpGet]
[BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【配置】->【子母sku 日志】->【搜索】页面", 0)]
public JsonResult SearchSku([FromQuery]string name)
{
var service = new Services.MotherSkuServices();
var list = service.SearchSku(name);
return new JsonResult(list.Select(s=>new { id = s.id,text=$"【{s.sku}】【{s.warehouse_code}】【{s.warehouse_name}】"}));
}
[HttpPost]
[BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【配置】->【子母sku】->【新增规则】->【保存】操作", 1)]
public JsonResult Save([FromBody]dc_base_mother_sku m)
{
try
{
var user = AutoUtility.GetUser();
new Services.MotherSkuServices().Save(m, user);
return new JsonResult(new { success = true });
}
catch (Exception ex)
{
return new JsonResult(new { success = false, message = ex.Message });
}
}
[HttpPost]
[BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【配置】->【子母sku】->【修改状态】->【保存】操作", 1)]
public JsonResult UpdateStatus([FromBody]update_status_input_dto m)
{
try
{
var user = AutoUtility.GetUser();
new Services.MotherSkuServices().UpdateStatus(m, user);
return new JsonResult(new { success = true });
}
catch (Exception ex)
{
return new JsonResult(new { success = false, message = ex.Message });
}
}
[HttpPost]
[BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【配置】->【子母sku】->【移除子sku】->【保存】操作", 1)]
public JsonResult RemoveMap([FromBody]remove_map_input_dto m)
{
try
{
var user = AutoUtility.GetUser();
new Services.MotherSkuServices().RemoveMap(m, user);
return new JsonResult(new { success =true});
}
catch (Exception ex)
{
return new JsonResult(new { success = false,message = ex.Message });
}
}
[HttpPost]
[BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【自动周转列表】->【设置母sku】->【保存】操作", 1)]
public JsonResult SetMainMap([FromBody]remove_map_input_dto m)
{
try
{
var user = AutoUtility.GetUser();
new Services.MotherSkuServices().SetMainMap(m, user);
return new JsonResult(new { success =true});
}
catch (Exception ex)
{
return new JsonResult(new { success = false,message = ex.Message });
}
}
[HttpPost]
[BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【自动周转列表】->【设置母sku】->【保存】操作", 1)]
public JsonResult BatchSet([FromBody]batch_set_input_dto m)
{
try
{
var user = AutoUtility.GetUser();
new Services.MotherSkuServices().BatchSet(m, user);
return new JsonResult(new { success = true });
}
catch (Exception ex)
{
return new JsonResult(new { success = false, message = ex.Message });
}
}
/// <summary>
/// 导入
/// </summary>
/// <param name="fileName"></param>
/// <returns></returns>
[HttpPost]
[BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【子母sku设置】->【导入】操作", 1)]
public async Task<ActionResult<RequestResultDto>> Import(IFormFile file)
{
try
{
var user = AutoUtility.GetUser();
var dataTable = new Services.MotherSkuServices().Import(file.OpenReadStream(), user);
var fileName = AppContext.BaseDirectory + $@"Result\子母导入结果.csv";
CsvFileHelper.SaveCSV(dataTable, fileName);
var memory = new MemoryStream();
using (var stream = new FileStream(fileName, FileMode.Open))
{
stream.CopyTo(memory);
}
memory.Position = 0;
var fileData = await QiNiuCloudHelper.UploadAsync(memory, $"{user.UserName}-{DateTime.Now.ToString("yyyyMMddHHmmss")}子母导入结果.csv");
return new RequestResultDto { success = true, data = fileData };
}
catch (Exception ex)
{
return new RequestResultDto { success = false, message = ex.Message, err_data = ex.StackTrace };
}
}
}
}
\ No newline at end of file
ResetOutofstock/Program.cs
......@@ -30,13 +30,10 @@ namespace ResetOutofstock
//dc_base_transfer_freight_dao.Init();
//daily.ResetFbaExtendSales(DateTime.Now);
//dc_base_mother_sku_dao.SynchroCalculationTurnOver();
//dc_base_mother_sku_dao.ResetTurnOver("M-352984501-英国", "GBFBABLA");
//dc_base_transfer_extend_dao.SynchroLmsTransferOrder();
//dc_base_full_link_wait_order_dao.ResetDatas();
//dc_base_mother_sku_dao.GenerateData();
//dc_auto_turnover.set_full_stock_use_days_turnover_sales(dc_auto_turnover.GetModel("250924601", "USFBABLXJ"));
dc_base_trans_temp_schedule_dao.SynchroTransTempScheduleData(true);
}
catch (Exception ex)
{
......
ResetOutofstock/ResetOutofstockBackgrounService.cs
......@@ -321,26 +321,6 @@ namespace ResetOutofstock
{
while (true)
{
try
{
Console.WriteLine($"开始刷新 增量刷新母sku周转数据，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
dc_base_mother_sku_dao.SynchroCalculationTurnOver();
Console.WriteLine($"结束刷新 增量刷新母sku周转数据，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
}
catch (Exception ex)
{
Console.WriteLine("增量刷新母sku周转数据:" + ex.Message);
Console.WriteLine("增量刷新母sku周转数据:" + ex.StackTrace);
}
Thread.Sleep(10 * 60 * 1000);
}
});
Task.Factory.StartNew(() =>
{
while (true)
{
Thread.Sleep(10 * 60 * 1000);
try
{
......@@ -358,30 +338,7 @@ namespace ResetOutofstock
}
});
Task.Factory.StartNew(() =>
{
while (true)
{
try
{
if (DateTime.Now.Hour > 8)
{
Console.WriteLine($"开始刷新 子母sku数据，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
dc_base_mother_sku_dao.GenerateData();
Console.WriteLine($"结束刷新 子母sku数据，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
}
Thread.Sleep(10 * 60 * 1000);
}
catch (Exception ex)
{
Console.WriteLine("全链路在途:" + ex.Message);
Console.WriteLine("全链路在途:" + ex.StackTrace);
}
}
});
Task.Factory.StartNew(() =>
{
while (true)
......
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