包中只有一块板时，认定为 不齐包 【Editby shaocx,2025-04-01】

schangxiang@126.com

2025-04-17 d34ea2a9fc2334d2bf7383cb64562f301ffbda84

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

@@ -71,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

@@ -264,28 +264,40 @@
        // 获取符合条件的记录，并提取所需信息
        var list = await _wmsStockQuanRep.AsQueryable()
            .WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
            .Select(x => new { x.PackageCode })
            .WhereIF(!string.IsNullOrWhiteSpace(input.PlanNo), u => u.PlanNo.Contains(input.PlanNo.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim()))
            .Select(x => new { x.PackageCode, x.PlanNo, x.OrderId })
            .ToListAsync();

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

        // 分组并计算每组信息
        var groupedResult = list.GroupBy(x => x.PackageCode);
        var groupedResult = list.GroupBy(x => new { x.PackageCode, x.PlanNo, x.OrderId });

        foreach (var g in groupedResult)
        {
            // 在这里计算每组的总数
            var count = g.Count();
            var mesTotalCount = await _mesBatchOrderUpiRep.AsQueryable().CountAsync(m => m.PackageCode == g.Key);
            var mesTotalCount = await _mesBatchOrderUpiRep.AsQueryable().CountAsync(m => m.PackageCode == g.Key.PackageCode);
            var isPack = count >= mesTotalCount; // 检查是否打包
            var desc = "";
            if (mesTotalCount == 1)
            { //包中只有一块板时，认定为 不齐包 【Editby shaocx,2025-04-01】
                isPack = false;
                desc = "包中只有一块板";
            }

            resultList.Add(new WmsPackListOutput
            {
                PackageCode = g.Key,
                PackageCode = g.Key.PackageCode,
                PlanNo = g.Key.PlanNo,
                OrderId = g.Key.OrderId,
                Count = count,
                MesTotalCount = mesTotalCount,
                IsPack = count >= mesTotalCount, // 检查是否打包
                LackCount = mesTotalCount - count
                IsPack = isPack,
                LackCount = mesTotalCount - count,
                PackageDesc = desc
            });
        }

@@ -504,6 +516,7 @@
        {
            if (!listDaoUbi.Contains(item.UPI)) // 使用 HashSet 进行查找
            {
                var pc = await _mesPackageGatherRep.GetFirstAsync(x => x.PackageCode == item.PackageCode);
                listRes.Add(new WmsShortageListOutput
                {
                    UPI = item.UPI,
@@ -513,10 +526,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,
@@ -770,7 +783,7 @@
        DateTime currentDate = DateTime.Now;
        // 计算一周之前的时间
        //DateTime oneWeekAgo = currentDate.AddDays(-7);
        

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

@@ -797,7 +810,7 @@

        resultList.Add(new Home_Order_Info
        {
            Name = "本周下线订单数",
            Name = "本周生产订单数",
            Value = orderCount
        });
        resultList.Add(new Home_Order_Info