Commit b7850e55 by lizefeng

新增事实库存查看界面

parent 3cc8bb95
......@@ -656,11 +656,11 @@ namespace Dapper
/// <param name="strsql">sql语句</param>
/// <param name="total">返回符合条件的总记录数</param>
/// <returns></returns>
public static IEnumerable<T> Page<T>(this IDbConnection connection, int offset,int limit,string strsql,ref int total)
public static IEnumerable<T> Page<T>(this IDbConnection connection, int offset,int limit,string strsql,ref int total,object param = null)
{
total = connection.ExecuteScalar<int>("select count(0) from (" + strsql + ") tb1");
return connection.Query<T>(strsql + " limit " + offset + "," + limit);
return connection.Query<T>(strsql + " limit " + offset + "," + limit,param);
}
......
using AutoTurnOver.Models;
using Dapper;
using System;
using System.Collections.Generic;
using System.Text;
namespace AutoTurnOver.DB
{
public class daily : connectionHelper
{
/// <summary>
/// 查询采购在途数据
/// </summary>
/// <param name="sku">sku</param>
/// <param name="warehouse_code">仓库编码</param>
/// <returns></returns>
public static IEnumerable<dc_purchase_daily_dto> List(string sku, string warehouse_code)
{
var sql = @"
select t1.create_time,
t1.bailun_sku,
t1.sku_name,
t1.purchase_id,
t1.warehouse_code,
t1.warehouse_name,
t1.count as 'purchaseQuantity',
t2.inboundQuantity
from dc_base_purchase as t1
left join (
select t2_1.purchase_id,t2_1.warehouse_code,t2_1.bailun_sku,sum(t2_1.count) as 'inboundQuantity' from dc_base_purchase_inbound as t2_1
where t2_1.warehouse_code=@warehouse_code and t2_1.bailun_sku=@bailun_sku
GROUP BY t2_1.warehouse_code,t2_1.bailun_sku,t2_1.purchase_id
) as t2 on t1.bailun_sku = t2.bailun_sku and t1.warehouse_code = t2.warehouse_code and t1.purchase_id = t2.purchase_id
where t1.count>t2.inboundQuantity and t1.warehouse_code=@warehouse_code and t1.bailun_sku=@bailun_sku
";
DynamicParameters parameters = new DynamicParameters();
parameters.Add("bailun_sku", sku);
parameters.Add("warehouse_code", warehouse_code);
return _connection.Query<dc_purchase_daily_dto>(sql, parameters);
}
/// <summary>
/// 查询时实库存数据
/// </summary>
/// <param name="sku">sku</param>
/// <param name="warehouse_code">仓库编码</param>
/// <returns></returns>
public static IEnumerable<dc_realtime_purchase_daily_dto> RealtimeList(string sku, string warehouse_code,int offset, int limit, ref int total)
{
var sql = @"
select t1.create_time,
t1.bailun_sku,
t1.sku_name,
t1.purchase_id,
t1.warehouse_code,
t1.warehouse_name,
t1.count as 'purchaseQuantity',
t2.inboundQuantity
from dc_base_purchase as t1
left join (
select t2_1.purchase_id,t2_1.warehouse_code,t2_1.bailun_sku,sum(t2_1.count) as 'inboundQuantity' from dc_base_purchase_inbound as t2_1
where t2_1.warehouse_code=@warehouse_code and t2_1.bailun_sku=@bailun_sku
GROUP BY t2_1.warehouse_code,t2_1.bailun_sku,t2_1.purchase_id
) as t2 on t1.bailun_sku = t2.bailun_sku and t1.warehouse_code = t2.warehouse_code and t1.purchase_id = t2.purchase_id
where t1.count>t2.inboundQuantity and t1.warehouse_code=@warehouse_code and t1.bailun_sku=@bailun_sku
";
DynamicParameters parameters = new DynamicParameters();
parameters.Add("bailun_sku", sku);
parameters.Add("warehouse_code", warehouse_code);
var obj = _connection.Page<dc_realtime_purchase_daily_dto>(offset, limit, sql, ref total, parameters);
return obj.AsList();
}
}
}
......@@ -65,7 +65,6 @@ where 1=1 ";
}
}
var obj = _connection.Query<Models.dc_auto_turnover_Extend>(sql+ " limit " + offset + "," + limit);
return obj.AsList();
......@@ -96,6 +95,10 @@ where 1=1 ";
var sql = "select dacp.id,dacp.bailun_sku,dacp.warehouse_code,dbw.warehouse_name,dacp.promotion_time,dacp.count,dacp.bl_auditor,dacp.remark,dacp.status from dc_auto_config_promotion dacp " +
"left join dc_base_warehouse_oa dbw on dacp.warehouse_code=dbw.warehouse_code where 1 =1 ";
if (m.IsEffective==true)
{
sql += $" and dacp.promotion_time>= '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}' ";
}
if (!string.IsNullOrWhiteSpace(m.sku))
{
sql += " and dacp.bailun_sku like '%" + m.sku+"%'";
......
......@@ -91,6 +91,11 @@ namespace AutoTurnOver.Models
public string vstatus { get; set; }
/// <summary>
/// 是否过期
/// </summary>
public bool? IsEffective { get; set; }
}
/// <summary>
......
using System;
using System.Collections.Generic;
using System.Text;
namespace AutoTurnOver.Models
{
public class dc_purchase_daily_dto
{
/// <summary>
/// 采购时间
/// </summary>
public DateTime create_time { get; set; }
/// <summary>
/// 产品SKU
/// </summary>
public string bailun_sku { get; set; }
/// <summary>
/// 产品名称
/// </summary>
public string sku_name { get; set; }
/// <summary>
/// 仓库编码
/// </summary>
public string warehouse_code { get; set; }
public string warehouse_name { get; set; }
/// <summary>
/// 采购单号
/// </summary>
public string purchase_id { get; set; }
/// <summary>
/// 采购数量
/// </summary>
public int purchaseQuantity { get; set; }
/// <summary>
/// 入库数量
/// </summary>
public int inboundQuantity { get; set; }
/// <summary>
/// 在途数量
/// </summary>
public int dailyQuantity { get
{
return purchaseQuantity - inboundQuantity;
} }
}
}
using System;
using System.Collections.Generic;
using System.Text;
namespace AutoTurnOver.Models
{
/// <summary>
/// 时实采购在途数据
/// </summary>
public class dc_realtime_purchase_daily_dto
{
public string warehouse_code { get; set; }
public string warehouse_name { get; set; }
public string bailun_sku { get; set; }
public string sku_name { get; set; }
/// <summary>
/// 可用库存
/// </summary>
public int quantity_avaliable { get; set; }
/// <summary>
/// 占用库存
/// </summary>
public int quantity_occupied { get; set; }
/// <summary>
/// 预分配库存
/// </summary>
public int quantity_virtual { get; set; }
/// <summary>
/// 在途库存
/// </summary>
public int quantity_process { get; set; }
/// <summary>
/// 内部系统采购在途
/// </summary>
public int purchase_daily_quantity { get; set; }
}
}
using AutoTurnOver.Models;
using System;
using System.Collections.Generic;
using System.Text;
namespace AutoTurnOver.Services
{
/// <summary>
/// 在途
/// </summary>
public class DailyServices
{
/// <summary>
/// 查询采购在途数据
/// </summary>
/// <param name="sku">sku</param>
/// <param name="warehouse_code">仓库编码</param>
/// <returns></returns>
public IEnumerable<dc_purchase_daily_dto> List(string sku, string warehouse_code)
{
return DB.daily.List(sku, warehouse_code);
}
public IEnumerable<dc_realtime_purchase_daily_dto> RealtimeList(string sku, string warehouse_code, int offset, int limit, ref int total)
{
return DB.daily.RealtimeList(sku, warehouse_code,offset, limit, ref total);
}
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using AutoTurnOver.Services;
using Microsoft.AspNetCore.Mvc;
namespace AutoTurnOver.Controllers
{
[Route("api/[controller]/[action]")]
[ApiController]
public class DailyController : Controller
{
///
[HttpGet]
public JsonResult PurchaseList(string warehousecode, string sku)
{
var service = new Services.DailyServices();
var list = service.List(sku, warehousecode);
return new JsonResult(new
{
rows = list,
total = list.Count()
});
}
/// <summary>
/// 下单记录分页
/// </summary>
/// <param name="sku"></param>
/// <param name="warehousecode"></param>
/// <param name="offset"></param>
/// <param name="limit"></param>
/// <returns></returns>
public JsonResult RealtimeList(string sku, string warehousecode, int offset, int limit, string order, string sort)
{
var services = new DailyServices();
var total = 0;
var list = services.RealtimeList(sku, warehousecode, offset, limit, ref total);
return new JsonResult(new
{
rows = list,
total = total,
});
}
}
}
\ No newline at end of file
......@@ -81,14 +81,16 @@ namespace AutoTurnOver.Controllers
/// <param name="sort">升序还是降序</param>
/// <param name="sku">sku编码</param>
/// <param name="warehousecode">仓库编码</param>
/// <param name="IsEffective">是否有效数据</param>
/// <returns></returns>
[HttpGet]
public JsonResult ListSaleSetting(int limit, int offset, string order, string sort, string sku, string warehousecode)
public JsonResult ListSaleSetting(int limit, int offset, string order, string sort, string sku, string warehousecode,bool? IsEffective = null)
{
var m = new Condition_ConfigPromotion
{
sku = sku,
warehousecode = warehousecode
warehousecode = warehousecode,
IsEffective = IsEffective
};
var total = 0;
......
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