检验查询功能新增、检验根据车间显示单据

zyf

2025-08-26 fa53abd5d374862c640da5310d0bd1bb641a0d5b

 MES.Service/service/QC/SJService.cs

@@ -48,7 +48,15 @@
        //if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
        //    lineNo = _baseService.getUserLineNo(queryObj.StatusUser);

        var data = db.Queryable<SJPageResult>()
        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, 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))
            .WhereIF(queryObj.Id != null, a => a.Id == queryObj.Id)
@@ -62,6 +70,43 @@
                StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                !"未完成".Equals(queryObj.Result),
                a => a.FSubmit == "1")
            //匹配权限
            .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,
                StatusDate = a.StatusDate,
                FName = a.FName,
                Result = a.Result,
                FSubmit = a.FSubmit,
                FSubmitBy = a.FSubmitBy,
                FSubmitDate = a.FSubmitDate,
                MoidNum = a.MoidNum,
                StatusUser = a.StatusUser,
                Pbaid = a.Pbaid,
                CreateTime = a.CreateTime,
                Comments = a.Comments,
                ItemMod = a.ItemMod,
                ItemNo = a.ItemNo,
                daa001 = a.daa001,
                line = a.line,
                Remarks = a.Remarks,
                Daa003 = a.Daa003,
                Daa004 = a.Daa004,
                Daa008 = a.Daa008,
                LineName = a.LineName,
                SaleOrder = ca.Caa015,
                DepartName = d.Departmentname
            })
            .OrderBy(a => a.CreateTime, OrderByType.Desc);
        var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit,ref totalCount);

@@ -136,15 +181,10 @@
    public List<QsItemIpiItem> getQSItems(decimal? pid, decimal? id)
    {
        var db = SqlSugarHelper.GetInstance();
        var qsItemIpiItems = db
            .Queryable<QsItemIpiItem>()
            .WhereIF(pid > 0, a => a.Pid == pid)
            .WhereIF(id > 0, a => a.Id == id).ToList();
        var qsItemIpiItems = db.Queryable<QsItemIpiItem>().WhereIF(pid > 0, a => a.Pid == pid).WhereIF(id > 0, a => a.Id == id).ToList();

        var array = qsItemIpiItems.Select(s => s.Id).ToArray();
        var qsItemIpiItemDetails = db.Queryable<QsItemIpiItemDetail>()
            .Where(s => array.Contains(s.Pid))
            .GroupBy(s => s.Pid)
        var qsItemIpiItemDetails = db.Queryable<QsItemIpiItemDetail>().Where(s => array.Contains(s.Pid)).GroupBy(s => s.Pid)
            .Select(s => new
            {
                s.Pid,
@@ -172,9 +212,7 @@
        });

        //使用linq表达式过滤出图片id不为空的数据
        var itemIpiItems =
            qsItemIpiItems.Where(s => s.Picture is { Length: > 0 })
                .ToList();
        var itemIpiItems =qsItemIpiItems.Where(s => s.Picture is { Length: > 0 }).ToList();
        if (itemIpiItems.Count > 0)
            itemIpiItems.ForEach(s =>
            {
@@ -197,16 +235,14 @@
            db =>
            {
                qsItemIpiReq.StatusDate = DateTime.Now;
                var pid = db.Insertable(qsItemIpiReq)
                    .ExecuteReturnIdentity();
                var pid = db.Insertable(qsItemIpiReq).ExecuteReturnIdentity();
                qsItemIpiReq.Id = pid;

                item.gid = pid;

                qsItemIpiItems.ForEach(s => s.Pid = pid);

                return db.Insertable(qsItemIpiItems)
                    .ExecuteCommand();
                return db.Insertable(qsItemIpiItems).ExecuteCommand();
            });
        item.Items = getQSItems(qsItemIpiReq.Id, null);

@@ -235,22 +271,33 @@

    public QsItem SaveItem(QsItem item)
    {
        var db = SqlSugarHelper.GetInstance();

        var del = db.Deleteable<QsItemIpiItem>()
            .Where(s=>s.Pid == item.gid)
            .ExecuteCommand();

        //QsItemIpiItemDetail
        var del1 = db.Deleteable<QsItemIpiItemDetail>()
            .Where(s => s.Gid == item.gid)
            .ExecuteCommand();

        var qsItemIpiItems = item.Items;
        SqlSugarHelper.UseTransactionWithOracle(
            db =>
            {
                qsItemIpiItems.ForEach(s => s.Pid = item.gid);

                return db.Insertable(qsItemIpiItems)
                    .ExecuteCommand();
                return db.Insertable(qsItemIpiItems).ExecuteCommand();
            });
        item.Items = getQSItems(item.gid, null);

        //没有上下限的检验项目自动盘点为合格
        item.Items.ForEach(s =>
        {
            if (s.MaxValue != null || s.StandardValue != null ||
                s.MinValue != null) return;
            if (s.MaxValue != null || s.StandardValue != null || s.MinValue != null)
            {
                return;
            }
            var detail = new QsItemIpiItemDetail();
            detail.Pid = s.Id;
            detail.Gid = item.gid;
@@ -282,7 +329,6 @@
                item.CreateDate = DateTime.Now;
                result.Add(item);
            }

            return db.Insertable(result).ExecuteCommand();
        });

@@ -426,6 +472,19 @@
                .ExecuteCommand();
        });
    }
    
     
    //NOTES
    public int saveNotesPid(QsItem dto)
    {
        return SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            return db.Updateable<QsItemIpiItem>()
                .SetColumns(it =>it.Notes == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
                .Where(it => it.Id == dto.pid)
                .ExecuteCommand();
        });
    }

    //孙表修改备注字段
    public int saveRemarksById(QsItem dto)
@@ -433,8 +492,7 @@
        return SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            return db.Updateable<QsItemIpiItemDetail>()
                .SetColumns(it =>
                    it.Remarks == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
                .SetColumns(it =>it.Remarks == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
                .Where(it => it.Id == dto.id)
                .ExecuteCommand();
        });