来料检，入库检，首检巡检。

xwt

2025-08-14 82dac540156cb29e58c86f7d7d840e3c7e548c15

 StandardInterface/MES.Service/service/QC/LljService.cs

@@ -67,9 +67,21 @@
                        .Contains(queryObj.SearchValue.ToLower()))
            //  .OrderByDescending((a, b,

            .OrderBy("CASE WHEN a.STATUS = '已提交' THEN 0 ELSE 1 END, a.IQC_DATE desc, a.ID asc")
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount); 
            .OrderBy("CASE WHEN a.EMERGENCY = 1 THEN 0 ELSE 1 END, CASE WHEN a.STATUS = '已提交' THEN 0 ELSE 1 END, a.IQC_DATE desc, a.ID asc")
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);

        // 为每个检验单添加检验项目数量信息
        foreach (var item in pageList)
        {
            // 获取该检验单的检验项目数量
            var itemCount = db.Queryable<MesQaItemsDetectDetail5>()
                .Where(x => x.ReleaseNo == item.ReleaseNo)
                .Count();
            
            // 设置检验项目数量
            item.InspectionItemCount = itemCount;
        }
        
        var emergencyValues = pageList.Select(item => item.EMERGENCY).ToList(); 
        return (pageList, totalCount);
    }
@@ -311,24 +323,24 @@
        return input.Substring(startIndex + 1, length);
    }

    public List<QamftpDto> GetAttachments(string releaseNo)
    public List<QamftpDto> GetAttachments(string ItemNo)
    {
        if (string.IsNullOrEmpty(releaseNo))
        {
            throw new ArgumentException("检验单号不能为空");
        }
        //if (string.IsNullOrEmpty(ItemNo))
        //{
           // throw new ArgumentException("检验单号不能为空");
        //}
        
        var db = SqlSugarHelper.GetInstance();
        try
        {
            return db.Queryable<MesQamftp>()
                .Where(x => x.ReleaseNo == releaseNo)
                .Where(x => x.ItemNo == ItemNo)
                .OrderBy(x => x.Fdate, OrderByType.Desc)
                // .ThenBy(x => x.CreateDate, OrderByType.Desc)
                .Select(x => new QamftpDto
                {
                    Id = x.Id,
                    ItemNo = x.ItemNo,
                    itemNo = x.ItemNo,
                    Ftype = x.Ftype,
                    Fattach = x.Fattach,
                    Fversion = x.Fversion,
@@ -337,7 +349,7 @@
                    CreateDate = x.CreateDate,
                    Company = x.Company,
                    Factory = x.Factory,
                    ReleaseNo = x.ReleaseNo,
                    
                    F_type = x.F_type,
                    LastupdateBy = x.LastupdateBy,
                    LastupdateDate = x.LastupdateDate,
@@ -861,20 +873,41 @@
        return withOracle;
    }

    //主表修改备注字段
    //主表修改字段
    public int saveRemarksGid(LLJDto dto)
    {
        return SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            return db.Updateable<MesQaItemsDetect01>()
                .SetColumns(it =>
                    it.FngDesc == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
                .SetColumns(it => it.PHSY == dto.PHSY)//破坏实验数
                .SetColumns(it => it.FngDesc == dto.Remarks)
                .Where(it => it.ReleaseNo == dto.releaseNo)
                .ExecuteCommand();
        });
    }

    //主表修改破坏实验
    public int savePhsyGid(LLJDto dto)
    {
        return SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            return db.Updateable<MesQaItemsDetect01>()
                .SetColumns(it => it.PHSY == dto.PHSY)
                .Where(it => it.ReleaseNo == dto.releaseNo)
                .ExecuteCommand();
        });
    }
    // 主表修改下拉框字段
    public int saveDropdownFields(LLJDto dto)
    {
        return SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            return db.Updateable<MesQaItemsDetect01>()
                .SetColumns(it => it.BLYY == dto.BLYY)
                .SetColumns(it => it.PSZT == dto.PSZT)
                .SetColumns(it => it.SSCJ == dto.SSCJ)
                .Where(it => it.ReleaseNo == dto.releaseNo)
                .ExecuteCommand();
        });
    }
    //子表修改备注字段
    public int saveRemarksPid(LLJDto dto)
    {