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

zongzhibin

2024-11-30 aa00074986140e57be1f56272311e84abd8566ac

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs

@@ -129,6 +129,7 @@
                u.Info5.Contains(input.SearchKey.Trim())
                || u.PlanNo.Contains(input.SearchKey.Trim())
                || u.OrderId.Contains(input.SearchKey.Trim())
                || u.UnlinePerson.Contains(input.SearchKey.Trim())
                || u.CreateUserName.Contains(input.SearchKey.Trim())
                || u.UpdateUserName.Contains(input.SearchKey.Trim())
            )
@@ -137,10 +138,21 @@
            .WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim()))
            .WhereIF(input.IsKitting.HasValue, u => u.IsKitting == input.IsKitting)
            .WhereIF(input.IsUnline.HasValue, u => u.IsUnline == input.IsUnline)
            .WhereIF(!string.IsNullOrWhiteSpace(input.UnlinePerson), u => u.UnlinePerson.Contains(input.UnlinePerson.Trim()))
            .WhereIF(input.PackageNum>0, u => u.PackageNum == input.PackageNum)
            .WhereIF(input.UnLinePackageNum>0, u => u.UnLinePackageNum == input.UnLinePackageNum)
            .WhereIF(input.NoUnLinePackageNum>0, u => u.NoUnLinePackageNum == input.NoUnLinePackageNum)
            .Select<Mes_Order_GatherOutput>();
        if(input.UnlineTimeRange != null && input.UnlineTimeRange.Count >0)
        {
            DateTime? start= input.UnlineTimeRange[0].Value.AddDays(-1);
            query = query.WhereIF(start.HasValue, u => u.UnlineTime > start);
            if (input.UnlineTimeRange.Count >1 && input.UnlineTimeRange[1].HasValue)
            {
                var end = input.UnlineTimeRange[1].Value.AddDays(1);
                query = query.Where(u => u.UnlineTime < end);
            }
        } 
        return query;
       }