Skip to content

D
DataCenter_Core2.1_20190520
Commit bfd00858 by guanzhenshan
Options

调整数据仓销售分析报表

parent 087af717
Showing with 38 additions and 11 deletions
Bailun.DC.Services/InventoryServices.cs
......@@ -776,7 +776,11 @@ namespace Bailun.DC.Services
if (!string.IsNullOrEmpty(parameter.sort))
{
sql += " order by "+parameter.sort+" "+parameter.order;
sql += " order by " + parameter.sort + " " + parameter.order;
}
else
{
sql += " order by sum(stock_count) desc";
}
var obj = cn.Page<dc_mid_skuwarehouse_sales>(parameter.pageIndex, parameter.limit, sql, ref total, sqlparam);
......@@ -869,7 +873,7 @@ namespace Bailun.DC.Services
/// <param name="end">统计结束时间</param>
/// <param name="total">符合条件的记录数</param>
/// <returns></returns>
public List<dc_mid_skuwarehouse_sales> ListSkuWarehouseSales(BtTableParameter parameter, string warehousecode, int? startcount, int? endcount, DateTime? devstart, DateTime? devend, DateTime? start, DateTime? end, ref int total)
public List<dc_mid_skuwarehouse_sales> ListSkuWarehouseSales(BtTableParameter parameter, string warehousecode, int? startcount, int? endcount, DateTime? devstart, DateTime? devend, DateTime? start, DateTime? end,string bailun_sku, ref int total)
{
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
......@@ -879,7 +883,7 @@ namespace Bailun.DC.Services
}
var sqlparam = new DynamicParameters();
var sql = "select * from dc_mid_skuwarehouse_sales where 1=1 ";
var sql = "select * from dc_mid_skuwarehouse_sales where id>0 ";
if (!string.IsNullOrEmpty(warehousecode))
{
......@@ -919,6 +923,13 @@ namespace Bailun.DC.Services
sqlparam.Add("end", end.Value.AddDays(1));
}
if (!string.IsNullOrEmpty(bailun_sku))
{
sql += " and bailun_sku=@sku";
sqlparam.Add("sku", bailun_sku);
}
if (!string.IsNullOrEmpty(parameter.sort))
{
sql += " order by " + parameter.sort + " " + parameter.order;
......@@ -941,7 +952,7 @@ namespace Bailun.DC.Services
/// <param name="start">统计开始时间</param>
/// <param name="end">统计结束时间</param>
/// <returns></returns>
public dc_mid_skuwarehouse_sales ListSkuWarehouseSalesCount(string warehousecode, int? startcount, int? endcount, DateTime? devstart, DateTime? devend, DateTime? start, DateTime? end)
public dc_mid_skuwarehouse_sales ListSkuWarehouseSalesCount(string warehousecode, int? startcount, int? endcount, DateTime? devstart, DateTime? devend, DateTime? start, DateTime? end, string bailun_sku)
{
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
......@@ -951,7 +962,7 @@ namespace Bailun.DC.Services
}
var sqlparam = new DynamicParameters();
var sql = "select sum(stock_count) stock_count,sum(stock_amount) stock_amount,sum(aliexpress_salecount) aliexpress_salecount,sum(aliexpress_saleamount) aliexpress_saleamount,sum(amazon_salecount) amazon_salecount, sum(amazon_saleamount) amazon_saleamount,sum(fba_salecount) fba_salecount,sum(fba_saleamount) fba_saleamount,sum(ebay_salecount) ebay_salecount,sum(ebay_saleamount) ebay_saleamount,sum(amazon2B_salecount) amazon2B_salecount,sum(amazon2B_saleamount) amazon2B_saleamount,sum(jollychic_salecount) jollychic_salecount,sum(jollychic_saleamount) jollychic_saleamount, sum(joom_salecount) joom_salecount,sum(joom_saleamount) joom_saleamount,sum(marketing_salecount) marketing_salecount,sum(marketing_saleamount) marketing_saleamount,sum(mymall_salecount) mymall_salecount,sum(mymall_saleamount) mymall_saleamount,sum(opensky_salecount) opensky_salecount,sum(opensky_saleamount) opensky_saleamount,sum(priceminister_salecount) priceminister_salecount,sum(priceminister_saleamount) priceminister_saleamount,sum(qoo10_salecount) qoo10_salecount,sum(qoo10_saleamount) qoo10_saleamount,sum(shopee_salecount) shopee_salecount,sum(shopee_saleamount) shopee_saleamount,sum(shopify_salecount) shopify_salecount,sum(shopify_saleamount) shopify_saleamount,sum(walmart_salecount) walmart_salecount,sum(walmart_saleamount) walmart_saleamount,sum(wish_salecount) wish_salecount,sum(wish_saleamount) wish_saleamount,sum(salecount) salecount from dc_mid_skuwarehouse_sales where 1=1 ";
var sql = "select sum(stock_count) stock_count,sum(stock_amount) stock_amount,sum(aliexpress_salecount) aliexpress_salecount,sum(aliexpress_saleamount) aliexpress_saleamount,sum(amazon_salecount) amazon_salecount, sum(amazon_saleamount) amazon_saleamount,sum(fba_salecount) fba_salecount,sum(fba_saleamount) fba_saleamount,sum(ebay_salecount) ebay_salecount,sum(ebay_saleamount) ebay_saleamount,sum(amazon2B_salecount) amazon2B_salecount,sum(amazon2B_saleamount) amazon2B_saleamount,sum(jollychic_salecount) jollychic_salecount,sum(jollychic_saleamount) jollychic_saleamount, sum(joom_salecount) joom_salecount,sum(joom_saleamount) joom_saleamount,sum(marketing_salecount) marketing_salecount,sum(marketing_saleamount) marketing_saleamount,sum(mymall_salecount) mymall_salecount,sum(mymall_saleamount) mymall_saleamount,sum(opensky_salecount) opensky_salecount,sum(opensky_saleamount) opensky_saleamount,sum(priceminister_salecount) priceminister_salecount,sum(priceminister_saleamount) priceminister_saleamount,sum(qoo10_salecount) qoo10_salecount,sum(qoo10_saleamount) qoo10_saleamount,sum(shopee_salecount) shopee_salecount,sum(shopee_saleamount) shopee_saleamount,sum(shopify_salecount) shopify_salecount,sum(shopify_saleamount) shopify_saleamount,sum(walmart_salecount) walmart_salecount,sum(walmart_saleamount) walmart_saleamount,sum(wish_salecount) wish_salecount,sum(wish_saleamount) wish_saleamount,sum(salecount) salecount from dc_mid_skuwarehouse_sales where id>0 ";
if (!string.IsNullOrEmpty(warehousecode))
{
......@@ -990,7 +1001,13 @@ namespace Bailun.DC.Services
sql += " and day<@end";
sqlparam.Add("end", end.Value.AddDays(1));
}
if (!string.IsNullOrEmpty(bailun_sku))
{
sql += " and bailun_sku=@sku";
sqlparam.Add("sku", bailun_sku);
}
var obj = cn.QueryFirstOrDefault<dc_mid_skuwarehouse_sales>( sql, sqlparam);
return obj;
......
Bailun.DC.Web/Areas/Reports/Controllers/InventoryController.cs
......@@ -552,7 +552,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="start">统计开始时间</param>
/// <param name="end">统计结束时间</param>
/// <returns></returns>
public string SkuWarehouseSaleReportJson(Models.BtTableParameter parameter, string warehousecode, int? startcount, int? endcount, DateTime? devstart, DateTime? devend, DateTime? start, DateTime? end)
public string SkuWarehouseSaleReportJson(Models.BtTableParameter parameter, string warehousecode, int? startcount, int? endcount, DateTime? devstart, DateTime? devend, DateTime? start, DateTime? end,string bailun_sku,string warehouse_code)
{
var total = 0;
var services = new Services.InventoryServices();
......
Bailun.DC.Web/Areas/Reports/Views/Inventory/SkuWarehouseSaleReport.cshtml
......@@ -12,13 +12,13 @@
<input type="hidden" id="warehousecode" name="warehousecode" value="@ViewBag.warehousecode" />
<div class="form-group">
<label>统计日期</label>
<input id="start" name="start" class="form-control" value="@(DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"))" placeholder="请选择统计开始日期" />-
<input id="end" name="end" class="form-control" value="@(DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"))" placeholder="请选择统计结束日期" />
<input id="start" name="start" class="form-control" value="@(DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"))" placeholder="请选择统计开始日期" style="width:110px" />-
<input id="end" name="end" class="form-control" value="@(DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"))" placeholder="请选择统计结束日期" style="width:110px" />
</div>
<div class="form-group">
<label>开发时间</label>
<input id="devstart" name="devstart" class="form-control" value="@ViewBag.devstart" placeholder="开发开始时间" />-
<input id="devend" name="devend" class="form-control" value="@ViewBag.devend" placeholder="开发结束时间" />
<input id="devstart" name="devstart" class="form-control" value="@ViewBag.devstart" placeholder="开发开始时间" style="width:110px" />-
<input id="devend" name="devend" class="form-control" value="@ViewBag.devend" placeholder="开发结束时间" style="width:110px" />
</div>
<div class="form-group">
<label>销量</label>
......@@ -26,6 +26,16 @@
<input id="endcount" name="endcount" class="form-control" placeholder="sku销量结束" value="@ViewBag.endcount" />
</div>
<div class="form-group">
<label>Sku编码</label>
<input id="bailun_sku" name="bailun_sku" class="form-control" placeholder="Sku编码" />
</div>
<div class="form-group">
<label>仓库</label>
<select id="warehouse_code" name="warehouse_code" class="form-control">
<option value="">请选择仓库</option>
</select>
</div>
<div class="form-group">
<label>&nbsp;</label>
<button type="button" class="btn btn-primary" onclick="list();"><i class="fa fa-search"></i>&nbsp;查询</button>
</div>
......
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