多组织修改

sjz

2 天以前 f1deb7b024e17cba204de5fcb0dac15801436b90

 MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs

@@ -21,14 +21,15 @@
    public List<MesInvItemArnDetail> GetDetails(WarehouseQuery query)
    {
        // 查询
        return Db.Queryable<MesInvItemArnDetail, MesItems, MesUnit>(
                (c, t, u) => new object[]
        return Db.Queryable<MesInvItemArnDetail, MesItems, MesUnit>((c, t, u) =>
                new object[]
                {
                    JoinType.Left,
                    c.ItemNo == t.ItemNo && c.Company == t.Company &&
                    c.Factory == t.Factory,
                    JoinType.Left,
                    t.Fpurchaseunitid == u.Id.ToString() && t.Factory == u.Factory &&
                    t.Fpurchaseunitid == u.Id.ToString() &&
                    t.Factory == u.Factory &&
                    t.Company == u.Company
                })
            .Where((c, t, u) => c.Mid == query.id)
@@ -59,17 +60,17 @@
        // 查询
        var result = Db
            .Queryable<MesQaItemsDetect01, MesInvItemArn, MesInvItemArnDetail,
                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,
                    JoinType.Inner,
                    a.ItemNo == c.ItemNo && a.Company == c.Company &&
                    a.Factory == c.Factory,
                    JoinType.Inner, c.Fpurchaseunitid == t.Id.ToString(),
                    JoinType.Inner, z.ReleaseNo == a.ReleaseNo
                })
                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,
                JoinType.Inner,
                a.ItemNo == c.ItemNo && a.Company == c.Company &&
                a.Factory == c.Factory,
                JoinType.Inner, c.Fpurchaseunitid == t.Id.ToString(),
                JoinType.Inner, z.ReleaseNo == a.ReleaseNo
            })
            .Where((a, d, b, c, t, z) => a.FngHandle == "退货" &&
                                         z.FcheckResu == "不合格" &&
                                         query.ItemArnDetailIds.Contains(b.Id))