1

啊鑫

2024-11-19 2697966bbe8ad54491553f407c42eaaedfc20afb

 service/Warehouse/MesInvItemInCDetailsManager.cs

@@ -758,21 +758,19 @@
        WarehouseQuery query)
    {
        var parsedGuid = Guid.Empty;
        if (string.IsNullOrEmpty(query.id))
        if (!string.IsNullOrEmpty(query.id))
        {
            return ([], 0);
            bool isValid = Guid.TryParse(query.id, out parsedGuid);
            if (!isValid)
                throw new ApplicationException("GUID转换错误");
        }

        bool isValid = Guid.TryParse(query.id, out parsedGuid);
        if (!isValid)
            throw new ApplicationException("GUID转换错误");

        var totalCount = 0;
        var result = Db.Queryable<MesInvItemIns, MesDepots, MesSupplier>(
                (a, b, c) =>
                    new JoinQueryInfos(JoinType.Left,
                        a.DepotsCode == b.DepotCode,
                        JoinType.Left, a.SuppNo == c.SuppNo))
                        a.DepotsId == b.DepotId,
                        JoinType.Left, a.SuppId == c.Id.ToString()))
            .WhereIF(UtilityHelper.CheckGuid(parsedGuid),
                (a, b, c) => a.Guid == parsedGuid)
            .Select((a, b, c) => new MesInvItemIns
@@ -845,7 +843,7 @@
                (g, c, d) => new JoinQueryInfos(
                    JoinType.Left,
                    g.ItemId == c.Id, JoinType.Inner,
                    d.Id == Convert.ToDecimal(c.ItemUnit)
                    d.Id.ToString() ==  c.Fpurchaseunitid 
                )
            ).WhereIF(UtilityHelper.CheckGuid(parsedGuid),
                (g, c, d) => g.ItemInId == parsedGuid)
@@ -963,7 +961,7 @@
            (g, c, d, a) => new JoinQueryInfos(
                JoinType.Left,
                g.ItemId == c.Id , JoinType.Inner,
                d.Id == Convert.ToDecimal(c.ItemUnit),
                d.Id.ToString() == c.Fpurchaseunitid,
                JoinType.Inner, a.Ebeln == g.WorkNo && g.CbillNo == a.CbillNo
            )
        ).Where((g, c, d, a) => g.BillNo == billNo).Select<Material>(
@@ -989,9 +987,9 @@
            FRealQty = d.FRealQty,
            FStockId = d.FStockId,
            FLot = d.FLot,
            FUnitID = d.FUnitID,
            FsrcEntryId = d.FsrcEntryId,
            FMesEntryid = d.FMesEntryid
            FUintId = d.FUnitID,
            FSRCENTRYID = d.FsrcEntryId,
            F_MES_ENTRYID = d.FMesEntryid
        }).ToList();

        var fdate = DateTime.Now.ToString("yyyy-MM-dd");