Skip to content

D
DataCenter_Core2.1_20190520
Commit 7955b8b6 by guanzhenshan
Options

调整报表

parent 98f86df0
Showing with 70 additions and 27 deletions
Bailun.DC.Services/WareHouseServices.cs
......@@ -1056,7 +1056,7 @@ namespace Bailun.DC.Services
{
var sqlparam = new DynamicParameters();
var sql = $@"select t1.day,t1.warehouse_name as category_simple_name,sum(t1.amount_purchase) amount_purchase,sum(t1.count_purchase) count_purchase,sum(t1.amount_shipping) amount_shipping,sum(t1.count_shipping) count_shipping from dc_daily_purchase_sales t1
var sql = $@"select t1.day,t1.warehouse_name as category_simple_name,sum(t1.amount_purchase) amount_purchase,sum(t1.count_purchase) count_purchase,sum(t1.amount_sales) amount_sales,sum(t1.count_sales) count_sales from dc_daily_purchase_sales t1
where t1.isfinish=0 and warehouse_code>0 and t1.day>='{start.ToString("yyyy-MM-dd")}' and t1.day<'{end.AddDays(1).ToString()}'
";
......
Bailun.DC.Web/Areas/Reports/Controllers/WarehouseController.cs
......@@ -754,7 +754,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
#region 采购和发货情况 Add by Allan at 20191104
var listSubCount = new List<Tuple<string, decimal, decimal, decimal, decimal>>();
var listSubCount1 = new List<Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>>();
var listSubCount2 = new List<Tuple<string, decimal, decimal, decimal, decimal, decimal, decimal>>();
var semi_E_Oil = objSemiCategory.Where(a => a.category_simple_name == "精油灌装车间" || a.category_simple_name == "精油灌装车间"); //精油原料
var semi_Hairdressing = objSemiCategory.Where(a => a.category_simple_name == "美容组装车间" || a.category_simple_name == "美容生产车间");//美容原料
var semi_Manicure = objSemiCategory.Where(a => a.category_simple_name == "阳山美甲灌装车间" || a.category_simple_name == "嘉禾美甲灌装车间" || a.category_simple_name == "哈倪蔓美甲灌装车间");//美甲原料
......@@ -768,75 +769,86 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
if (semi_E_Oil.Count() > 0)
{
listSubCount.Add(new Tuple<string, decimal, decimal, decimal, decimal>("精油原料", semi_E_Oil.Sum(a => a.amount_purchase), semi_E_Oil.Sum(a => a.count_purchase), semi_E_Oil.Sum(a => a.amount_shipping), semi_E_Oil.Sum(a => a.count_shipping)));
listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("精油原料", semi_E_Oil.Sum(a => a.amount_purchase), semi_E_Oil.Sum(a => a.count_purchase), semi_E_Oil.Sum(a => a.amount_sales), semi_E_Oil.Sum(a => a.count_sales),(semi_E_Oil.Sum(a => a.amount_sales)- semi_E_Oil.Sum(a => a.amount_purchase)),(semi_E_Oil.Sum(a => a.count_sales) - semi_E_Oil.Sum(a => a.count_purchase))));
}
else
{
listSubCount.Add(new Tuple<string, decimal, decimal, decimal, decimal>("精油原料", 0, 0, 0, 0));
listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("精油原料", 0, 0, 0, 0,0,0));
}
if (semi_Hairdressing.Count() > 0)
{
listSubCount.Add(new Tuple<string, decimal, decimal, decimal, decimal>("美容原料", semi_Hairdressing.Sum(a => a.amount_purchase), semi_Hairdressing.Sum(a => a.count_purchase), semi_Hairdressing.Sum(a => a.amount_shipping), semi_Hairdressing.Sum(a => a.count_shipping)));
listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("美容原料", semi_Hairdressing.Sum(a => a.amount_purchase), semi_Hairdressing.Sum(a => a.count_purchase), semi_Hairdressing.Sum(a => a.amount_sales), semi_Hairdressing.Sum(a => a.count_sales), (semi_Hairdressing.Sum(a => a.amount_sales) - semi_Hairdressing.Sum(a => a.amount_purchase)), (semi_Hairdressing.Sum(a => a.count_sales) - semi_Hairdressing.Sum(a => a.count_purchase))));
}
else
{
listSubCount.Add(new Tuple<string, decimal, decimal, decimal, decimal>("美容原料", 0, 0, 0, 0));
listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("美容原料", 0, 0, 0, 0,0,0));
}
if (semi_Manicure.Count() > 0)
{
listSubCount.Add(new Tuple<string, decimal, decimal, decimal, decimal>("美甲原料", semi_Manicure.Sum(a => a.amount_purchase), semi_Manicure.Sum(a => a.count_purchase), semi_Manicure.Sum(a => a.amount_shipping), semi_Manicure.Sum(a => a.count_shipping)));
listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("美甲原料", semi_Manicure.Sum(a => a.amount_purchase), semi_Manicure.Sum(a => a.count_purchase), semi_Manicure.Sum(a => a.amount_sales), semi_Manicure.Sum(a => a.count_sales), (semi_Manicure.Sum(a => a.amount_sales) - semi_Manicure.Sum(a => a.amount_purchase)), (semi_Manicure.Sum(a => a.count_sales) - semi_Manicure.Sum(a => a.count_purchase))));
}
else
{
listSubCount.Add(new Tuple<string, decimal, decimal, decimal, decimal>("美甲原料", 0, 0, 0, 0));
listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("美甲原料", 0, 0, 0, 0,0,0));
}
if (semi_HNM.Count() > 0)
{
listSubCount.Add(new Tuple<string, decimal, decimal, decimal, decimal>("哈倪蔓基料", semi_HNM.Sum(a => a.amount_purchase), semi_HNM.Sum(a => a.count_purchase), semi_HNM.Sum(a => a.amount_shipping), semi_HNM.Sum(a => a.count_shipping)));
listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("哈倪蔓基料", semi_HNM.Sum(a => a.amount_purchase), semi_HNM.Sum(a => a.count_purchase), semi_HNM.Sum(a => a.amount_sales), semi_HNM.Sum(a => a.count_sales), (semi_HNM.Sum(a => a.amount_sales) - semi_HNM.Sum(a => a.amount_purchase)), (semi_HNM.Sum(a => a.count_sales) - semi_HNM.Sum(a => a.count_purchase))));
}
else
{
listSubCount.Add(new Tuple<string, decimal, decimal, decimal, decimal>("哈倪蔓基料", 0, 0, 0, 0));
listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("哈倪蔓基料", 0, 0, 0, 0,0,0));
}
if (finish_Gen.Count() > 0)
{
listSubCount.Add(new Tuple<string, decimal, decimal, decimal, decimal>("普货", finish_Gen.Sum(a => a.amount_purchase), finish_Gen.Sum(a => a.count_purchase), finish_Gen.Sum(a => a.amount_shipping), finish_Gen.Sum(a => a.count_shipping)));
listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("普货", finish_Gen.Sum(a => a.amount_purchase), finish_Gen.Sum(a => a.count_purchase), finish_Gen.Sum(a => a.amount_sales), finish_Gen.Sum(a => a.count_sales), (finish_Gen.Sum(a => a.amount_sales) - finish_Gen.Sum(a => a.amount_purchase)), (finish_Gen.Sum(a => a.count_sales) - finish_Gen.Sum(a => a.count_purchase))));
}
else
{
listSubCount.Add(new Tuple<string, decimal, decimal, decimal, decimal>("普货", 0, 0, 0, 0));
listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("普货", 0, 0, 0, 0,0,0));
}
if (finish_Manicure.Count() > 0)
{
listSubCount.Add(new Tuple<string, decimal, decimal, decimal, decimal>("美甲生产", finish_Manicure.Sum(a => a.amount_purchase), finish_Manicure.Sum(a => a.count_purchase), finish_Manicure.Sum(a => a.amount_shipping), finish_Manicure.Sum(a => a.count_shipping)));
listSubCount2.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("美甲生产", finish_Manicure.Sum(a => a.amount_purchase), finish_Manicure.Sum(a => a.count_purchase), finish_Manicure.Sum(a => a.amount_sales), finish_Manicure.Sum(a => a.count_sales), (finish_Manicure.Sum(a => a.amount_sales) - finish_Manicure.Sum(a => a.amount_purchase)), (finish_Manicure.Sum(a => a.count_sales) - finish_Manicure.Sum(a => a.count_purchase))));
}
else
{
listSubCount.Add(new Tuple<string, decimal, decimal, decimal, decimal>("美甲生产", 0, 0, 0, 0));
listSubCount2.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("美甲生产", 0, 0, 0, 0,0,0));
}
if (finish_E_Oil.Count() > 0)
{
listSubCount.Add(new Tuple<string, decimal, decimal, decimal, decimal>("精油生产", finish_E_Oil.Sum(a => a.amount_purchase), finish_E_Oil.Sum(a => a.count_purchase), finish_E_Oil.Sum(a => a.amount_shipping), finish_E_Oil.Sum(a => a.count_shipping)));
listSubCount2.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("精油生产", finish_E_Oil.Sum(a => a.amount_purchase), finish_E_Oil.Sum(a => a.count_purchase), finish_E_Oil.Sum(a => a.amount_sales), finish_E_Oil.Sum(a => a.count_sales), (finish_E_Oil.Sum(a => a.amount_sales) - finish_E_Oil.Sum(a => a.amount_purchase)), (finish_E_Oil.Sum(a => a.count_sales) - finish_E_Oil.Sum(a => a.count_purchase))));
}
else
{
listSubCount.Add(new Tuple<string, decimal, decimal, decimal, decimal>("精油生产", 0, 0, 0, 0));
listSubCount2.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("精油生产", 0, 0, 0, 0,0,0));
}
if (finish_Hairdressing.Count() > 0)
{
listSubCount.Add(new Tuple<string, decimal, decimal, decimal, decimal>("美容生产", finish_Hairdressing.Sum(a => a.amount_purchase), finish_Hairdressing.Sum(a => a.count_purchase), finish_Hairdressing.Sum(a => a.amount_shipping), finish_Hairdressing.Sum(a => a.count_shipping)));
listSubCount2.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("美容生产", finish_Hairdressing.Sum(a => a.amount_purchase), finish_Hairdressing.Sum(a => a.count_purchase), finish_Hairdressing.Sum(a => a.amount_sales), finish_Hairdressing.Sum(a => a.count_sales), (finish_Hairdressing.Sum(a => a.amount_sales) - finish_Hairdressing.Sum(a => a.amount_purchase)), (finish_Hairdressing.Sum(a => a.count_sales) - finish_Hairdressing.Sum(a => a.count_purchase))));
}
else
{
listSubCount2.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("美容生产", 0, 0, 0, 0,0,0));
}
if (finish_Gen.Count() > 0)
{
listSubCount2.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("普货", finish_Gen.Sum(a => a.amount_purchase), finish_Gen.Sum(a => a.count_purchase), finish_Gen.Sum(a => a.amount_sales), finish_Gen.Sum(a => a.count_sales), (finish_Gen.Sum(a => a.amount_sales) - finish_Gen.Sum(a => a.amount_purchase)), (finish_Gen.Sum(a => a.count_sales) - finish_Gen.Sum(a => a.count_purchase))));
}
else
{
listSubCount.Add(new Tuple<string, decimal, decimal, decimal, decimal>("美容生产", 0, 0, 0, 0));
listSubCount2.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("普货", 0, 0, 0, 0,0,0));
}
#endregion
......@@ -1176,7 +1188,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
data = data,
counthead = countHead,
countdata = countData,
subcount = listSubCount
subcount = listSubCount1,
subcount1 = listSubCount2
});
}
......
Bailun.DC.Web/Areas/Reports/Views/Warehouse/DailyPurchaseSalesCount.cshtml
......@@ -65,16 +65,31 @@
<table id="subcounttb" class="table table-hover table-bordered table-condensed table-striped">
<thead>
<tr>
<td>Sku分类</td>
<td>总采购下单金额</td>
<td>总采购下单数</td>
<td>总发货金额</td>
<td>总发货数量</td>
<td>外采类型</td>
<td>采购金额</td>
<td>采购数量</td>
<td>销售成本</td>
<td>销售数量</td>
<td>差异金额</td>
<td>差异数量</td>
</tr>
</thead>
<tbody>
</tbody>
<tbody></tbody>
</table>
<hr />
<table id="subcounttb1" class="table table-hover table-bordered table-condensed table-striped">
<thead>
<tr>
<td>生产下单类型</td>
<td>采购金额</td>
<td>采购数量</td>
<td>销售成本</td>
<td>销售数量</td>
<td>差异金额</td>
<td>差异数量</td>
</tr>
</thead>
<tbody></tbody>
</table>
</div>
</div>
......@@ -210,6 +225,21 @@
}
}
$('#subcounttb1').find('tbody').html('');
if (result.subcount1.length > 0) {
for (var i = 0; i < result.subcount1.length; i++) {
var s = '<tr>';
var obj = result.subcount1[i];
for (var c in obj) {
s += ('<td>' + obj[c] + '</td>');
}
s += "</tr>";
$('#subcounttb1').find('tbody').append(s);
}
}
}
else {
layer.msg('出现异常。');
......
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