合并上格-8.19

展杰

2024-08-19 efe6984c4e0e91b16b2704e174d610e180045dc5

 MES.Service/service/QC/SuspendService.cs

@@ -6,20 +6,21 @@

public class SuspendService
{
    private readonly string[] statusArray = ["生产", "待产", "暂停"];
    private readonly string[] statusArray = ["开工", "待开工"];

    public List<SysDepartment> getDept()
    {
        var db = SqlSugarHelper.GetInstance();
        //return db.Queryable<SysDepartment>().ToList();
        return db
            .Queryable<MesSchemeResult, MesLine, QsQaItemXj, SysDepartment>(
            .Queryable<Womdaa, MesLine, QsQaItemXj, SysDepartment>(
                (a, b, c, d) =>
                    new JoinQueryInfos(JoinType.Left, a.LineNo == b.LineNo,
                        JoinType.Inner, a.BillNo == c.BillNo,
                    new JoinQueryInfos(JoinType.Left,
                        a.Daa002 == b.Id.ToString(),
                        JoinType.Inner, a.Daa001 == c.BillNo,
                        JoinType.Left, b.Departmentcode == d.Departmentcode))
            .Where((a, b, c, d) => a.PmoveMk == 0 && b.LineName != null &&
                                   statusArray.Contains(a.ProcStatus))
            .Where((a, b, c, d) => b.LineName != null &&
                                   statusArray.Contains(a.Daa018))
            .GroupBy((a, b, c, d) => new
            {
                b.Departmentcode, d.Departmentname
@@ -34,20 +35,21 @@
    public List<MesLine> GetLines(string deptCode)
    {
        var db = SqlSugarHelper.GetInstance();
        var mesLines = db.Queryable<MesSchemeResult, MesLine, QsQaItemXj>(
        var mesLines = db.Queryable<Womdaa, MesLine, QsQaItemXj>(
                (a, b, c) =>
                    new JoinQueryInfos(JoinType.Left, a.LineNo == b.LineNo,
                        JoinType.Inner, a.BillNo == c.BillNo))
                    new JoinQueryInfos(JoinType.Left,
                        a.Daa002 == b.Id.ToString(),
                        JoinType.Inner, a.Daa001 == c.BillNo))
            .Where((a, b, c) => b.LineName != null &&
                                statusArray.Contains(a.ProcStatus)
                                statusArray.Contains(a.Daa018)
                                && b.Departmentcode == deptCode)
            .GroupBy((a, b, c) => new
            {
                a.LineNo, b.LineName
                b.LineNo, b.LineName
            })
            .Select((a, b, c) => new MesLine
            {
                LineNo = a.LineNo,
                LineNo = b.LineNo,
                LineName = b.LineName
            }).ToList();