合并上格最新代码

展杰

2024-08-16 3dfa3d93337cca6363b0e138c74f80af96431b83

 MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs

@@ -59,8 +59,8 @@
        // 查询
        var result = Db
            .Queryable<MesQaItemsDetect01, MesInvItemArn, MesInvItemArnDetail,
                MesItems, MesUnit,MesQaItemsDetectDetail5>(
                (a, d, b, c, t,z) => new object[]
                MesItems, MesUnit, MesQaItemsDetectDetail5>(
                (a, d, b, c, t, z) => new object[]
                {
                    JoinType.Inner, d.BillNo == a.LotNo,
                    JoinType.Inner, d.Id == b.Mid && b.ItemNo == a.ItemNo,
@@ -70,9 +70,9 @@
                    JoinType.Inner, c.Fpurchaseunitid == t.Id,
                    JoinType.Inner, z.ReleaseNo == a.ReleaseNo
                })
            .Where((a, d, b, c, t,z) => a.FngHandle == "退货" && 
                      z.FcheckResu == "不合格" &&
                                      query.ItemArnDetailIds.Contains(b.Id))
            .Where((a, d, b, c, t, z) => a.FngHandle == "退货" &&
                                         z.FcheckResu == "不合格" &&
                                         query.ItemArnDetailIds.Contains(b.Id))
            .Select((a, d, b, c, t) => new Material
            {
                FmrMode = a.Fmrmode,