Commit 049dc0cc by 泽锋 李

fix

parent 6b233fd3
...@@ -1166,7 +1166,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse ...@@ -1166,7 +1166,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse
if (mainID <= 0) if (mainID <= 0)
{ {
mainID = purchase_advise.Add(new dc_auto_purchase_advise { create_time = now, no = purchase_advise.GenerateOrderNo(), type = 1, buy_sys_plan_no = "ImportYiWuShortageDetailed", title = $" 义仓缺货 {DateTime.Now.ToString("HH:mm")}" }) ?? 0; mainID = purchase_advise.Add(new dc_auto_purchase_advise { create_time = now, no = purchase_advise.GenerateOrderNo(), type = 1, buy_sys_plan_no = "ImportYiWuShortageDetailed", title = $" 义仓缺货 {DateTime.Now.ToString("HH:mm")}" }) ?? 0;
} }
var datas = _connection.Query<dc_auto_purchase_advise_detailed>(@" select var datas = _connection.Query<dc_auto_purchase_advise_detailed>(@" select
t1.bailun_sku, t1.bailun_sku,
...@@ -1849,6 +1849,11 @@ where 1=1 "; ...@@ -1849,6 +1849,11 @@ where 1=1 ";
sql += $" and t1.main_id = @main_id "; sql += $" and t1.main_id = @main_id ";
parameters.Add("main_id", m.main_id); parameters.Add("main_id", m.main_id);
} }
if (!string.IsNullOrWhiteSpace(m.main_ids))
{
sql += $" and t1.main_id in @main_ids ";
parameters.Add("main_ids", m.main_ids.Split(',').Select(s=>int.Parse(s)).ToList());
}
if (!string.IsNullOrWhiteSpace(m.sku)) if (!string.IsNullOrWhiteSpace(m.sku))
{ {
sql += $" and t1.bailun_sku in @bailun_skus "; sql += $" and t1.bailun_sku in @bailun_skus ";
...@@ -2147,5 +2152,16 @@ where 1=1 "; ...@@ -2147,5 +2152,16 @@ where 1=1 ";
return obj.AsList(); return obj.AsList();
} }
/// <summary>
/// 查询今日的周转数据
/// </summary>
/// <returns></returns>
public static List<dc_auto_purchase_advise> GetToDayDatas()
{
return _connection.Query<dc_auto_purchase_advise>(" select * from dc_auto_purchase_advise where create_time>=@bdate ",new {
bdate = DateTime.Now.ToDayHome()
}).ToList();
}
} }
} }
...@@ -536,6 +536,9 @@ namespace AutoTurnOver.Models ...@@ -536,6 +536,9 @@ namespace AutoTurnOver.Models
/// </summary> /// </summary>
public int main_id { get; set; } public int main_id { get; set; }
[Description("采购建议批次")]
public string main_ids { get; set; }
[Description("建议单号")] [Description("建议单号")]
public string order_no { get; set; } public string order_no { get; set; }
......
...@@ -607,6 +607,11 @@ namespace AutoTurnOver.Services ...@@ -607,6 +607,11 @@ namespace AutoTurnOver.Services
{ {
return DB.purchase_advise.ReturnGoodsList(search_data, offset, limit, ref total); return DB.purchase_advise.ReturnGoodsList(search_data, offset, limit, ref total);
} }
public List<dc_auto_purchase_advise> GetToDayDatas()
{
return DB.purchase_advise.GetToDayDatas();
}
public string ExportReturnGoods(dc_aims_return_goods_search_dto searchData) public string ExportReturnGoods(dc_aims_return_goods_search_dto searchData)
{ {
......
...@@ -273,6 +273,13 @@ namespace AutoTurnOver.Controllers ...@@ -273,6 +273,13 @@ namespace AutoTurnOver.Controllers
}.ToJson(false); }.ToJson(false);
} }
[HttpGet]
public JsonResult GetToDayDatas()
{
var list = new PurchaseAdviseServices().GetToDayDatas();
return new JsonResult(list);
}
public JsonResult ExportReturnGoods([FromQuery] dc_auto_purchase_advise_detailed_search_dto m, [FromQuery]int limit, [FromQuery]int offset, [FromQuery] string sort, [FromQuery] string order) public JsonResult ExportReturnGoods([FromQuery] dc_auto_purchase_advise_detailed_search_dto m, [FromQuery]int limit, [FromQuery]int offset, [FromQuery] string sort, [FromQuery] string order)
{ {
......
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