Skip to content

D
data-center-auto
Commit 0d770ace by lizefeng
Options

新增jit 备货规则配置

parent c6e59c8e
Showing with 126 additions and 16 deletions
AutoTurnOver.DB/dc_auto_jit_tag.cs
......@@ -19,18 +19,18 @@ namespace AutoTurnOver.DB
/// <param name="limit"></param>
/// <param name="total"></param>
/// <returns></returns>
public static List<dc_auto_jit_tag> JitTagList(int offset, int limit, ref int total)
public static List<dc_auto_jit_tag_dto> JitTagList(int offset, int limit, ref int total)
{
var list = new List<dc_auto_jit_tag>();
var list = new List<dc_auto_jit_tag_dto>();
try
{
var sql = @"select t1.* from dc_auto_jit_tag as t1 where 1 = 1 ";
var sql = @"select t1.* from dc_auto_jit_tag as t1 where 1 = 1 order by t1.level asc ";
total = _connection.ExecuteScalar<int>("select count(0) from (" + sql + ") tb1");
var obj = _connection.Query<dc_auto_jit_tag>(sql + " limit " + offset + "," + limit);
var obj = _connection.Query<dc_auto_jit_tag_dto>(sql + " limit " + offset + "," + limit);
return obj.AsList();
......@@ -41,6 +41,45 @@ namespace AutoTurnOver.DB
}
}
public static List<dc_auto_jit_tag_log_dto> JitTagLogList(dc_auto_jit_tag_log_search_dto data,int offset, int limit, ref int total)
{
var list = new List<dc_auto_jit_tag_log_dto>();
try
{
var sql = @"select t1.* from dc_auto_jit_tag_log as t1 left join dc_auto_jit_tag as t2 on t1.tag_id = t2.id where 1 = 1 ";
DynamicParameters parameters = new DynamicParameters();
if (data!=null)
{
if (!string.IsNullOrWhiteSpace(data.bailun_sku))
{
sql += " and t1.bailun_sku = @bailun_sku ";
parameters.Add("bailun_sku", data.bailun_sku);
}
if (data.b_date!=null){
sql += " and t1.date >= @b_date ";
parameters.Add("b_date", data.b_date.Value.ToString("yyyy-MM-dd 00:00:00"));
}
if (data.e_date != null)
{
sql += " and t1.date <= @e_date ";
parameters.Add("e_date", data.b_date.Value.ToString("yyyy-MM-dd 23:59:59"));
}
}
sql += " order by t1.date desc ";
total = _connection.ExecuteScalar<int>("select count(0) from (" + sql + ") tb1", parameters);
var obj = _connection.Query<dc_auto_jit_tag_log_dto>(sql + " limit " + offset + "," + limit, parameters);
return obj.AsList();
}
catch (Exception)
{
return list;
}
}
/// <summary>
/// 保存安全库存规则
......@@ -50,25 +89,23 @@ namespace AutoTurnOver.DB
/// <returns></returns>
public static string SaveJitTag(dc_auto_jit_tag m, string username)
{
var obj = _connection.QueryFirstOrDefault<dc_auto_jit_tag>("select * from dc_auto_jit_tag where id=" + m.id);
if (obj == null)
m.gmt_update = DateTime.Now;
if (m.is_eliminate == 1)
{
obj = new dc_auto_jit_tag { };
m.quantity_safe_inventory = 0;
}
obj.gmt_update = DateTime.Now;
obj.id = m.id;
try
{
if (obj.id > 0)
if (m.id > 0)
{
var result = _connection.Update<dc_auto_jit_tag>(obj);
var result = _connection.Update<dc_auto_jit_tag>(m);
return result > 0 ? "" : "保存异常，请重试！";
}
else
{
var result = _connection.Insert<dc_auto_jit_tag>(obj);
var result = _connection.Insert<dc_auto_jit_tag>(m);
return result.HasValue && result.Value > 0 ? "" : "提交异常，请重试！";
}
......
AutoTurnOver.Models/dc_auto_jit_tag.cs
......@@ -56,4 +56,51 @@ namespace AutoTurnOver.Models
/// </summary>
public int enable_7 { get; set; }
}
public class dc_auto_jit_tag_dto : dc_auto_jit_tag
{
public string is_gt_7_str { get { return ((dc_auto_jit_tag_gt_type)is_gt_7).ToString(); } }
public string is_gt_14_str { get { return ((dc_auto_jit_tag_gt_type)is_gt_14).ToString(); } }
}
public enum dc_auto_jit_tag_gt_type
{
大于 = 1,
等于 = 2,
小于 =3,
大于等于= 4,
小于等于= 5
}
public class dc_auto_jit_tag_log
{
public int id { get; set; }
public string bailun_sku { get; set; }
public DateTime date { get; set; }
public int tag_id { get; set; }
public decimal quantity_sales7 { get; set; }
public decimal quantity_sales14 { get; set; }
public string tag_json { get; set; }
}
public class dc_auto_jit_tag_log_dto : dc_auto_jit_tag_log {
public string tag_name { get; set; }
}
public class dc_auto_jit_tag_log_search_dto
{
public DateTime? b_date { get; set; }
public DateTime? e_date { get; set; }
public string bailun_sku { get; set; }
}
}
AutoTurnOver.Services/JitTagServices.cs
using AutoTurnOver.Models;
using AutoTurnOver.DB;
using AutoTurnOver.Models;
using System;
using System.Collections.Generic;
using System.Text;
......@@ -16,11 +17,17 @@ namespace AutoTurnOver.Services
/// <param name="offset"></param>
/// <param name="limit"></param>
/// <returns></returns>
public List<dc_auto_jit_tag> JitTagList(int offset, int limit, ref int total)
public List<dc_auto_jit_tag_dto> JitTagList(int offset, int limit, ref int total)
{
return DB.dc_auto_jit_tag_dao.JitTagList( offset, limit, ref total);
}
public List<dc_auto_jit_tag_log_dto> JitTagLogList(dc_auto_jit_tag_log_search_dto data, int offset, int limit, ref int total)
{
return DB.dc_auto_jit_tag_dao.JitTagLogList(data,offset, limit, ref total);
}
public string SaveJitTag(dc_auto_jit_tag m, string username)
{
return DB.dc_auto_jit_tag_dao.SaveJitTag(m, username);
......
AutoTurnOver/Controllers/JitTagController.cs
......@@ -28,6 +28,25 @@ namespace AutoTurnOver.Controllers
});
}
public JsonResult JitTagLogList(int limit, int offset, string order, string sort,string bailun_sku,DateTime? b_date,DateTime? e_date)
{
var total = 0;
var service = new Services.JitTagServices();
var list = service.JitTagLogList(new dc_auto_jit_tag_log_search_dto {
bailun_sku =bailun_sku,
b_date =b_date,
e_date = e_date
} ,offset, limit, ref total);
return new JsonResult(new
{
rows = list,
total = total,
});
}
[HttpPost]
public JsonResult SaveJitTag([FromBody]dc_auto_jit_tag m)
......@@ -45,7 +64,7 @@ namespace AutoTurnOver.Controllers
[HttpGet]
public JsonResult GetJitTagById(int id)
{
var m = new Services.JitTagServices().GetInventoryById(id);
var m = new Services.JitTagServices().GetJitTagById(id);
return new JsonResult(m);
}
......
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