是否合理报表增加字段

Bailun.DC.Services/FinanceReportServices.cs

@@ -5081,7 +5081,7 @@ group by currency";
         public List<dc_mid_month_sale_putin_report> ListMonthSalePutinDetail(BtTableParameter parameter, string month, string warehousetype, string warehouse, int? type,int? isclear,int? isnew,int? isaims,ref int total,int isreasonable=-1)
         {
             var sqlparam = new DynamicParameters();
-            var sql = $@"select t1.warehouse_type,t1.warehouse_code,t1.warehouse_name,t1.bailun_sku,t1.count_putin,(t1.count_putin*t1.buyprice) amount_putin,t1.count_outbound,(t1.count_outbound*t1.buyprice) amount_outbound,(t1.count_putin-t1.count_outbound) count_diff,((t1.count_putin-t1.count_outbound)*t1.buyprice) amount_diff,t2.is_clear,t2.is_new,t2.is_aimsorder,t2.count_usable_stock,t2.avg_sevenday_sales,t2.avg_fourteenday_sales,t2.avg_thirtyday_sales,t2.avg_sales,t2.sale_putin_id from dc_mid_month_sale_putin t1
+            var sql = $@"select t1.warehouse_type,t1.warehouse_code,t1.warehouse_name,t1.bailun_sku,t1.count_putin,(t1.count_putin*t1.buyprice) amount_putin,t1.count_outbound,(t1.count_outbound*t1.buyprice) amount_outbound,(t1.count_putin-t1.count_outbound) count_diff,((t1.count_putin-t1.count_outbound)*t1.buyprice) amount_diff,t2.is_clear,t2.is_new,t2.is_aimsorder,t2.count_usable_stock,t2.avg_sevenday_sales,t2.avg_fourteenday_sales,t2.avg_thirtyday_sales,t2.avg_sales,t2.sale_putin_id,t2.avg_weighting_day_sales,t1.category_simple_name from dc_mid_month_sale_putin t1
                         left join dc_mid_month_sale_putin_report t2 on t1.id=t2.sale_putin_id
                         where t1.`month`='{month}'";
 

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

@@ -6480,6 +6480,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 a.amount_putin,
                 a.count_diff,
                 a.amount_diff,
+                a.category_simple_name,
 
                 is_clear = (a.is_clear??0)==0?"否":"是",
                 is_new = (a.is_new??0)==0?"否":"是",
@@ -6489,6 +6490,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 a.avg_fourteenday_sales,
                 a.avg_thirtyday_sales,
                 a.avg_sales,
+                a.avg_weighting_day_sales,
                 sale_putin_id = a.sale_putin_id>0?"不合理":"合理"
             });
 
@@ -6551,13 +6553,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 a.avg_fourteenday_sales,
                 a.avg_thirtyday_sales,
                 a.avg_sales,
-                sale_putin_id = a.sale_putin_id > 0 ? "不合理" : "合理"
+                sale_putin_id = a.sale_putin_id > 0 ? "不合理" : "合理",
+                a.category_simple_name,
+                a.avg_weighting_day_sales
             });
 
-            var colNames = new List<string>() { "仓库类型", "仓库名称", "sku", "出库数量", "出库金额", "入库数量", "入途金额", "(入库-出库)数量", "(入库-出库)金额" }; ;
+            var colNames = new List<string>() { "仓库类型", "仓库名称", "sku","百伦简单分录", "出库数量", "出库金额", "入库数量", "入途金额", "(入库-出库)数量", "(入库-出库)金额" }; ;
 
             
-            colNames.AddRange(new List<string> { "是否清货", "是否新品", "可用库存", "7日日均", "14日日均", "30日日均", "可消耗天数","是否合理"});
+            colNames.AddRange(new List<string> { "是否清货", "是否新品", "是否Aims下单","可用库存", "7日日均", "14日日均", "30日日均","加权日均", "可消耗天数","是否合理"});
             
 
             
@@ -6565,8 +6569,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             var listval = new List<string>();
             foreach (var item in list)
             {
-                listval.Add(item.warehouse_type + "|" + item.warehouse_name + "|" + item.bailun_sku + "|" + item.count_outbound + "|" + item.amount_outbound + "|" +
-                    item.count_putin + "|" + item.amount_putin + "|" + item.count_diff + "|" + item.amount_diff+("|"+item.is_clear+"|"+item.is_new+"|"+item.count_usable_stock+"|"+item.avg_sevenday_sales+"|"+item.avg_fourteenday_sales+"|"+item.avg_thirtyday_sales+"|"+item.avg_sales+"|"+item.sale_putin_id)
+                listval.Add(item.warehouse_type + "|" + item.warehouse_name + "|" + item.bailun_sku +"|"+item.category_simple_name+ "|" + item.count_outbound + "|" + item.amount_outbound + "|" +
+                    item.count_putin + "|" + item.amount_putin + "|" + item.count_diff + "|" + item.amount_diff+("|"+item.is_clear+"|"+item.is_new+"|"+item.is_aimsorder+"|"+item.count_usable_stock+"|"+item.avg_sevenday_sales+"|"+item.avg_fourteenday_sales+"|"+item.avg_thirtyday_sales+"|"+item.avg_weighting_day_sales+"|"+item.avg_sales+"|"+item.sale_putin_id)
                     );
             }
 

Bailun.DC.Web/Areas/Reports/Views/Finance/ListUnReasonable.cshtml

@@ -22,11 +22,11 @@
                         </select>
                     </div>
                     @*<div class="form-group">
-                            <label>仓库：</label>
-                            <select id="warehouse" name="warehouse" class="form-control">
-                                <option value="">请选择仓库</option>
-                            </select>
-                        </div>*@
+            <label>仓库：</label>
+            <select id="warehouse" name="warehouse" class="form-control">
+                <option value="">请选择仓库</option>
+            </select>
+        </div>*@
                     <div class="form-group">
                         <label>请选择开始月份</label>
                         <input id="month" name="month" class="form-control" style="width:130px;" placeholder="年-月" value="@(ViewBag.month)" />
@@ -64,6 +64,14 @@
                         </select>
                     </div>
                     <div class="form-group">
+                        <label>是否Aims下单</label>
+                        <select id="isaims" name="isaims" class="form-control">
+                            <option value="">请选择</option>
+                            <option value="1">是</option>
+                            <option value="0">否</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>
                         <button id="btnexport" style="display:none;" type="button" class="btn btn-success" onclick="exportlist();">导出</button>
@@ -115,6 +123,7 @@
                 { field: 'warehouse_type', title: '仓库类型', width: '130', iscount: true, sortable: true },
                 { field: 'warehouse_name', title: '仓库名称', width: '160', iscount: true, sortable: true },
                 { field: 'bailun_sku', title: 'sku', width: '180', iscount: true, sortable: true },
+                { field: 'category_simple_name', title: '百伦分类', width: '130' },
                 { field: 'count_outbound', title: '出库数量', width: '110', iscount: true, sortable: true },
                 { field: 'amount_outbound', title: '出库金额', width: '110', iscount: true },
                 { field: 'count_putin', title: '入库数量', width: '110', iscount: true, sortable: true },
@@ -125,6 +134,7 @@
             
             columns.push({ field: 'is_clear', title: '是否清货', width: '110', sortable: true });
             columns.push({ field: 'is_new', title: '是否新品', width: '110', sortable: true });
+            columns.push({ field: 'is_aimsorder', title: 'Aims下单', width: '110', sortable: true });
             columns.push({ field: 'count_usable_stock', title: '可用库存', width: '110', sortable: true, iscount: true });
 
             columns.push({ field: 'avg_sevenday_sales', title: '7日日均', width: '110' });