Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

liuying

2024-12-01 8bfe5dcf83cdcaa90c45ad86a8b464238748de7c

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs

@@ -5,6 +5,8 @@
using System.Web;
using System.Text;
using System;
using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;

namespace Admin.NET.Application;
/// <summary>
/// 库存信息服务
@@ -14,12 +16,15 @@
{
    private readonly SqlSugarRepository<WmsStockQuan> _rep;
    private readonly SqlSugarRepository<Mes_BatchOrderUPI_New> _Mes_BatchOrderUPI_New_Rep;
    private readonly SqlSugarRepository<V_Station_Quan> _V_Station_Quan_Rep;

    public WmsStockQuanService(SqlSugarRepository<WmsStockQuan> rep,
        SqlSugarRepository<Mes_BatchOrderUPI_New> Mes_BatchOrderUPI_New_Rep)
        SqlSugarRepository<Mes_BatchOrderUPI_New> Mes_BatchOrderUPI_New_Rep,
        SqlSugarRepository<V_Station_Quan> v_Station_Quan_Rep)
    {
        _rep = rep;
        _Mes_BatchOrderUPI_New_Rep = Mes_BatchOrderUPI_New_Rep;
        _V_Station_Quan_Rep = v_Station_Quan_Rep;
    }

    /// <summary>
@@ -223,55 +228,59 @@
                throw Oops.Oh($"导入数据不能为空");
            }
            //根据组合校验验证表格中中是否已存在相同数据  
                      






          
           //根据单独校验验证表格中中是否已存在相同数据  
           
           
           
        }
    #endregion


    /// <summary>
    /// 不分页查询齐包管理
    /// 不分页查询缓存岛齐包管理
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "packList")]
    [Description("WmsStockQuan/packList")]
    public async Task<List<WmsPackListOutput>> packList([FromQuery] PackListInput input)
    public async Task<List<WmsPackListOutput>> PackList([FromQuery] PackListInput input)
    {
        // 查询并转换为 WmsKittingListOutput 对象的列表
        // 获取符合条件的记录，并提取所需信息
        var list = await _rep.AsQueryable()
            .WhereIF(!string.IsNullOrWhiteSpace(input.DetailName), u => u.PlaceCode.Contains(input.DetailName.Trim()))
            .Select(x => new WmsPackListOutput
            .WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
            .Select(x => new { x.PackageCode })
            .ToListAsync();

        // 创建一个列表以存储 WmsPackListOutput
        var resultList = new List<WmsPackListOutput>();

        // 分组并计算每组信息
        var groupedResult = list.GroupBy(x => x.PackageCode);

        foreach (var g in groupedResult)
        {
            // 在这里计算每组的总数
            var count = g.Count();
            var mesTotalCount = await _Mes_BatchOrderUPI_New_Rep.AsQueryable().CountAsync(m => m.PackageCode == g.Key);

            resultList.Add(new WmsPackListOutput
            {
                PackageCode = x.PackageCode,
                // 映射其他字段
            })
            .ToListAsync(); // 确保获取结果为 List
        // 分组并返回分组信息
        var groupedResult = list
            .GroupBy(x => x.PackageCode) // 按 PackageCode 分组
            .Select(g => new WmsPackListOutput
            {
                PackageCode = g.Key, // 获取分组的键
                Count = g.Count(), // 统计每组的数量
                IsPack = g.Count() == 5 ? true : false // 如果 Count 为 5 则 IsKitting 为 1，否则为 0  
            })
                PackageCode = g.Key,
                Count = count,
                MesTotalCount = mesTotalCount,
                IsPack = count >= mesTotalCount, // 检查是否打包
                LackCount = mesTotalCount - count
            });
        }

        // 过滤、排序并返回最终结果
        var finalResult = resultList
            .WhereIF(input.IsPack.HasValue, u => u.IsPack == input.IsPack)
            .OrderBy(g => g.PackageCode) // 根据 PackageCode 排序
            .ToList(); // 转换为 List
        return groupedResult; // 返回分组结果
            .OrderBy(g => g.PackageCode)
            .ToList();

        return finalResult;
    }



    /// <summary>
@@ -291,6 +300,7 @@
                OrderId = x.OrderId
            })
            .ToListAsync(); // 确保获取结果为 List

        // 分组并返回分组信息
        var groupedResult = list
            .GroupBy(x => x.OrderId) // 按 PackageCode 分组
@@ -298,7 +308,7 @@
            {
                OrderId = g.Key, // 获取分组的键
                Count = g.Count(), // 统计每组的数量
                IsKitting = g.Count() == 5 ? true : false // 如果 Count 为 5 则 IsKitting 为 1，否则为 0  
                IsKitting = 1 == 1? true : false // 如果 Count 为 5 则 IsKitting 为 1，否则为 0  
            })
            .WhereIF(input.IsKitting.HasValue, u => u.IsKitting == input.IsKitting)
            .OrderBy(g => g.OrderId) // 根据 PackageCode 排序
@@ -309,53 +319,28 @@



   

    /// <summary>
    /// 不分页查询批次缺料清单 不齐包
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpGet]
    ///  [HttpGet]
    [ApiDescriptionSettings(Name = "ShortageList")]
    [Description("WmsStockQuan/ShortageList")]
    public async Task<List<WmsShortageListOutput>> ShortageList([FromQuery] KittingListInput input)
    public async Task<WmsShortageListOutput> ShortageList(KittingListInput input)
    {
        var list = await _rep.AsQueryable()
            .WhereIF(!string.IsNullOrWhiteSpace(input.DetailName), u => u.PlaceCode.Contains(input.DetailName.Trim()))
            .Select(x => new WmsShortageListOutput
            {
                OrderId = x.OrderId,
                PlanNo = x.PlanNo,
                PackageCode = x.PackageCode
            })
            .ToListAsync(); // 确保获取结果为 List

        // 分组并返回分组信息
        var groupedResult = list
            .GroupBy(x => x.OrderId) // 按 OrderId 分组
            .Select(g => new WmsShortageListOutput
            {
                OrderId = g.Key, // 获取分组的键
                PlanNo = g.FirstOrDefault().PlanNo, // 获取组内的第一个 PlanNo
                PackageCode = g.FirstOrDefault().PackageCode, // 获取组内的第一个 PackageCode
                HasCount = g.Count(), // 统计每组的数量
                TotalCount = 0, // 初始化 TotalCount
                ShortageCount = 0 // 初始化 ShortageCount
            })
            .OrderBy(g => g.OrderId) // 根据 OrderId 排序
            .ToList(); // 转换为 List

        // 循环 groupedResult 给每一条加上总数量 CountTotal
        foreach (var item in groupedResult)
        var listRes = await GetShortageListCore(input);
        var resJson = new WmsShortageListOutput();
        if (!string.IsNullOrWhiteSpace(input.UPI))
        {
            item.TotalCount = await _Mes_BatchOrderUPI_New_Rep.AsQueryable().CountAsync(m => m.PackageCode == item.PackageCode); // 根据 PackageCode 统计总条数
            item.ShortageCount = item.TotalCount - item.HasCount > 0 ? item.TotalCount - item.HasCount : 0;
            resJson = listRes.FirstOrDefault(u => u.UPI == input.UPI);
            //var filteredResult = listRes.FirstOrDefault(u => u.UPI == input.UPI);
        }

        return groupedResult; // 返回分组结果
        return resJson;
    }




    /// <summary>
    /// 分页查询批次缺料清单 不齐包 
@@ -366,6 +351,133 @@
    [ApiDescriptionSettings(Name = "ShortagePage")]
    [Description("WmsStockQuan/ShortagePage")]
    public async Task<SqlSugarPagedList<WmsShortageListOutput>> ShortagePage(KittingListInput input)
    {
        var listRes = await GetShortageListCore(input);
        // 进行分页处理
        var totalCount = listRes.Count; // 获取总数
        var pagedList = listRes
            //.OrderBy(x => x.Id) // 根据需要进行排序
            .Skip((input.Page - 1) * input.PageSize)
            .Take(input.PageSize)
            .ToList();

        // 构造并返回分页结果
        return new SqlSugarPagedList<WmsShortageListOutput>
        {
            Page = input.Page,
            PageSize = input.PageSize,
            Total = totalCount,
            TotalPages = (int)Math.Ceiling((double)totalCount / input.PageSize),
            Items = pagedList,
            HasPrevPage = input.Page > 1,
            HasNextPage = input.Page < ((int)Math.Ceiling((double)totalCount / input.PageSize))
        };
    }


    /// <summary>
    /// 分页查询缺料清单 不齐包 -按照生产单号分组 
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "ShortagePageGroupByInfo5")]
    [Description("WmsStockQuan/ShortagePageGroupByInfo5")]
    public async Task<SqlSugarPagedList<WmsShortageListOutput>> ShortagePageGroupByInfo5(KittingListInput input)
    {
        var listRes = await GetShortageListCore(input);

        // 按照字段 Info5 分组
        var groupedList = listRes
            .GroupBy(x => x.Info5) // 根据 Info5 字段进行分组
            .Select(g => new WmsShortageListOutput // 假设您将分组后的结果转换为 WmsShortageListOutput
            {
                Info5 = g.Key,
                ShortageCount = g.Count(),
            })
            .ToList();

        // 进行分页处理
        var totalCount = groupedList.Count; // 获取总数
        var pagedList = groupedList
            //.OrderBy(x => x.Id) // 根据需要进行排序
            .Skip((input.Page - 1) * input.PageSize)
            .Take(input.PageSize)
            .ToList();

        // 构造并返回分页结果
        return new SqlSugarPagedList<WmsShortageListOutput>
        {
            Page = input.Page,
            PageSize = input.PageSize,
            Total = totalCount,
            TotalPages = (int)Math.Ceiling((double)totalCount / input.PageSize),
            Items = pagedList,
            HasPrevPage = input.Page > 1,
            HasNextPage = input.Page < ((int)Math.Ceiling((double)totalCount / input.PageSize))
        };
    }



    /// <summary>
    /// 缺包数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    private async Task<List<WmsShortageListOutput>> GetShortageListCore(KittingListInput input)
    {
        var listRes = new List<WmsShortageListOutput>();
        // 缓存岛数据
        var queryHcdList = _rep.AsQueryable().WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode == input.PackageCode);
       
        var listDao = await queryHcdList.ToListAsync();
        var packageCodes = listDao.Select(x => x.PackageCode).ToList();
        // 获取 mes 所有相关记录
        var allRecords = await _Mes_BatchOrderUPI_New_Rep.AsQueryable()
            .Where(m => packageCodes.Contains(m.PackageCode))
            .ToListAsync();
        // 遍历记录，对比 listDao
        var listDaoUbi = listDao.Select(u => u.Upi).ToHashSet(); // 将 UPI 转换为 HashSet，提高查找效率
        foreach (var item in allRecords)
        {
            if (!listDaoUbi.Contains(item.UPI)) // 使用 HashSet 进行查找
            {
                listRes.Add(new WmsShortageListOutput
                {
                    UPI = item.UPI,
                    PackageCode = item.PackageCode,
                    DetailName = item.DetailName,
                    OrderId = item.OrderId,
                    PlanNo = item.PlanNo,
                    Info5 = item.Info5,
                    Info4 = item.Info4,
                    Info10 = item.Info10,
                    Info11 = item.Info11,
                    Info12= item.Info12,
                    Info13 = item.Info13,
                    //Info14 = item.Info14,
                    Info15 = item.Info15,
                    Info16 = item.Info16,
                    Length = item.Length,
                    Width = item.Width,
                    Thk = item.Thk
                });
            }
        }

        return listRes;
    }

    /// <summary>
    /// 分页查询批次缺料清单 不齐包 -暂时不用
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "ShortagePage2")]
    [Description("WmsStockQuan/ShortagePage2")]
    public async Task<SqlSugarPagedList<WmsShortageListOutput>> ShortagePage2(KittingListInput input)
    {
        // 获取基础数据
        var list = await _rep.AsQueryable()
@@ -424,6 +536,50 @@
    }


    /// <summary>
    /// 不分页查询批次缺料清单 不齐包-暂时不用
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "ShortageList2")]
    [Description("WmsStockQuan/ShortageList2")]
    public async Task<List<WmsShortageListOutput>> ShortageList2([FromQuery] KittingListInput input)
    {
        var list = await _rep.AsQueryable()
            .WhereIF(!string.IsNullOrWhiteSpace(input.DetailName), u => u.PlaceCode.Contains(input.DetailName.Trim()))
            .Select(x => new WmsShortageListOutput
            {
                OrderId = x.OrderId,
                PlanNo = x.PlanNo,
                PackageCode = x.PackageCode
            })
            .ToListAsync(); // 确保获取结果为 List

        // 分组并返回分组信息
        var groupedResult = list
            .GroupBy(x => x.OrderId) // 按 OrderId 分组
            .Select(g => new WmsShortageListOutput
            {
                OrderId = g.Key, // 获取分组的键
                PlanNo = g.FirstOrDefault().PlanNo, // 获取组内的第一个 PlanNo
                PackageCode = g.FirstOrDefault().PackageCode, // 获取组内的第一个 PackageCode
                HasCount = g.Count(), // 统计每组的数量
                TotalCount = 0, // 初始化 TotalCount
                ShortageCount = 0 // 初始化 ShortageCount
            })
            .OrderBy(g => g.OrderId) // 根据 OrderId 排序
            .ToList(); // 转换为 List

        // 循环 groupedResult 给每一条加上总数量 CountTotal
        foreach (var item in groupedResult)
        {
            item.TotalCount = await _Mes_BatchOrderUPI_New_Rep.AsQueryable().CountAsync(m => m.PackageCode == item.PackageCode); // 根据 PackageCode 统计总条数
            item.ShortageCount = item.TotalCount - item.HasCount > 0 ? item.TotalCount - item.HasCount : 0;
        }

        return groupedResult; // 返回分组结果
    }

}