钉钉人员接口、检验撤回单据、首检保存备注

zyf

2025-11-27 d7f491034ae9694741178f17f809143f48470520

 MES.Service/service/QC/XJService.cs

@@ -161,7 +161,7 @@

        var query = db
            .Queryable<QsQaItemXj, Womdaa, MesLine,
                MesItems, SysUser,Womcaa,SysDepartment, MesUserDepartmentQc,MesItems>((s, a, c, b, us,ca,d,dq,i) =>
                MesItems, SysUser,Womcaa,SysDepartment, MesUserDepartmentQc,MesItems, SysUser>((s, a, c, b, us,ca,d,dq,i,us2) =>
                new JoinQueryInfos(
                    JoinType.Inner, s.BillNo == a.Daa001,
                    JoinType.Left, a.Daa015 == c.LineNo,
@@ -170,7 +170,8 @@
                    JoinType.Left, ca.Caa020 == a.Daa021,
                    JoinType.Left, d.Departmentcode == c.Departmentcode,
                    JoinType.Left, dq.Departmentcode == d.Departmentcode,//查询用户权限
                    JoinType.Left, i.Id == Convert.ToDecimal(a.Daa002)
                    JoinType.Left, i.Id == Convert.ToDecimal(a.Daa002),
                    JoinType.Left, us2.Fcode == s.SubmitBy
                )
            )
            //.WhereIF(lineNo != null && lineNo.Length > 0,
@@ -193,13 +194,13 @@
                i.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
                ca.Caa015.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
                i.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
            .Select((s, a, c, b, us,ca,d) => new QsQaItemXj
            .Select((s, a, c, b, us,ca,d,dq,i,us2) => new QsQaItemXj
            {
                Daa020 = c.LineNo,
                Id = s.Id,
                PlanQty = a.Daa008,
                LineName = c.LineName,
                CreateUser = us.Fname,
                LineName = d.Departmentname == "注塑车间" ?  a.Daa020:c.LineName,
                CreateUser = us.Fname==null ? s.CreateBy : us.Fname,
                CreateBy = s.CreateBy,
                CreateDate = s.CreateDate,
                ReleaseNo = s.ReleaseNo,
@@ -212,7 +213,10 @@
                Remarks = s.Remarks,
                SaleOrder = ca.Caa015,
                DepartName = d.Departmentname,
                PlanName = s.PlanName
                PlanName = s.PlanName,
                fcheckBy = us2.Fname,
                SubmitDate= s.SubmitDate,
                SubmitStatus = s.SubmitStatus

            }).OrderBy(s => s.CreateDate, OrderByType.Desc);
        var items = query.ToPageList(queryObj.PageIndex, queryObj.Limit,
@@ -396,6 +400,23 @@
        return useTransactionWithOracle > 0;
    }


    public bool XJReSubmit(LLJDto rkjDto)
    {
        var useTransactionWithOracle =
            SqlSugarHelper.UseTransactionWithOracle(db =>
            {
                return db.Updateable<QsQaItemXj>()
                    .SetColumns(s => s.SubmitStatus == 0)
                    .SetColumns(s => s.SubmitBy == null)
                    .SetColumns(s => s.SubmitDate == null)
                    .Where(s => s.Id == rkjDto.gid)
                    .ExecuteCommand();
            });

        return useTransactionWithOracle > 0;
    }

    // public int saveItem(XJDto xjDto)
    // {
    //     var items = xjDto.items;