每日进销差异表增加总计和原料统计

Bailun.DC.Web/Areas/Reports/Controllers/WarehouseController.cs

@@ -928,12 +928,73 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 data = newData;
             }
 
+            var countHead = new List<string>() { "Sku分类" };
+            countHead.Add((t == 1 ? "总采购下单金额" : "总入库金额"));
+            countHead.Add((t == 1 ? "总采购下单数" : "总入库数"));
+            countHead.Add((t == 1 ? "总销售金额" : "总发货金额"));
+            countHead.Add((t == 1 ? "总销售数量" : "总发货数量"));
+            countHead.Add("总差异金额");
+            countHead.Add("总差异数量");
+
+            var countData = new List<SkuCategory_Col>();
+            var c_val1 = 0M;
+            var c_val2 = 0;
+            var c_val3 = 0M;
+            var c_val4 = 0;
+            var c_val5 = 0M;
+            var c_val6 = 0;
+
+            foreach (var item in data)
+            {
+                var objCount = obj.Where(a => a.category_simple_name == item.category_simple_name);
+
+                if (item.category_simple_name == "普货")
+                {
+                    objCount = obj.Where(a => a.category_simple_name.Contains(item.category_simple_name));
+                }
+                
+                var val_1 = (t == 1 ? objCount.Sum(a => a.amount_purchase) : objCount.Sum(a => a.amount_putin));
+                var val_2 = (t == 1 ? objCount.Sum(a => a.count_purchase) : objCount.Sum(a => a.count_putin));
+                var val_3 = (t == 1 ? objCount.Sum(a => a.amount_sales) : objCount.Sum(a => a.amount_shipping));
+                var val_4 = (t == 1 ? objCount.Sum(a => a.count_sales) : objCount.Sum(a => a.count_shipping));
+
+                var val_5 = (t == 1 ? objCount.Sum(a => a.amount_purchase-a.amount_sales) : objCount.Sum(a => a.amount_putin-a.amount_shipping));
+                var val_6 = (t == 1 ? objCount.Sum(a => a.count_purchase-a.count_sales) : objCount.Sum(a => a.count_putin-a.count_shipping));
+
+                if (item.category_simple_name != "总计")
+                {
+                    c_val1 += val_1;
+                    c_val2 += val_2;
+                    c_val3 += val_3;
+                    c_val4 += val_4;
+                    c_val5 += val_5;
+                    c_val6 += val_6;
+                }
+                else
+                {
+                    val_1 = c_val1;
+                    val_2 = c_val2;
+                    val_3 = c_val3;
+                    val_4 = c_val4;
+                    val_5 = c_val5;
+                    val_6 = c_val6;
+                }
+
+                countData.Add(new SkuCategory_Col {
+                    category_simple_name = item.category_simple_name,
+                    list = new List<string> { val_1.ToString(), val_2.ToString(), val_3.ToString(), val_4.ToString(), val_5.ToString(), val_6.ToString() }
+                });
+            }
+            
+
             return Json(new {
                 success = true,
                 list = list,
                 msg = "",
                 head = head,
-                data = data
+                data = data,
+                counthead = countHead,
+                countdata = countData
             });
         }
         

Bailun.DC.Web/Areas/Reports/Views/Warehouse/DailyPurchaseSalesCount.cshtml

@@ -46,9 +46,17 @@
                 <thead>
                     <tr></tr>
                 </thead>
-                <tbody>
-
-                </tbody>
+                <tbody></tbody>
+            </table>
+        </div>
+        <hr />
+        <label>总计</label>
+        <div class="ibox-content m-b-sm border-bottom">
+            <table id="counttb" class="table table-hover table-bordered table-condensed table-striped">
+                <thead>
+                    <tr></tr>
+                </thead>
+                <tbody></tbody>
             </table>
         </div>
     </div>
@@ -139,6 +147,35 @@
                             $('#roletable').find('tbody').append(s);
                         }
 
+                        //counttb
+                        $('#counttb').find('tbody').html('');
+                        $('#counttb').find('thead').html('');
+                        if (result.head.length > 0) {
+                            var s = '<tr>';
+                            for (var i = 0; i < result.counthead.length; i++) {
+                                s += ('<th style="width:160px;">' + result.counthead[i] + '</th>');
+                            }
+                            s += '</tr>';
+
+                            $('#counttb').find('thead').append(s);
+                        }
+
+                        for (var i = 0; i < result.countdata.length; i++) {
+                            var s = '<tr>';
+                            var obj = result.countdata[i];
+
+                            s += ('<td style="width:160px;">' + (obj.category_simple_name == '' ? '空' : obj.category_simple_name) + '</td>');
+
+                            if (obj.list.length > 0) {
+                                for (var j = 0; j < obj.list.length; j++) {
+                                    s += ('<td style="width:160px;">' + obj.list[j] + '</td>');
+                                }
+                            }
+
+                            s += "</tr>";
+                            $('#counttb').find('tbody').append(s);
+                        }
+
                     }
                     else {
                         layer.msg('出现异常。');
@@ -148,6 +185,11 @@
         }
 
         function showdetail(categoryname, colname) {
+            if (categoryname == '原料') {
+                alert('原料明细还在完善...');
+                return false;
+            }
+
             layer_show(categoryname +' '+ colname+' 的Sku明细', '@Url.Content("~/Reports/Warehouse/ListDailyPurchaseSales?categoryname=")' + categoryname + '&colname=' + colname + '&dateWay=' + $('#dateWay').val() + '&t=' + $('#t').val(), '90%', '90%');
         }