优化首检

kyy

2025-02-07 5adecb7ffd986930d2f4e195c0273e4db73b5315

 MES.Service/service/QC/RKJService.cs

@@ -64,31 +64,31 @@
    }*/

    //根据检验标准来计算检验个数
    public List<QsItemOqcItem> SetItems(string itemNo, decimal quantity)
    public List<QsItemOqcItem> SetItems(decimal itemId, decimal quantity)
    {
        var db = SqlSugarHelper.GetInstance();

        var count = db.Queryable<MesQa>().Where(s => s.QsType == "3"
                                                     && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
                                                     && s.ItemId == itemId && s.Fsubmit == 1).Count();

        if (count <= 0) return [];

        var qsItemOqcItems = db
            .Queryable<MesQualityStandard>()
            .Where(b => b.QsType == "3"
                        && b.ItemNo == itemNo).Select(
                        && b.ItemId == itemId).Select(
                b => new QsItemOqcItem
                {
                    ProjName = b.ProjName,
                    ItemMod = b.ItemMod,
                   // ItemMod = b.ItemMod,
                    InspectionMethod = b.InspectionMethod,
                    UsingInstruments = b.UsingInstruments,
                    LevelNum = SqlFunc.IsNull(
                        SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
                        b.InspectionLevel),
                    MaxValue = b.MaxValue,
                    StandardValue = b.StandardValue,
                    MinValue = b.MinValue,
                        SqlFunc.IsNull( Convert.ToDecimal(b.LevelNum) * Convert.ToDecimal(b.InspectionLevel) , 1),
                        Convert.ToDecimal(b.InspectionLevel)),
                    MaxValue = Convert.ToDecimal(b.MaxValue),
                    StandardValue = Convert.ToDecimal(b.StandardValue),
                    MinValue = Convert.ToDecimal(b.MinValue),
                    Notes = b.Notes,
                    FcheckLevel = b.FcheckLevel,
                    FacLevel = b.FacLevel,
@@ -128,9 +128,11 @@
                    break;
                default:
                    LEV = ""; // 默认值
                    
                    break;
            }

            if (string.IsNullOrEmpty(LEV)) throw new Exception("该物料未维护检验项目或检验水平为空");
            
            var sql =
                "SELECT " + LEV +
                " FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL2 B ON B.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO='" +
@@ -176,7 +178,7 @@
        return db.Queryable<QsItemOqcItem, QsItemOqcItemDetail>((a, b) =>
                new JoinQueryInfos(JoinType.Left, a.Id == b.Pid))
            .WhereIF(pid > 0, (a, b) => a.Pid == pid)
            .WhereIF(id > 0, (a, b) => a.Id == id)
            //.WhereIF(id > 0, (a, b) => a.Id == id)
            .GroupBy((a, b) => new
            {
                a.Id,
@@ -465,7 +467,7 @@
            lineNo = _baseService.getUserLineNo(queryObj.createUser);

        return db.Queryable<QsItemOqcReq, RKJDaa001>((a, b) =>
                new JoinQueryInfos(JoinType.Left, a.BillNo == b.RbillNo && a.ItemId ==b.ItemId))
                new JoinQueryInfos(JoinType.Left, a.Id == b.ItemInId && a.ItemId ==b.ItemId))
            
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
@@ -485,7 +487,7 @@
                CreateBy = a.CreateBy,
                CreateDate = a.CreateDate,
                ItemNo = a.ItemNo,
                TaskNo = b.LotNo,
                TaskNo = b.WorkNo,
                ItemName = b.ItemName,
                ItemModel = b.ItemModel,
                LineNo = b.LineNo,
@@ -493,8 +495,9 @@
                FcheckBy = a.FcheckBy,
                FcheckDate = a.FcheckDate,
                MoidNum = a.MoidNum,
             
                Remarks = a.Remarks
              
                Remarks = a.Remarks,
                ItemId = a.ItemId
            }).OrderBy(a => a.CreateDate, OrderByType.Desc)
            .ToPageList(queryObj.PageIndex, queryObj.Limit);
    }