修改合并领料查询

cnf

2 天以前 6ea7ec9920a6c5d1a678170f9b11cb68fe2b5a8f

 service/Wom/WomdaahbManager.cs

@@ -194,29 +194,6 @@

        if (queryResult?.Daahb001 == null) throw new Exception("合并单号不存在");

        //var womdabs = Db.Queryable<Womdaa, Womdab, MesItems, Womcab>(
        //        (a, b, c, d) =>
        //            new JoinQueryInfos(
        //                JoinType.Left,
        //                a.Guid == b.DaaGuid,
        //                JoinType.Inner,
        //                c.Id.ToString() ==
        //                b.Dab003,
        //                JoinType.Inner, b.Erpid == d.Erpid
        //            ))
        //    .Where((a, b, c, d) =>
        //        a.Daa001 == query.daa001 && d.Iss1ueType == "1")
        //    .Select((a, b, c, d) => new ItemDetailModel
        //    {
        //        ItemNo = c.ItemNo,
        //        ItemName = c.ItemName,
        //        ItemModel = c.ItemModel,
        //        FQty = b.Dab006, // 申请数量
        //        SQty = b.Dab007, // 已扫数量
        //        DSQty = b.Dab006 - b.Dab007, // 已扫数量
        //    })
        //    .ToList();

                    var sql =string.Format(@"SELECT max(ahb.GUID)                                      as hbguid,
                   m.item_no                                          as itemNo,
                   max(m.item_name)                                   as itemName,
@@ -246,6 +223,7 @@
                    WHERE ahb.daahb001 = '{0}'
                      AND D.ISSUE_TYPE = 1
                      AND (F.ItemId is null OR F.checkStatus <> 1)
                      and(m.F_WPVT_BASE_QTR = ahb.cgyid or isnull(m.F_WPVT_BASE_QTR, '') = '')
                    group by m.item_no
                    ORDER BY m.item_no
                                      ", query.hbNo);