xby-y
10 天以前 b3ff80e45d24a821ca0731983b1546b48570cdf1
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_HomeService/HomeService.cs
@@ -26,29 +26,29 @@
        /// <returns></returns>
        public WebResponseContent GetDt_TaskHty()
        {
            var response = new WebResponseContent();
            WebResponseContent response = new WebResponseContent();
            try
            {
                // èŽ·å–å½“å‰æ—¥æœŸæ—¶é—´
                var now = DateTime.Now;
                DateTime now = DateTime.Now;
                // èŽ·å–ä»Šæ—¥æ—¥æœŸèŒƒå›´
                var todayStart = now.Date;
                var todayEnd = now.Date.AddDays(1);
                DateTime todayStart = now.Date;
                DateTime todayEnd = now.Date.AddDays(1);
                // èŽ·å–æœ¬å‘¨æ—¥æœŸèŒƒå›´
                // è®¡ç®—本周一的日期:如果今天是周日(0),减去6天;否则减去当前星期几减1天
                var daysToSubtract = (int)now.DayOfWeek == 0 ? 6 : (int)now.DayOfWeek - 1;
                var weekStart = now.Date.AddDays(-daysToSubtract);
                var weekEnd = weekStart.AddDays(7);
                int daysToSubtract = (int)now.DayOfWeek == 0 ? 6 : (int)now.DayOfWeek - 1;
                DateTime weekStart = now.Date.AddDays(-daysToSubtract);
                DateTime weekEnd = weekStart.AddDays(7);
                // èŽ·å–æœ¬æœˆæ—¥æœŸèŒƒå›´
                var monthStart = new DateTime(now.Year, now.Month, 1);
                var monthEnd = monthStart.AddMonths(1);
                DateTime monthStart = new DateTime(now.Year, now.Month, 1);
                DateTime monthEnd = monthStart.AddMonths(1);
                // èŽ·å–æ‰€æœ‰åº“å­˜æ•°æ®ï¼Œç”¨äºŽåŽç»­ç»Ÿè®¡
                var allStockData = Repository.Db.Queryable<Dt_StockInfo>().ToList();
                var allTask_HtyData = Repository.Db.Queryable<Dt_Task_Hty>().ToList();
                List<Dt_StockInfo> allStockData = Repository.Db.Queryable<Dt_StockInfo>().ToList();
                List<Dt_Task_Hty> allTask_HtyData = BaseDal.QueryData();
                // è°ƒè¯•信息:打印日期范围和库存数据总数
                var debugInfo = new
                {
@@ -62,40 +62,40 @@
                };
                
                var toDt_task_hty_in = allTask_HtyData.Count(it => it.TaskStatus == (int)TaskInStatusEnum.InFinish);//获取出入库存历史任务记录
                var toDt_task_hty_on = allTask_HtyData.Count(it => it.TaskStatus == (int)TaskOutStatusEnum.OutFinish);
                int toDt_task_hty_in = allTask_HtyData.Count(it => it.TaskStatus == (int)TaskInStatusEnum.InFinish);//获取出入库存历史任务记录
                int toDt_task_hty_on = allTask_HtyData.Count(it => it.TaskStatus == (int)TaskOutStatusEnum.OutFinish);
                // ä»Šæ—¥å…¥åº“数量:今天创建且库存状态为入库完成的记录数量
                var todayInbound = allTask_HtyData.Count(it =>
                int todayInbound = allTask_HtyData.Count(it =>
                    it.CreateDate >= todayStart && it.CreateDate < todayEnd &&
                    it.TaskStatus == (int)TaskInStatusEnum.InFinish);
                // ä»Šæ—¥å‡ºåº“数量:今天创建且库存状态为出库完成的记录数量
                var todayOutbound = allTask_HtyData.Count(it =>
                int todayOutbound = allTask_HtyData.Count(it =>
                    it.CreateDate >= todayStart && it.CreateDate < todayEnd &&
                    it.TaskStatus == (int)TaskOutStatusEnum.OutFinish);
                // æœ¬å‘¨å…¥åº“数量:本周创建且库存状态为入库完成的记录数量
                var weekInbound = allTask_HtyData.Count(it =>
                int weekInbound = allTask_HtyData.Count(it =>
                    it.CreateDate >= weekStart && it.CreateDate < weekEnd &&
                    it.TaskStatus == (int)TaskInStatusEnum.InFinish);
                // æœ¬å‘¨å‡ºåº“数量:本周创建且任务状态为出库完成的记录数量
                var weekOutbound = allTask_HtyData.Count(it =>
                int weekOutbound = allTask_HtyData.Count(it =>
                    it.CreateDate >= weekStart && it.CreateDate < weekEnd &&
                    it.TaskStatus == (int)TaskOutStatusEnum.OutFinish);
                // æœ¬æœˆå…¥åº“数量:本月创建且库存状态为入库完成的记录数量
                var monthInbound = allTask_HtyData.Count(it =>
                int monthInbound = allTask_HtyData.Count(it =>
                    it.CreateDate >= monthStart && it.CreateDate < monthEnd &&
                    it.TaskStatus == (int)TaskInStatusEnum.InFinish);
                // æœ¬æœˆå‡ºåº“数量:本月创建且任务状态为出库完成的记录数量
                var monthOutbound = allTask_HtyData.Count(it =>
                int monthOutbound = allTask_HtyData.Count(it =>
                    it.CreateDate >= monthStart && it.CreateDate < monthEnd &&
                    it.TaskStatus == (int)TaskOutStatusEnum.OutFinish);
                // å¾…处理订单数量:由于只有Dt_StockInfo表,暂时返回0
                var pendingOrders = 0;
                int pendingOrders = 0;
                // åº“存状态分布:统计不同库存状态的数量
                var stockStatusDistribution = allTask_HtyData
@@ -114,22 +114,22 @@
                // è´§ä½åˆ©ç”¨çŽ‡ï¼šä»Žæ•°æ®åº“èŽ·å–è´§ä½ä¿¡æ¯
                // èŽ·å–æ‰€æœ‰è´§ä½
                var allLocations = Repository.Db.Queryable<Dt_LocationInfo>().ToList();
                var totalLocations = allLocations.Count;
                List<Dt_LocationInfo> allLocations = Repository.Db.Queryable<Dt_LocationInfo>().ToList();
                int totalLocations = allLocations.Count;
                // ç»Ÿè®¡ä¸åŒçŠ¶æ€çš„è´§ä½æ•°
                var freeLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.Free);
                var inStockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.InStock);
                var inStockLockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.InStockLock);
                var lockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.Lock);
                var freeLockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.FreeLock);
                var palletLockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.PalletLock);
                int freeLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.Free);
                int inStockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.InStock);
                int inStockLockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.InStockLock);
                int lockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.Lock);
                int freeLockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.FreeLock);
                int palletLockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.PalletLock);
                // è®¡ç®—已使用和未使用的货位数
                // å·²ä½¿ç”¨ï¼šæœ‰è´§ã€æœ‰è´§é”å®š
                var usedLocations = inStockLocations + inStockLockLocations;
                int usedLocations = inStockLocations + inStockLockLocations;
                // æœªä½¿ç”¨ï¼šç©ºé—²ã€ç©ºé—²é”å®š
                var unusedLocations = freeLocations + freeLockLocations;
                int unusedLocations = freeLocations + freeLockLocations;
                // åº“存变化趋势:模拟最近7天的数据
                // å®žé™…应根据数据库中的历史记录生成