22

schangxiang@126.com

2024-12-16 842b40ba0afed53b69cdb34b3e5ec27b8ca26f66

 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>
@@ -29,6 +30,7 @@
    private readonly SqlSugarRepository<Mes_Package_LineQueue> _mesPackage_LineQueueRep;
    private readonly SqlSugarRepository<WmsRecordUpiReplenish> _wmsRecordUpiReplenishRep;
    private readonly SqlSugarRepository<WmsRecordUpiProcess> _wmsRecordUpiProcessRep;
    private readonly SqlSugarRepository<V_Station_Quan> _V_Station_Quan;

    public WmsCommonnQueryService(SqlSugarRepository<WmsRbLineTask> wmsRbLineTaskRep, SqlSugarRepository<WmsStockQuan> wmsStockQuanRep
        , SqlSugarRepository<Mes_Package_Gather> mesPackageGatherRep
@@ -39,6 +41,7 @@
        , SqlSugarRepository<Mes_Package_LineQueue> mesPackage_LineQueueRep
        , SqlSugarRepository<WmsRecordUpiReplenish> wmsRecordUpiReplenishRep
        , SqlSugarRepository<WmsRecordUpiProcess> wmsRecordUpiProcessRep
        , SqlSugarRepository<V_Station_Quan> V_Station_Quan_Rep
        )
    {
        _wmsRecordUpiReplenishRep = wmsRecordUpiReplenishRep;
@@ -51,6 +54,7 @@
        _mesPackage_UnLine_RecordRep = mesPackage_UnLine_RecordRep;
        _mesPackage_LineQueueRep = mesPackage_LineQueueRep;
        _wmsRecordUpiProcessRep = wmsRecordUpiProcessRep;
        _V_Station_Quan = V_Station_Quan_Rep;
    }

    /// <summary>
@@ -765,24 +769,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; // 结果
    }
@@ -808,10 +834,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();


@@ -828,12 +852,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")
@@ -848,9 +870,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++)
@@ -866,12 +886,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")
@@ -886,9 +904,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++)
@@ -903,12 +919,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")
@@ -937,5 +951,33 @@
        return startDate.AddDays(6); // 因为起始日期已经是周一，所以直接加6天即可得到周日
    }




    /// <summary>
    /// 不分页查询库位信息
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "ListView")]
    [Description("WmsCommonnQuery/ListView")]
    public async Task<List<LocationViewOutput>> ListView([FromQuery] WmsBasePlaceInput input)
    {
        var query = await _V_Station_Quan.AsQueryable()
        .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
        u.PlaceCode.Contains(input.SearchKey.Trim())
        //  || u.WareContainerCode.Contains(input.SearchKey.Trim())
        //|| u.Lane==input.Lane
        //|| u.Row==input.Row  
        )
        .OrderBy(u => u.LaneNo)
        //.OrderBy(u => u.Row)
        .OrderBy(u => u.LayerNo)
        .OrderBy(u => u.ColumnNo)
        .Select<LocationViewOutput>().ToListAsync();
        return query;
    }

}