22

schangxiang@126.com

2024-12-15 c1c1b1f95b0880cd58afadb98d6933287fe6311c

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

@@ -144,18 +144,36 @@
    [Description("WmsCommonnQuery/QueryCurrentOrder")]
    public async Task<Mes_Order_Gather> QueryCurrentOrder()
    {
        //获取上班时间。
        var sysConfig_wms_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.WmsBZ30_QiTao);
        if (sysConfig_wms_wms_unline_oper == null || sysConfig_wms_wms_unline_oper.Value == "无")
        ////获取上班时间。
        //var sysConfig_wms_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.WmsBZ30_QiTao);
        //if (sysConfig_wms_wms_unline_oper == null || sysConfig_wms_wms_unline_oper.Value == "无")
        //{
        //    return null;
        //}
        //var arr = sysConfig_wms_wms_unline_oper.Value.Split('|');
        //var packagecode = arr[0];
        //var packObj = await _mesPackageGatherRep.AsQueryable().FirstAsync(x => x.PackageCode == packagecode);
        //if (packObj == null)
        //{
        //    throw Oops.Oh($"没有找到包{packagecode}的汇总数据");
        //}

        //var list = await _mesOrderGatherRep.AsQueryable()
        //    .Where(x => x.Info5 == packObj.Info5)
        //    .FirstAsync(); // 确保获取结果为 List

        //return list; // 结果

        var packageQueue = await _mesPackage_LineQueueRep.AsQueryable().Where(x => 1 == 1).ToListAsync();
        var single_packageQueue = packageQueue.OrderBy(x => x.Id).FirstOrDefault();
        if (single_packageQueue == null)
        {
            return null;
        }
        var arr = sysConfig_wms_wms_unline_oper.Value.Split('|');
        var packagecode = arr[0];
        var packObj = await _mesPackageGatherRep.AsQueryable().FirstAsync(x => x.PackageCode == packagecode);
        var packObj = await _mesPackageGatherRep.AsQueryable().FirstAsync(x => x.PackageCode == single_packageQueue.PackageCode);
        if (packObj == null)
        {
            throw Oops.Oh($"没有找到包{packagecode}的汇总数据");
            throw Oops.Oh($"没有找到包{single_packageQueue.PackageCode}的汇总数据");
        }

        var list = await _mesOrderGatherRep.AsQueryable()