zyf
2025-08-26 fa53abd5d374862c640da5310d0bd1bb641a0d5b
MES.Service/service/QC/SJService.cs
@@ -48,11 +48,14 @@
        //if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
        //    lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
        var data = db.Queryable<SJPageResult, Womdaa, Womcaa> ((a,
                    da,ca) =>
        var data = db.Queryable<SJPageResult, Womdaa, Womcaa, SysDepartment, MesUserDepartmentQc,MesItems> ((a,
                    da,ca,d,dq,i) =>
                new JoinQueryInfos(
                    JoinType.Left, Convert.ToDecimal(a.Pbaid) == da.Id, // 关联工单信息
                    JoinType.Left, da.Daa021 == ca.Caa020//任务单,用于查询销售订单号
                    JoinType.Left, da.Daa021 == ca.Caa020,//任务单,用于查询销售订单号
                    JoinType.Left, d.Departmentid == Convert.ToDecimal(da.Daa013),//查询车间
                    JoinType.Left, dq.Departmentcode == d.Departmentcode,//查询用户权限
                    JoinType.Left, i.Id == Convert.ToDecimal(da.Daa002)//查询用户权限
                ))
            //.WhereIF(lineNo != null && lineNo.Length > 0,
            //    a => lineNo.Contains(a.line))
@@ -67,7 +70,17 @@
                StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                !"未完成".Equals(queryObj.Result),
                a => a.FSubmit == "1")
            .Select((a, da, ca) => new SJPageResult
            //匹配权限
            .WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser),
                (a, da, ca, d, dq) => dq.Usercode == queryObj.LoginUser)
            //匹配搜索字符串
            .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
                (a, da, ca, d, dq,i) =>
                a.BillNo.ToLower().Contains(queryObj.SearchValue.ToLower())||
                i.ItemName.ToLower() .Contains(queryObj.SearchValue.ToLower()) ||
                ca.Caa015.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
                i.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
            .Select((a, da, ca, d, dq) => new SJPageResult
            {
                Id = a.Id,
                BillNo = a.BillNo,
@@ -91,9 +104,8 @@
                Daa004 = a.Daa004,
                Daa008 = a.Daa008,
                LineName = a.LineName,
                // 映射额外的字段(销售订单号)
                SaleOrder = ca.Caa015
                SaleOrder = ca.Caa015,
                DepartName = d.Departmentname
            })
            .OrderBy(a => a.CreateTime, OrderByType.Desc);
        var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit,ref totalCount);