查看逻辑仓库sku明细增加半成品仓库筛选

Bailun.DC.Services/WareHouseServices.cs

@@ -1634,8 +1634,24 @@ namespace Bailun.DC.Services
 
         #endregion
 
+        #region 半成品仓库
 
+        public List<dc_base_wip_warehouse> ListSemiWareHouseNew()
+        {
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
+            {
+                if(cn.State== System.Data.ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
 
+                return cn.Query<dc_base_wip_warehouse>("select * from dc_base_wip_warehouse").ToList();
+
+            }
+
+        }
+
+        #endregion
 
         #region Api
 

Bailun.DC.SkuDataWareHouse/Services.cs

@@ -27,12 +27,12 @@ namespace Bailun.DC.SkuDataWareHouse
             {
                 var now = DateTime.Now;
 
-                if (now.Hour == 4 && now.Minute == 1)
+                if (now.Hour == 5 && now.Minute == 1)
                 {
                     Save();
                 }
 
-                if (now.Minute % 20==0) //每20分钟更新一次
+                if (now.Minute % 30==0) //每30分钟更新一次
                 {
                     UpdateAllotOnWay();
                 }

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

@@ -225,7 +225,18 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             ViewBag.warehousecode = code;
             ViewBag.available_days = available_days;
 
-            ViewBag.listWarehouse = new Services.WareHouseServices().List("", null).OrderBy(a => a.warehouse_name).ToList();
+            var _warehouseService = new Services.WareHouseServices();
+
+            var listWareHouse = _warehouseService.List("", null).OrderBy(a => a.warehouse_name).ToList();
+            var listSemiWarehouse = _warehouseService.ListSemiWareHouseNew();
+
+            listWareHouse.AddRange(listSemiWarehouse.Select(b => new dc_base_warehouse { 
+                warehouse_code = b.warehouse_code,
+                warehouse_name = b.warehouse_name,
+                hq_type = "半成品仓"
+            }));
+
+            ViewBag.listWarehouse = listWareHouse;
 
             ViewBag.EndDate = DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00";
             ViewBag.StartOneDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") + " 00:00:00";