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

zyf

2025-11-27 d7f491034ae9694741178f17f809143f48470520

 MES.Service/service/QC/RKJService.cs

@@ -3,6 +3,7 @@
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
using SqlSugar.Extensions;

namespace MES.Service.service.QC;

@@ -84,9 +85,14 @@
        if (count <= 0)
            return [];

        decimal? ID = db.Queryable<MesQa>()
            .Where(s => s.QsType == "3" && s.ItemNo == itemNo && s.Fsubmit == 1)
            .Select(s=> s.Id)
            .First();

        // 获取质量标准
        var qsItemOqcItems = db.Queryable<MesQualityStandard>()
            .Where(b => b.QsType == "3" && b.ItemNo == itemNo)
            .Where(b => b.QsType == "3" && b.Pid == ID)
            .Select(b => new QsItemOqcItem
            {
                ProjName = b.ProjName,
@@ -522,14 +528,17 @@


        var query = db
            .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser,Womcaa>((a, b,
                    da, c, us, ca) =>
            .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser, Womcaa, SysDepartment,MesUserDepartmentQc, SysUser>((a, b,
                    da, c, us, ca, d, dq, us2) =>
                new JoinQueryInfos(
                    JoinType.Left, a.ItemNo == b.ItemNo, // 关联物料信息
                    JoinType.Left, a.BillNo == da.Daa001, // 关联工单信息
                    JoinType.Left, da.Daa015 == c.LineNo, // 关联工单信息
                    JoinType.Left, us.Fcode == a.CreateBy, // 关联工单信息
                    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, us2.Fcode == a.FcheckBy
                ))
            // 用户线体过滤条件
            //.WhereIF(lineNo != null && lineNo.Length > 0 && !"PL017".Equals(queryObj.createUser),
@@ -544,12 +553,17 @@
                (a, b, da, c, us) => a.Fsubmit == 1)
            // 搜索条件（物料名称/编号）
            .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
                (a, b, da, c, us) =>
                (a, b, da, c, us,ca) =>
                    b.ItemName.ToLower()
                        .Contains(queryObj.SearchValue.ToLower()) ||
                    ca.Caa015.ToLower()
                        .Contains(queryObj.SearchValue.ToLower()) ||
                    a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
            // 新增：用户code过滤
            .WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser),
                (a, b, da, c, us, ca, d, dq) => dq.Usercode == queryObj.LoginUser)
            // 查询字段
            .Select((a, b, da, c, us, ca) => new QsItemOqcReq
            .Select((a, b, da, c, us, ca,d,dq,us2) => new QsItemOqcReq
            {
                Id = a.Id,
                BillNo = a.BillNo,
@@ -558,17 +572,18 @@
                ItemModel = b.ItemModel,
                CreateDate = a.CreateDate,
                CreateBy = a.CreateBy,
                CreateUser = us.Fname,
                CreateUser = us.Fname==null ? a.CreateBy: us.Fname,
                FcheckResu = a.FcheckResu,
                FcheckBy = a.FcheckBy,
                FcheckBy = us2.Fname,//a.FcheckBy,
                FcheckDate = a.FcheckDate,
                ReleaseNo = a.ReleaseNo,
                Remarks = a.Remarks,
                Daa015 = da.Daa015, // 工单线体
                Daa015 = d.Departmentname=="注塑车间" ? da.Daa020:da.Daa015, // 工单线体
                Fsubmit = a.Fsubmit,
                Quantity = da.Daa008,
                LineNo = c.LineName,
                SaleOrderNo = ca.Caa015
                LineNo = d.Departmentname == "注塑车间" ? da.Daa020 : c.LineName,
                SaleOrderNo = ca.Caa015,
                DepartName = d.Departmentname
            })
            // 排序
            .OrderBy(a => a.CreateDate, OrderByType.Desc);
@@ -907,6 +922,21 @@
        return 0;
    }

    public int reSubmit(RKJDto dto)
    {
        SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            return db.Updateable<QsItemOqcReq>()
                 .SetColumns(a => a.Fsubmit == 0)
                 .SetColumns(a => a.FsubmitBy == null)
                 .SetColumns(a => a.FsubmitDate == null)
                 .Where(a => a.ReleaseNo == dto.releaseNo)
                 .ExecuteCommand();
        });

        return 0;
    }

    // 备份：原始版本的saveItem方法
    public int saveItemOriginal(RKJDto rkjDto)
    {