调整报表

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/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('出现异常。');