Skip to content

D
data-center-auto
Commit 581f31de by 泽锋 李
Options

回货过滤指定数据

parent 09e834cd
Showing with 162 additions and 40 deletions
AutoTurnOver.DB/db_config.cs
...@@ -95,7 +95,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w ...@@ -95,7 +95,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
obj.param = m.param; obj.param = m.param;
// 检查该数据是否有存在 // 检查该数据是否有存在
var oldData = _connection.QueryFirstOrDefault(" select * from dc_auto_config_safe_inventory where variable_code=@variable_code and warehouse_code=@warehouse_code and type=@type and id!=@id ", new { m.variable_code,m.warehouse_code,m.id,m.type }); var oldData = _connection.QueryFirstOrDefault(" select * from dc_auto_config_safe_inventory where variable_code=@variable_code and warehouse_code=@warehouse_code and type=@type and id!=@id ", new { m.variable_code, m.warehouse_code, m.id, m.type });
if (oldData != null) if (oldData != null)
{ {
return $" variable_code:【{m.variable_code}】,仓库:【{m.variable_name}】 已经配置过了 "; return $" variable_code:【{m.variable_code}】,仓库:【{m.variable_name}】 已经配置过了 ";
...@@ -282,7 +282,7 @@ where 1 = 1 "; ...@@ -282,7 +282,7 @@ where 1 = 1 ";
if (!string.IsNullOrWhiteSpace(m.warehousetype)) if (!string.IsNullOrWhiteSpace(m.warehousetype))
{ {
sql += " and ( dbw.hq_type=" + $"'{m.warehousetype}' or ( dacp.type=4 and dacp.variable_code='"+ m.warehousetype + "' ) ) "; sql += " and ( dbw.hq_type=" + $"'{m.warehousetype}' or ( dacp.type=4 and dacp.variable_code='" + m.warehousetype + "' ) ) ";
} }
if (m.warehousearea > 0) if (m.warehousearea > 0)
{ {
...@@ -294,12 +294,12 @@ where 1 = 1 "; ...@@ -294,12 +294,12 @@ where 1 = 1 ";
} }
if (!string.IsNullOrWhiteSpace(m.sku)) if (!string.IsNullOrWhiteSpace(m.sku))
{ {
sql += " and ( ( dacp.type = 1 or dacp.type=2 ) and dacp.bailun_sku like '%" + m.sku + "%' )" ; sql += " and ( ( dacp.type = 1 or dacp.type=2 ) and dacp.bailun_sku like '%" + m.sku + "%' )";
} }
if (!string.IsNullOrWhiteSpace(m.warehousecode)) if (!string.IsNullOrWhiteSpace(m.warehousecode))
{ {
sql += " and ( dbw.warehouse_code='" + m.warehousecode + "' or ( dacp.type=3 and dacp.variable_code='"+ m.warehousecode + "' ) ) "; sql += " and ( dbw.warehouse_code='" + m.warehousecode + "' or ( dacp.type=3 and dacp.variable_code='" + m.warehousecode + "' ) ) ";
} }
total = _connection.ExecuteScalar<int>("select count(0) from (" + sql + ") tb1"); total = _connection.ExecuteScalar<int>("select count(0) from (" + sql + ") tb1");
...@@ -460,7 +460,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w ...@@ -460,7 +460,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
// 检查该数据是否有存在 // 检查该数据是否有存在
var oldData = _connection.QueryFirstOrDefault(" select * from dc_auto_config_stock_up_days where warehouse_code=@warehouse_code and id!=@id ", new { m.warehouse_code,m.id }); var oldData = _connection.QueryFirstOrDefault(" select * from dc_auto_config_stock_up_days where warehouse_code=@warehouse_code and id!=@id ", new { m.warehouse_code, m.id });
if (oldData != null) if (oldData != null)
{ {
return $" 仓库:【{m.warehouse_name}】 已经配置过了 "; return $" 仓库:【{m.warehouse_name}】 已经配置过了 ";
...@@ -506,22 +506,22 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w ...@@ -506,22 +506,22 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
/// <param name="warehouse_code"></param> /// <param name="warehouse_code"></param>
/// <param name="monitor_status"></param> /// <param name="monitor_status"></param>
/// <returns></returns> /// <returns></returns>
public static string MonitorStatus(string bailun_sku, string warehouse_code, int monitor_status,UserData user) public static string MonitorStatus(string bailun_sku, string warehouse_code, int monitor_status, UserData user)
{ {
if(monitor_status!=1 && monitor_status!=0) if (monitor_status != 1 && monitor_status != 0)
{ {
throw new Exception("状态异常"); throw new Exception("状态异常");
} }
// 先检查当前状态 // 先检查当前状态
var oldData = _connection.QueryFirstOrDefault<dc_auto_config_sku_warehouse>($"select * from dc_auto_config_sku_warehouse where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code ",new { bailun_sku,warehouse_code }); var oldData = _connection.QueryFirstOrDefault<dc_auto_config_sku_warehouse>($"select * from dc_auto_config_sku_warehouse where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code ", new { bailun_sku, warehouse_code });
if (oldData == null || oldData.status == 0) if (oldData == null || oldData.status == 0)
{ {
if (monitor_status == 0) if (monitor_status == 0)
{ {
return "该数据当前已经正常监控,请勿重复操作"; return "该数据当前已经正常监控,请勿重复操作";
} }
} }
if (oldData != null && oldData.status == 1) if (oldData != null && oldData.status == 1)
...@@ -537,25 +537,26 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w ...@@ -537,25 +537,26 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
if (oldData == null) if (oldData == null)
{ {
var newData = new dc_auto_config_sku_warehouse { var newData = new dc_auto_config_sku_warehouse
{
bailun_sku = bailun_sku, bailun_sku = bailun_sku,
warehouse_code =warehouse_code, warehouse_code = warehouse_code,
status = monitor_status, status = monitor_status,
gmt_create =now, gmt_create = now,
bl_operator =user.UserName, bl_operator = user.UserName,
sku_title = "", sku_title = "",
warehouse_name ="", warehouse_name = "",
gmt_modified =now gmt_modified = now
}; };
_connection.Insert<dc_auto_config_sku_warehouse>(newData); _connection.Insert<dc_auto_config_sku_warehouse>(newData);
} }
else else
{ {
_connection.Execute(" update dc_auto_config_sku_warehouse set status=@monitor_status where id=@id",new { monitor_status ,id= oldData.id}); _connection.Execute(" update dc_auto_config_sku_warehouse set status=@monitor_status where id=@id", new { monitor_status, id = oldData.id });
} }
return ""; return "";
} }
...@@ -584,7 +585,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w ...@@ -584,7 +585,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
{ {
continue; continue;
} }
} }
if (oldData != null && oldData.status == 1) if (oldData != null && oldData.status == 1)
...@@ -616,15 +617,86 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w ...@@ -616,15 +617,86 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
} }
else else
{ {
_connection.Execute(" update dc_auto_config_sku_warehouse set status=@monitor_status,bl_operator=@bl_operator where id=@id", new { monitor_status, id = oldData.id, bl_operator= user.UserName }); _connection.Execute(" update dc_auto_config_sku_warehouse set status=@monitor_status,bl_operator=@bl_operator where id=@id", new { monitor_status, id = oldData.id, bl_operator = user.UserName });
}
}
return "";
}
public static string BatchReturnGoodsStatus(string ids, int monitor_status, UserData user)
{
if (monitor_status != 1 && monitor_status != 0)
{
throw new Exception("状态异常");
}
var datas = _connection.Query<AutoTurnOver.Models.dc_auto_turnover>(" select * from dc_auto_turnover where id in @ids ", new { ids = ids.Split(',') }).AsList();
foreach (AutoTurnOver.Models.dc_auto_turnover turnover_item in datas)
{
_connection.Insert(new dc_return_goods_not_push_log
{
bailun_sku = turnover_item.bailun_sku,
warehouse_code = turnover_item.warehouse_code,
status = monitor_status,
create_user_name = user.UserAccount,
create_time = DateTime.Now,
});
// 先检查当前状态
var oldData = _connection.QueryFirstOrDefault<dc_return_goods_not_push>($"select * from dc_return_goods_not_push where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code ", new { turnover_item.bailun_sku, turnover_item.warehouse_code });
if (oldData == null || oldData.status == 0)
{
if (monitor_status == 0)
{
continue;
}
}
if (oldData != null && oldData.status == 1)
{
if (monitor_status == 1)
{
continue;
}
}
DateTime now = DateTime.Now;
if (oldData == null)
{
var newData = new dc_return_goods_not_push
{
bailun_sku = turnover_item.bailun_sku,
warehouse_code = turnover_item.warehouse_code,
status = monitor_status
};
_connection.Insert<dc_return_goods_not_push>(newData);
}
else
{
_connection.Execute(" update dc_return_goods_not_push set status=@monitor_status,bl_operator=@bl_operator where id=@id", new { monitor_status, id = oldData.id, bl_operator = user.UserName });
} }
} }
return ""; return "";
} }
public static List<dc_return_goods_not_push> ReturnGoodsList(List<string> skus)
{
if (skus == null || skus.Count <= 0) {
return new List<dc_return_goods_not_push>();
}
return _connection.Query<dc_return_goods_not_push>(" select * from dc_return_goods_not_push wehre status=1 and bailun_sku in @skus ",new { skus = skus }).ToList();
}
public static string BatchTortStatus(string ids, int tort_status, UserData user) public static string BatchTortStatus(string ids, int tort_status, UserData user)
{ {
...@@ -671,13 +743,13 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w ...@@ -671,13 +743,13 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
{ {
if (tort_status == 0) if (tort_status == 0)
{ {
_connection.Execute(" delete from dc_base_tort where id=@id", new { id = oldData.id}); _connection.Execute(" delete from dc_base_tort where id=@id", new { id = oldData.id });
} }
else else
{ {
} }
} }
} }
...@@ -770,7 +842,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w ...@@ -770,7 +842,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
return list; return list;
} }
} }
/// <summary> /// <summary>
/// 平台共享仓配置 /// 平台共享仓配置
...@@ -781,7 +853,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w ...@@ -781,7 +853,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
public static string SaveStockFba(Models.dc_base_stock_config_fba m, string username) public static string SaveStockFba(Models.dc_base_stock_config_fba m, string username)
{ {
// 查询百伦sku // 查询百伦sku
var dc_base_stock_fba_share = _connection.QueryFirstOrDefault<dc_base_stock_fba_share>(" select * from dc_base_stock_fba_share where platform_sku=@platform_sku limit 1 ", new { platform_sku = m.platform_sku }); var dc_base_stock_fba_share = _connection.QueryFirstOrDefault<dc_base_stock_fba_share>(" select * from dc_base_stock_fba_share where platform_sku=@platform_sku limit 1 ", new { platform_sku = m.platform_sku });
if (dc_base_stock_fba_share == null) if (dc_base_stock_fba_share == null)
{ {
throw new Exception(" 未找到与之对应的百伦sku数据 "); throw new Exception(" 未找到与之对应的百伦sku数据 ");
...@@ -832,7 +904,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w ...@@ -832,7 +904,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
return result.HasValue && result.Value > 0 ? "" : "提交异常，请重试！"; return result.HasValue && result.Value > 0 ? "" : "提交异常，请重试！";
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -882,7 +954,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w ...@@ -882,7 +954,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
{ {
sql += " and t1.start_date<=" + $"'{m.start_date}'"; sql += " and t1.start_date<=" + $"'{m.start_date}'";
} }
if(m.end_date != null) if (m.end_date != null)
{ {
sql += " and t1.end_date>=" + $"'{m.end_date.Value}'"; sql += " and t1.end_date>=" + $"'{m.end_date.Value}'";
} }
...@@ -1032,7 +1104,7 @@ where 1 = 1 "; ...@@ -1032,7 +1104,7 @@ where 1 = 1 ";
public static string SaveStockUpRange(Models.dc_auto_stock_up_range m, string username) public static string SaveStockUpRange(Models.dc_auto_stock_up_range m, string username)
{ {
if(m.group_id==null || m.group_id <= 0) if (m.group_id == null || m.group_id <= 0)
{ {
throw new Exception("规则组必选"); throw new Exception("规则组必选");
} }
...@@ -1041,7 +1113,7 @@ where 1 = 1 "; ...@@ -1041,7 +1113,7 @@ where 1 = 1 ";
{ {
obj = new dc_auto_stock_up_range obj = new dc_auto_stock_up_range
{ {
}; };
} }
...@@ -1053,7 +1125,7 @@ where 1 = 1 "; ...@@ -1053,7 +1125,7 @@ where 1 = 1 ";
// 检查该数据是否有存在 // 检查该数据是否有存在
var oldData = _connection.QueryFirstOrDefault(" select * from dc_auto_stock_up_range where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code and id!=@id ", new { m.bailun_sku, m.warehouse_code,m.id }); var oldData = _connection.QueryFirstOrDefault(" select * from dc_auto_stock_up_range where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code and id!=@id ", new { m.bailun_sku, m.warehouse_code, m.id });
if (oldData != null) if (oldData != null)
{ {
return $" 仓库skusku:【{m.bailun_sku}】 已经配置过了 "; return $" 仓库skusku:【{m.bailun_sku}】 已经配置过了 ";
...@@ -1104,13 +1176,13 @@ where 1 = 1 "; ...@@ -1104,13 +1176,13 @@ where 1 = 1 ";
{ {
var sql = @"select dacp.* from dc_auto_jit_tag_group as dacp "; var sql = @"select dacp.* from dc_auto_jit_tag_group as dacp ";
if (!string.IsNullOrWhiteSpace(m.bailun_sku)) if (!string.IsNullOrWhiteSpace(m.bailun_sku))
{ {
sql += " and dacp.name like '%" + m.bailun_sku + "%'"; sql += " and dacp.name like '%" + m.bailun_sku + "%'";
} }
total = _connection.ExecuteScalar<int>("select count(0) from (" + sql + ") tb1"); total = _connection.ExecuteScalar<int>("select count(0) from (" + sql + ") tb1");
...@@ -1200,19 +1272,20 @@ where 1 = 1 "; ...@@ -1200,19 +1272,20 @@ where 1 = 1 ";
{ {
throw new Exception("请选择规则组"); throw new Exception("请选择规则组");
} }
var datas = _connection.Query<AutoTurnOver.Models.dc_auto_turnover>(" select * from dc_auto_turnover where id in @ids ",new { ids = data.ids.Split(',').Select(s=>int.Parse(s)).ToList() }); var datas = _connection.Query<AutoTurnOver.Models.dc_auto_turnover>(" select * from dc_auto_turnover where id in @ids ", new { ids = data.ids.Split(',').Select(s => int.Parse(s)).ToList() });
foreach (var item in datas) foreach (var item in datas)
{ {
// 检查数据是否存在 // 检查数据是否存在
var old_data = _connection.QueryFirstOrDefault<dc_auto_stock_up_range>(" select * from dc_auto_stock_up_range where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code ", var old_data = _connection.QueryFirstOrDefault<dc_auto_stock_up_range>(" select * from dc_auto_stock_up_range where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code ",
new { bailun_sku=item.bailun_sku, warehouse_code = item.warehouse_code }); new { bailun_sku = item.bailun_sku, warehouse_code = item.warehouse_code });
if (old_data == null) if (old_data == null)
{ {
_connection.Insert(new dc_auto_stock_up_range { _connection.Insert(new dc_auto_stock_up_range
{
bailun_sku = item.bailun_sku, bailun_sku = item.bailun_sku,
group_id = data.group_id, group_id = data.group_id,
warehouse_code = item.warehouse_code, warehouse_code = item.warehouse_code,
warehouse_name =item.warehouse_name warehouse_name = item.warehouse_name
}); });
} }
else else
...@@ -1294,7 +1367,7 @@ where 1 = 1 "; ...@@ -1294,7 +1367,7 @@ where 1 = 1 ";
var oldData = _connection.QueryFirstOrDefault(@" select * from dc_config_forecast_sales var oldData = _connection.QueryFirstOrDefault(@" select * from dc_config_forecast_sales
where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code and id!=@id where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code and id!=@id
and start_date<=@end_date and end_date>=@start_date and start_date<=@end_date and end_date>=@start_date
", new { m.bailun_sku, m.warehouse_code, m.id,end_date = m.end_date, start_date = m.start_date }); ", new { m.bailun_sku, m.warehouse_code, m.id, end_date = m.end_date, start_date = m.start_date });
if (oldData != null) if (oldData != null)
{ {
return $" sku:【{m.bailun_sku}】,仓库:【{m.warehouse_name}】 已经配置过了 "; return $" sku:【{m.bailun_sku}】,仓库:【{m.warehouse_name}】 已经配置过了 ";
......
AutoTurnOver.Models/dc_return_goods_not_push.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
namespace AutoTurnOver.Models
{
public class dc_return_goods_not_push
{
public int id { get; set; }
public string bailun_sku { get; set; }
public string warehouse_code { get; set; }
public int status { get; set; }
}
public class dc_return_goods_not_push_log
{
public int id { get; set; }
public string bailun_sku { get; set; }
public string warehouse_code { get; set; }
public int status { get; set; }
public DateTime create_time { get; set; }
public string create_user_name { get; set; }
}
}
AutoTurnOver.Services/ConfigServices.cs
...@@ -415,6 +415,10 @@ namespace AutoTurnOver.Services ...@@ -415,6 +415,10 @@ namespace AutoTurnOver.Services
{ {
return DB.db_config.BatchMonitorStatus(ids, monitor_status, user); return DB.db_config.BatchMonitorStatus(ids, monitor_status, user);
} }
public string BatchReturnGoodsStatus(string ids, int monitor_status, UserData user)
{
return DB.db_config.BatchReturnGoodsStatus(ids, monitor_status, user);
}
public string BatchTortStatus(string ids, int monitor_status, UserData user) public string BatchTortStatus(string ids, int monitor_status, UserData user)
{ {
......
AutoTurnOver.Services/ReportServices.cs
...@@ -552,7 +552,12 @@ namespace AutoTurnOver.Services ...@@ -552,7 +552,12 @@ namespace AutoTurnOver.Services
public List<dc_return_goods_push> ReturnGoodsPushFilter(List<dc_return_goods_push> datas) public List<dc_return_goods_push> ReturnGoodsPushFilter(List<dc_return_goods_push> datas)
{ {
// 规则一 // 规则一
datas = datas.Where(s=> !(s.bailun_sku== "294155433" && ( s.warehouse_code== "GB4PXBL" || s.warehouse_code == "BLGBPX")) ).ToList(); var not_push_list = db_config.ReturnGoodsList(datas.Select(s=>s.bailun_sku).ToList());
if(not_push_list!=null && not_push_list.Count >= 1)
{
datas = datas.Where(s => !not_push_list.Any(p=>p.bailun_sku==s.bailun_sku && p.warehouse_code==s.warehouse_code)).ToList();
}
// 规则二 // 规则二
var buyers = new List<string> { "张莹霞", "张莹霞1", "黄静洁" }; var buyers = new List<string> { "张莹霞", "张莹霞1", "黄静洁" };
......
AutoTurnOver/Controllers/ConfigController.cs
...@@ -715,5 +715,20 @@ namespace AutoTurnOver.Controllers ...@@ -715,5 +715,20 @@ namespace AutoTurnOver.Controllers
} }
#endregion #endregion
/// <summary>
/// 批量修改缺货推送状态
/// </summary>
/// <param name="ids"></param>
/// <param name="monitor_status"></param>
/// <returns></returns>
[HttpGet]
public JsonResult BatchReturnGoodsStatus(string ids, int monitor_status)
{
var user = AutoUtility.GetUser();
if (user == null) return null;
var result = new Services.ConfigServices().BatchReturnGoodsStatus(ids, monitor_status, user);
return new JsonResult(result);
}
} }
} }
\ No newline at end of file
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