逻辑仓库相关功能 增加产品分类支持

Bailun.DC.Services/WareHouseServices.cs

@@ -1384,7 +1384,7 @@ namespace Bailun.DC.Services
         /// <param name="warehouse_code"></param>
         /// <param name="columnname"></param>
         /// <returns></returns>
-        public List<string> GetMidLogicWarehouseStatistic(string warehouse_code, string columnname,DateTime start,DateTime end)
+        public List<string> GetMidLogicWarehouseStatistic(string warehouse_code, string columnname,DateTime start,DateTime end,string category)
         {
             var sql = "select CONCAT(name,',',DATE_FORMAT(day,'%Y-%m-%d')) as name from (";
 
@@ -1397,6 +1397,10 @@ namespace Bailun.DC.Services
                 sql += "select sum(" + columnname + ") as name,day from dc_daily_logic_wh_statistic  where warehouse_code='" + warehouse_code + "' ";
             }
 
+            if (!string.IsNullOrWhiteSpace(category))
+            {
+                sql += $" and skucategory='{category}' ";
+            }
 
             sql += $" and day>='{start.ToString("yyyy-MM-dd")}' and day<='{end.ToString("yyyy-MM-dd")}' group by day";
 
@@ -1437,7 +1441,7 @@ namespace Bailun.DC.Services
 
             if (!string.IsNullOrWhiteSpace(category))
             {
-                sql += $" skucategory='{category}' ";
+                sql += $" skucategory='{category}' and ";
             }
 
             sql += $" day>='{start.ToString("yyyy-MM-dd")}' and day<='{end.ToString("yyyy-MM-dd")}' group by day";

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

@@ -1804,7 +1804,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             }
             else
             {
-                obj = new Services.WareHouseServices().GetMidLogicWarehouseStatistic(warehouse_code, key, start, end);
+                obj = new Services.WareHouseServices().GetMidLogicWarehouseStatistic(warehouse_code, key, start, end,category);
             }
 
 

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

@@ -332,7 +332,7 @@
 
             title += ' ';
 
-            layer_show(title+ name + '动态库存分析', '@Url.Content("~/Reports/Warehouse/DynamicStockAnalyse?warehouse_code=")' + code + '&isfinish=' + $('#isfinish').val() + '&category=' + $('#category').val(),'90%','90%');
+            layer_show(name + '动态库存分析', '@Url.Content("~/Reports/Warehouse/DynamicStockAnalyse?warehouse_code=")' + code + '&isfinish=' + $('#isfinish').val() + '&category=' + $('#category').val(),'90%','90%');
         }
 
         function ShowTrendChart(code, name, key, whname) {
@@ -340,6 +340,10 @@
                 code = '';
             }
 
+            var isfinish = $('#isfinish').val();
+            var category = $('#category').val();
+            var title = '';
+
             if (isfinish != '') {
                 title == isfinish == 1 ? "成品 " : "半成品 ";
             }
@@ -388,7 +392,7 @@
 
                             $('#category').html('<option value="">产品类型</option>');
                             for (var i in financecategory) {
-                                $('#category').append('<option value="' + financecategory[i].financecategoryid + '">' + financecategory[i].financecategoryname + '</option>');
+                                $('#category').append('<option value="' + financecategory[i].financecategoryname + '">' + financecategory[i].financecategoryname + '</option>');
                             }
                         }
                     }
@@ -397,7 +401,7 @@
             else {
                 $('#category').html('<option value="">产品类型</option>');
                 for (var i in financecategory) {
-                    $('#category').append('<option value="' + financecategory[i].financecategoryid + '">' + financecategory[i].financecategoryname + '</option>');
+                    $('#category').append('<option value="' + financecategory[i].financecategoryname + '">' + financecategory[i].financecategoryname + '</option>');
                 }
             }
         }
@@ -427,7 +431,7 @@
             else {
                 $('#category').html('<option value="">产品类型</option>');
                 for (var i in semiCategory) {
-                    $('#category').append('<option value="' + semiCategory[i].financecategoryid + '">' + semiCategory[i].financecategoryname + '</option>');
+                    $('#category').append('<option value="' + semiCategory[i].financecategoryname + '">' + semiCategory[i].financecategoryname + '</option>');
                 }
             }
         }