222

schangxiang@126.com

2024-12-12 9f61c92fe6864d536a0e3a6e041cbd788dcec752

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

@@ -9,6 +9,7 @@
using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
using Admin.NET.Application.Service.WmsCommonnQuery.Dto;
using System.Collections.Generic;
using Admin.NET.Application.CommonHelper;

namespace Admin.NET.Application;
/// <summary>
@@ -26,6 +27,8 @@
    private readonly SqlSugarRepository<Mes_Order_Gather> _mesOrderGatherRep;
    private readonly SqlSugarRepository<Mes_Package_UnLine_Record> _mesPackage_UnLine_RecordRep;
    private readonly SqlSugarRepository<Mes_Package_LineQueue> _mesPackage_LineQueueRep;
    private readonly SqlSugarRepository<WmsRecordUpiReplenish> _wmsRecordUpiReplenishRep;
    private readonly SqlSugarRepository<WmsRecordUpiProcess> _wmsRecordUpiProcessRep;

    public WmsCommonnQueryService(SqlSugarRepository<WmsRbLineTask> wmsRbLineTaskRep, SqlSugarRepository<WmsStockQuan> wmsStockQuanRep
        , SqlSugarRepository<Mes_Package_Gather> mesPackageGatherRep
@@ -34,8 +37,11 @@
        , SqlSugarRepository<Mes_Order_Gather> mesOrderGatherRep
        , SqlSugarRepository<Mes_Package_UnLine_Record> mesPackage_UnLine_RecordRep
        , SqlSugarRepository<Mes_Package_LineQueue> mesPackage_LineQueueRep
        , SqlSugarRepository<WmsRecordUpiReplenish> wmsRecordUpiReplenishRep
        , SqlSugarRepository<WmsRecordUpiProcess> wmsRecordUpiProcessRep
        )
    {
        _wmsRecordUpiReplenishRep = wmsRecordUpiReplenishRep;
        _sysConfigRep = sysConfigRep;
        _mesPackageGatherRep = mesPackageGatherRep;
        _wmsRbLineTaskRep = wmsRbLineTaskRep;
@@ -44,6 +50,7 @@
        _mesOrderGatherRep = mesOrderGatherRep;
        _mesPackage_UnLine_RecordRep = mesPackage_UnLine_RecordRep;
        _mesPackage_LineQueueRep = mesPackage_LineQueueRep;
        _wmsRecordUpiProcessRep = wmsRecordUpiProcessRep;
    }

    /// <summary>
@@ -310,7 +317,7 @@


    /// <summary>
    /// 不分页查询批次缺料清单 不齐包
    /// 人工补板动作
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
@@ -325,6 +332,45 @@
        {
            resJson = listRes.FirstOrDefault(u => u.UPI == input.UPI);
            //var filteredResult = listRes.FirstOrDefault(u => u.UPI == input.UPI);
        }
        var _cretaorName = App.User.FindFirst(ClaimConst.RealName)?.Value;
        if (resJson != null)
        {
            //执行人工补板动作
            var client = await WCFServiceHelper.GetWCFService_SAPCC_Client(_sysConfigRep);
            var res = await client.WriteStation_AllowInAsync();
            if (res.result == false)
            {
                throw Oops.Oh("补板工位允许进板请求失败:" + res.resMsg);
            }
            //*/

            //记录补板记录和板件履历
            var singleUpi = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.UPI == input.UPI).FirstAsync();
            if (singleUpi == null)
            {
                throw Oops.Oh($"没有找到部件条码{input.UPI}的数据");
            }
            WmsRecordUpiProcess wmsRecordUpi = new WmsRecordUpiProcess();
            wmsRecordUpi = singleUpi.Adapt<WmsRecordUpiProcess>();
            wmsRecordUpi.Id = Yitter.IdGenerator.YitIdHelper.NextId();
            wmsRecordUpi.CreateTime = DateTime.Now;
            wmsRecordUpi.CreateUserName = _cretaorName;
            wmsRecordUpi.Location = "";
            wmsRecordUpi.OperRemark = "人工补板";
            await _wmsRecordUpiProcessRep.InsertAsync(wmsRecordUpi);

            WmsRecordUpiReplenish wmsRecordUpiNg = new WmsRecordUpiReplenish();
            wmsRecordUpiNg = singleUpi.Adapt<WmsRecordUpiReplenish>();
            wmsRecordUpiNg.Id = Yitter.IdGenerator.YitIdHelper.NextId();
            wmsRecordUpiNg.CreateTime = DateTime.Now;
            wmsRecordUpiNg.CreateUserName = _cretaorName;
            wmsRecordUpiNg.OperRemark = "人工补板";
            await _wmsRecordUpiReplenishRep.InsertAsync(wmsRecordUpiNg);
        }
        else
        {
            throw Oops.Oh($"板件'{input.UPI}'不在缺包清单中");
        }

        return resJson;
@@ -341,6 +387,11 @@
    public async Task<SqlSugarPagedList<WmsShortageListOutput>> ShortagePage(KittingListInput input)
    {
        var listRes = await GetShortageListCore(input);
        if (listRes?.Count > 0)
        {
            listRes = listRes.WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5 == input.Info5).ToList();
            listRes = listRes.WhereIF(!string.IsNullOrWhiteSpace(input.DetailName), u => u.DetailName == input.DetailName).ToList();
        }
        // 进行分页处理
        var totalCount = listRes.Count; // 获取总数
        var pagedList = listRes
@@ -570,5 +621,303 @@
        return groupedResult; // 返回分组结果
    }


    /// <summary>
    /// 查询包数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "QueryPackage")]
    [Description("WmsCommonnQuery/QueryPackage")]
    public async Task<Mes_Package_Gather> QueryPackage(QueryPackageInput input)
    {
        if (input == null || input.PackageCode == null)
        {
            throw Oops.Oh("参数不能为空");
        }

        var package = await _mesPackageGatherRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync();
        if (package == null)
        {
            throw Oops.Oh($"没有找到包号{input.PackageCode}的汇总数据");
        }
        return package;
    }


    /// <summary>
    /// 根据包号，查询某个包下的板件数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "QueryUpiListByPackage")]
    [Description("WmsCommonnQuery/QueryUpiListByPackage")]
    public async Task<List<Mes_BatchOrderUPI_New>> QueryUpiListByPackage(QueryPackageInput input)
    {
        if (input == null || input.PackageCode == null)
        {
            throw Oops.Oh("参数不能为空");
        }

        var package = await _mesPackageGatherRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync();
        if (package == null)
        {
            throw Oops.Oh($"没有找到包号{input.PackageCode}的汇总数据");
        }

        var upiList = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).ToListAsync();

        return upiList;
    }

    /// <summary>
    /// 根据某个Upi，查询某个包下的板件数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "QueryUpiListByUpi")]
    [Description("WmsCommonnQuery/QueryUpiListByUpi")]
    public async Task<List<Mes_BatchOrderUPI_New>> QueryUpiListByUpi(QueryUpiListByUpiInput input)
    {
        if (input == null || input.Upi == null)
        {
            throw Oops.Oh("参数不能为空");
        }

        var singleUpi = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.UPI == input.Upi || x.PackageCode == input.Upi).FirstAsync();
        if (singleUpi == null)
        {
            throw Oops.Oh($"没有找到部件条码{input.Upi}的数据");
        }

        var package = await _mesPackageGatherRep.AsQueryable().Where(x => x.PackageCode == singleUpi.PackageCode).FirstAsync();
        if (package == null)
        {
            throw Oops.Oh($"没有找到包号{singleUpi.PackageCode}的汇总数据");
        }

        var upiList = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.PackageCode == singleUpi.PackageCode).ToListAsync();
        upiList = upiList.OrderBy(x => x.Shelf).ToList();

        return upiList;
    }


    /// <summary>
    /// 根据某个Upi，查询板件数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "QuerySingleUpiByUpi")]
    [Description("WmsCommonnQuery/QuerySingleUpiByUpi")]
    public async Task<List<Mes_BatchOrderUPI_New>> QuerySingleUpiByUpi(QueryUpiListByUpiInput input)
    {
        if (input == null || input.Upi == null)
        {
            throw Oops.Oh("参数不能为空");
        }

        var singleUpi = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.UPI == input.Upi).FirstAsync();
        if (singleUpi == null)
        {
            throw Oops.Oh($"没有找到部件条码{input.Upi}的数据");
        }

        List<Mes_BatchOrderUPI_New> upiList = new List<Mes_BatchOrderUPI_New>();
        upiList.Add(singleUpi);
        return upiList;
    }



    /// <summary>
    /// 首页 本周下线物料信息
    /// </summary>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "HomeOffOrderList")]
    [Description("WmsCommonnQuery/HomeOffOrderList")]
    public async Task<List<Home_Order_Info>> HomeOffOrderList()
    {
        List<Home_Order_Info> resultList = new List<Home_Order_Info>();
        // 获取当前时间
        DateTime currentDate = DateTime.Now;
        // 计算一周之前的时间
        DateTime oneWeekAgo = currentDate.AddDays(-7);
        // 查询最近一周的下线订单数
        var orderCount = await _mesOrderGatherRep.AsQueryable().Where(x => x.UnlineTime >= oneWeekAgo && x.UnlineTime <= currentDate).CountAsync();
        resultList.Add(new Home_Order_Info
        {
            Name = "本周下线订单数",
            Value = orderCount // 将查询到的数量赋值
        });
        resultList.Add(new Home_Order_Info
        {
            Name = "下线包数",
            Value = 8
            // Value = await _mesPackage_UnLine_RecordRep  查询最近一周的下线订单数
        });
        resultList.Add(new Home_Order_Info
        {
            Name = "下线板数",
            Value = 3 // 这里示例值为3，可以根据实际逻辑调整
        });
        return resultList; // 结果
    }



    /// <summary>
    /// 上下架推移图
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "HomeTytPage")]
    [Description("WmsCommonnQuery/HomeTytPage")]
    public async Task<List<WmsStockPassMapOutput>> HomeTytPage([FromQuery] WmsStockPassMapInput input)
    {
        List<WmsStockPassMapOutput> outputlist = new List<WmsStockPassMapOutput>();
        DateTime currentDate = DateTime.Today;

        //选择为12日的情况
        if (input.DayOrWeekOrMonth == 1)
        {
            //总的数据
            DateTime all_startDate = currentDate.AddDays(-11);
            DateTime all_endDate = currentDate.Date.AddDays(1).AddTicks(-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.下架单)
               ).ToListAsync();


            for (int i = 0; i < 12; i++)
            {
                DateTime startDate = currentDate.AddDays(-i);
                DateTime endDate = startDate.Date.AddDays(1).AddTicks(-1);

                // 查询在这一天内的记录
                var recordsOfDay = all_recordsOfDay.Where(r => r.CreateTime >= startDate && r.CreateTime <= endDate
                ).ToList();


                var summary = new WmsStockPassMapOutput
                {
                    Time = 12 - i,
                    InWare = recordsOfDay
                    // .Where(x => x.OrderType == OrderTypeEnum.上架单)
                    .ToList().Count(),
                    OutWare = recordsOfDay
                    //  .Where(x => x.OrderType == OrderTypeEnum.下架单)
                    .ToList().Count(),
                    StockNum = 0,
                    AveStockNum = 0,
                    Date = startDate.Date.ToString("yyyy-MM-dd")
                };

                outputlist.Add(summary);
            }
        }
        //选择12周
        else if (input.DayOrWeekOrMonth == 2)
        {
            //总的数据
            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.下架单)
               ).ToListAsync();

            for (int i = 0; i < 12; i++)
            {
                // 计算当前周的起始日期
                DateTime startDate = GetStartOfWeek(currentDate).AddDays(-7 * i);
                DateTime endDate = GetEndOfWeek(startDate);

                // 查询在这一周内的出入库记录
                var recordsOfWeek = all_recordsOfDay.Where(r => r.CreateTime >= startDate && r.CreateTime <= endDate).ToList();

                // 汇总出入库记录
                var summary = new WmsStockPassMapOutput
                {
                    Time = 12 - i,
                    InWare = recordsOfWeek
                    // .Where(x => x.OrderType == OrderTypeEnum.上架单) .Sum(x => x.Quantity),
                    .ToList().Count(),
                    OutWare = recordsOfWeek
                      //  .Where(x => x.OrderType == OrderTypeEnum.下架单)
                      .ToList().Count(),
                    StockNum = 0,
                    AveStockNum = 0,
                    Date = startDate.Date.ToString("MMdd") + "～" + endDate.Date.ToString("MMdd")
                };

                outputlist.Add(summary);
            }
        }
        //选择12个月
        else if (input.DayOrWeekOrMonth == 3)
        {
            //总的数据
            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.下架单)
               ).ToListAsync();

            for (int i = 0; i < 12; i++)
            {
                DateTime startDate = currentDate.AddMonths(-i).AddDays(1 - currentDate.Day);
                DateTime endDate = startDate.AddMonths(1).AddDays(-1);

                // 查询在这个月内的出入库记录
                var recordsOfMonth = all_recordsOfDay.Where(r => r.CreateTime >= startDate && r.CreateTime <= endDate).ToList();

                // 汇总出入库记录
                var summary = new WmsStockPassMapOutput
                {
                    Time = 12 - i,
                    InWare = recordsOfMonth
                    //.Where(x => x.OrderType == OrderTypeEnum.上架单)
                     .ToList().Count(),
                    OutWare = recordsOfMonth
                     // .Where(x => x.OrderType == OrderTypeEnum.下架单)
                     .ToList().Count(),
                    StockNum = 0,
                    AveStockNum = 0,
                    Date = startDate.ToString("yyyy-MM")
                };

                outputlist.Add(summary);
            }
        }

        //排序
        outputlist = outputlist.OrderBy(x => x.Time).ToList();

        return outputlist;
    }
    // 获取当前日期所在周的起始日期（周一）
    private DateTime GetStartOfWeek(DateTime currentDate)
    {
        int diff = currentDate.DayOfWeek - DayOfWeek.Monday;
        if (diff < 0) diff += 7; // 处理周日的情况
        return currentDate.AddDays(-1 * diff).Date;
    }

    // 获取当前日期所在周的结束日期（周日）
    private DateTime GetEndOfWeek(DateTime startDate)
    {
        return startDate.AddDays(6); // 因为起始日期已经是周一，所以直接加6天即可得到周日
    }

}