优化首检

kyy

2025-02-07 5adecb7ffd986930d2f4e195c0273e4db73b5315

 MES.Service/service/QC/LljService.cs

@@ -34,32 +34,32 @@
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                "未完成".Equals(queryObj.result),
                a => a.FcheckResu == null)
                a => a.FcheckResu == null && a.STATUS == "未提交")
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                !"未完成".Equals(queryObj.result),
                a => a.FcheckResu != null)
                a => a.FcheckResu != null && a.STATUS == "已提交")
            .WhereIF(id > 0, a => a.Id == id)
            .Where(a => depotCodes.Contains(a.DepotCode)) // 使用 Contains 方法模拟 IN 条件 根据仓库过滤
            .OrderByDescending(a => a.Id)
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);

    
        return (pageList, totalCount);
    }

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

        var count = db.Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1
                                                                  && s.ItemNo == itemNo && s.FTYPE == "1").Count();
                                                                  && s.ItemId == itemId && s.FTYPE == "1").Count();

        if (count <= 0) return [];

        var mesQaIqcItem = db
            .Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1
                                                        && s.ItemNo == itemNo && s.FTYPE == "1").Select(
                                                        && s.ItemId == itemId && s.FTYPE == "1").Select(
                b => new MesQaItemsDetectDetail5
                {
                    ReleaseNo = releaseNo,
@@ -247,7 +247,7 @@
                FreQty = a.FreQty,
                Factory = "1000",
                Company = "1000",
                FenterQty = SqlFunc.AggregateCount(b.Id),
                FenterQty = SqlFunc.AggregateCount(b.Id), 
                FcheckResu = a.FcheckResu,
                FcheckItemDesc = a.FcheckItemDesc
            }).ToList();