优化代码格式，添加到货标识和查询条件

啊鑫

2025-06-05 44a7c47a724c154c54e256727c75e79d31fd42e2

 StandardPda/MES.Service/service/QC/RKJService.cs

@@ -76,29 +76,28 @@
        var qsItemOqcItems = db
            .Queryable<MesQualityStandard>()
            .Where(b => b.QsType == "3"
                        && b.ItemNo == itemNo).Select(
                b => new QsItemOqcItem
                {
                    ProjName = b.ProjName,
                    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,
                    Notes = b.Notes,
                    FcheckLevel = b.FcheckLevel,
                    FacLevel = b.FacLevel,
                    QsCode = b.QsCode,
                    QsName = b.QsName,
                    Result = "未检测",
                    isCheck = 0,
                    Picture = b.Picture,
                    Picturename = b.Picturename
                }).ToList();
                        && b.ItemNo == itemNo).Select(b => new QsItemOqcItem
            {
                ProjName = b.ProjName,
                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,
                Notes = b.Notes,
                FcheckLevel = b.FcheckLevel,
                FacLevel = b.FacLevel,
                QsCode = b.QsCode,
                QsName = b.QsName,
                Result = "未检测",
                isCheck = 0,
                Picture = b.Picture,
                Picturename = b.Picturename
            }).ToList();

        qsItemOqcItems.ForEach(item =>
        {
@@ -377,8 +376,8 @@
            result = 1;
        else if (count - passCount < QsItemOqcItem.FreQty) result = 1;

        var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
            db =>
        var useTransactionWithOracle =
            SqlSugarHelper.UseTransactionWithOracle(db =>
            {
                var commit = 0;
                commit += db.Updateable<QsItemOqcItem>()
@@ -443,12 +442,12 @@
    private void setBarCodes(string? FcheckResu, QsItemOqcItemDetail detail,
        SqlSugarClient db)
    {
        var oqcReqList = db.Queryable<QsItemOqcReq, MesInvItemIns, Womdaa>(
                (a, b, c) =>
                    new JoinQueryInfos(
                        JoinType.Left, a.BillNo == b.BillNo,
                        JoinType.Left, c.Daa001 == b.RbillNo
                    ))
        var oqcReqList = db
            .Queryable<QsItemOqcReq, MesInvItemIns, Womdaa>((a, b, c) =>
                new JoinQueryInfos(
                    JoinType.Left, a.BillNo == b.BillNo,
                    JoinType.Left, c.Daa001 == b.RbillNo
                ))
            .Where(a => a.Id == detail.Gid)
            .Select((a, b, c) =>
                new
@@ -471,7 +470,7 @@
                    JoinType.Left, a.Id == b.ItemInId))
            .Where((a, b) => a.BillNo == qsItemOqcReq.BillNo)
            .Select((a, b) => new
            { b.ItemBarcode, b.Quantity, b.MesScgdGxId })
                { b.ItemBarcode, b.Quantity, b.MesScgdGxId })
            .ToList();

        var barCodes = mesInvItemInsList.Select(s => s.ItemBarcode).ToList();
@@ -589,8 +588,8 @@

        var qsItemOqcReqs = db
            .Queryable<QsItemOqcReq, MesItems, MesInvItemIns, MesInvTransaction,
                RKJDaa001, Womdaa, VLineUser>(
                (a, b, c, ca, m, da, z) => new JoinQueryInfos(
                RKJDaa001, Womdaa, VLineUser>((a, b, c, ca, m, da, z) =>
                new JoinQueryInfos(
                    JoinType.Left, a.ItemNo == b.ItemNo,
                    JoinType.Left, a.BillNo == c.BillNo,
                    JoinType.Left,
@@ -600,7 +599,7 @@
                    JoinType.Left, c.Id == m.ItemInId && a.ItemNo == m.ItemNo,
                    JoinType.Left, da.Daa001 == c.RbillNo,
                    JoinType.Left, da.Daa015 == z.LineNo //,
                                                         //JoinType.Left,c.Bgr == d.UserNo
                    //JoinType.Left,c.Bgr == d.UserNo
                ))
            // .WhereIF(lineNo != null && lineNo.Length > 0,
            //     (a, b, c, ca, m, da) => lineNo.Contains(da.Daa015))
@@ -842,12 +841,11 @@
        var db = SqlSugarHelper.GetInstance();
        return db
            .Queryable<QsItemOqcReq, MesInvItemIns, MesInvItemInCDetails2,
                MesInvItemStocks>(
                (a, b, c, d) => new JoinQueryInfos(
                    JoinType.Inner, a.BillNo == b.BillNo,
                    JoinType.Inner, b.Id == c.ItemInId,
                    JoinType.Inner, c.ItemBarcode == d.ItemBarcode
                ))
                MesInvItemStocks>((a, b, c, d) => new JoinQueryInfos(
                JoinType.Inner, a.BillNo == b.BillNo,
                JoinType.Inner, b.Id == c.ItemInId,
                JoinType.Inner, c.ItemBarcode == d.ItemBarcode
            ))
            .Where((a, b, c, d) => a.Id == gid)
            .Count() > 0;
    }