22

schangxiang@126.com

2024-12-23 283a985dede9fd09cb820a79bb603d7ea34050fc

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs

@@ -10,6 +10,7 @@
using Admin.NET.Application.Service.WmsCommonnQuery.Dto;
using System.Collections.Generic;
using Admin.NET.Application.CommonHelper;
using System.Globalization;

namespace Admin.NET.Application;
/// <summary>
@@ -70,7 +71,7 @@
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
            .Where(x => ((DateTime)x.CreateTime).ToString("yyyyMMdd") == DateTime.Now.ToString("yyyyMMdd"))
            .Where(x => x.IsKitting == false)
            .Where(x => x.IsUnline == null || x.IsUnline == false)
            .OrderBy(g => g.Id)
            .ToListAsync(); // 确保获取结果为 List

@@ -503,6 +504,7 @@
        {
            if (!listDaoUbi.Contains(item.UPI)) // 使用 HashSet 进行查找
            {
                var pc = await _mesPackageGatherRep.GetFirstAsync(x => x.PackageCode == item.PackageCode);
                listRes.Add(new WmsShortageListOutput
                {
                    UPI = item.UPI,
@@ -512,10 +514,10 @@
                    PlanNo = item.PlanNo,
                    Info5 = item.Info5,
                    Info4 = item.Info4,
                    Info10 = item.Info10,
                    Info11 = item.Info11,
                    Info12 = item.Info12,
                    Info13 = item.Info13,
                    Info10 = pc.Info10,
                    Info11 = pc.Info11,
                    Info12 = pc.Info12,
                    Info13 = pc.Info13,
                    //Info14 = item.Info14,
                    Info15 = item.Info15,
                    Info16 = item.Info16,
@@ -768,24 +770,46 @@
        // 获取当前时间
        DateTime currentDate = DateTime.Now;
        // 计算一周之前的时间
        DateTime oneWeekAgo = currentDate.AddDays(-7);
        //DateTime oneWeekAgo = currentDate.AddDays(-7);

        // 获取当前文化信息
        CultureInfo cultureInfo = CultureInfo.CurrentCulture;

        // DayOfWeek.Monday 表示一周的第一天是周一
        int diff = (int)cultureInfo.DateTimeFormat.FirstDayOfWeek - (int)DateTime.Now.DayOfWeek;

        // 如果需要，对差值进行调整以确保是过去的日期
        if (diff < 0) diff += 7;
        DateTime oneWeekAgo = DateTime.Now.AddDays(diff).Date;
        //*/

        // 查询最近一周的下线订单数
        var orderCount = await _mesOrderGatherRep.AsQueryable().Where(x => x.UnlineTime >= oneWeekAgo && x.UnlineTime <= currentDate).CountAsync();
        var dataList = await _mesPackage_UnLine_RecordRep.AsQueryable().Where(x => x.CreateTime >= oneWeekAgo && x.CreateTime <= currentDate).ToListAsync();

        var packageList = dataList.GroupBy(x => x.PackageCode);//下线包

        var orderCount = dataList.GroupBy(x => x.Info5).Count();//下线订单数
        var packageCount = packageList.Count();//下线包数
        var upiCount = 0;
        foreach (var item in packageList)
        {
            upiCount += Convert.ToInt32(item.ToList().First().Info12);
        }

        resultList.Add(new Home_Order_Info
        {
            Name = "本周下线订单数",
            Value = orderCount // 将查询到的数量赋值
            Name = "本周生产订单数",
            Value = orderCount
        });
        resultList.Add(new Home_Order_Info
        {
            Name = "下线包数",
            Value = 8
            // Value = await _mesPackage_UnLine_RecordRep  查询最近一周的下线订单数
            Name = "本周下线包数",
            Value = packageCount
        });
        resultList.Add(new Home_Order_Info
        {
            Name = "下线板数",
            Value = 3 // 这里示例值为3，可以根据实际逻辑调整
            Name = "本周下线板数",
            Value = upiCount
        });
        return resultList; // 结果
    }
@@ -811,10 +835,8 @@
            //总的数据
            DateTime all_startDate = currentDate.AddDays(-11);
            DateTime all_endDate = currentDate.Date.AddDays(1).AddTicks(-1);
            var all_recordsOfDay = await _mesOrderGatherRep.AsQueryable()
            var all_recordsOfDay = await _mesPackage_UnLine_RecordRep.AsQueryable()
                .Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
                //&& (r.OrderStatus == OrderStatusEnum.已完成)
                //&& (r.OrderType == OrderTypeEnum.上架单 || r.OrderType == OrderTypeEnum.下架单)
               ).ToListAsync();


@@ -831,12 +853,10 @@
                var summary = new WmsStockPassMapOutput
                {
                    Time = 12 - i,
                    InWare = recordsOfDay
                    // .Where(x => x.OrderType == OrderTypeEnum.上架单)
                    .ToList().Count(),
                    //InWare = recordsOfDay
                    //.ToList().Count(),
                    OutWare = recordsOfDay
                    //  .Where(x => x.OrderType == OrderTypeEnum.下架单)
                    .ToList().Count(),
                    .ToList().GroupBy(x => x.Info5).Count(),
                    StockNum = 0,
                    AveStockNum = 0,
                    Date = startDate.Date.ToString("yyyy-MM-dd")
@@ -851,9 +871,7 @@
            //总的数据
            DateTime all_startDate = GetStartOfWeek(currentDate).AddDays(-7 * 11);
            DateTime all_endDate = GetEndOfWeek(currentDate);
            var all_recordsOfDay = await _mesOrderGatherRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
               //&& (r.OrderStatus == OrderStatusEnum.已完成)
               //&& (r.OrderType == OrderTypeEnum.上架单 || r.OrderType == OrderTypeEnum.下架单)
            var all_recordsOfDay = await _mesPackage_UnLine_RecordRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
               ).ToListAsync();

            for (int i = 0; i < 12; i++)
@@ -869,12 +887,10 @@
                var summary = new WmsStockPassMapOutput
                {
                    Time = 12 - i,
                    InWare = recordsOfWeek
                    // .Where(x => x.OrderType == OrderTypeEnum.上架单) .Sum(x => x.Quantity),
                    .ToList().Count(),
                    //InWare = recordsOfWeek
                    //.ToList().Count(),
                    OutWare = recordsOfWeek
                      //  .Where(x => x.OrderType == OrderTypeEnum.下架单)
                      .ToList().Count(),
                      .ToList().GroupBy(x => x.Info5).Count(),
                    StockNum = 0,
                    AveStockNum = 0,
                    Date = startDate.Date.ToString("MMdd") + "～" + endDate.Date.ToString("MMdd")
@@ -889,9 +905,7 @@
            //总的数据
            DateTime all_startDate = currentDate.AddMonths(-11).AddDays(1 - currentDate.Day);
            DateTime all_endDate = currentDate.AddMonths(1).AddDays(-1);
            var all_recordsOfDay = await _mesOrderGatherRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
               //&& (r.OrderStatus == OrderStatusEnum.已完成)
               //&& (r.OrderType == OrderTypeEnum.上架单 || r.OrderType == OrderTypeEnum.下架单)
            var all_recordsOfDay = await _mesPackage_UnLine_RecordRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
               ).ToListAsync();

            for (int i = 0; i < 12; i++)
@@ -906,12 +920,10 @@
                var summary = new WmsStockPassMapOutput
                {
                    Time = 12 - i,
                    InWare = recordsOfMonth
                    //.Where(x => x.OrderType == OrderTypeEnum.上架单)
                     .ToList().Count(),
                    //InWare = recordsOfMonth
                    // .ToList().Count(),
                    OutWare = recordsOfMonth
                     // .Where(x => x.OrderType == OrderTypeEnum.下架单)
                     .ToList().Count(),
                     .ToList().GroupBy(x => x.Info5).Count(),
                    StockNum = 0,
                    AveStockNum = 0,
                    Date = startDate.ToString("yyyy-MM")