精简修正代码

啊鑫

8 天以前 0aa54059b26e6641196e9953490dd18616e916e3

 service/QC/LljService.cs

@@ -1,12 +1,9 @@
using MES.Service.Models;
using Microsoft.IdentityModel.Tokens;
using Microsoft.IdentityModel.Tokens;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
using static Azure.Core.HttpHeader;

namespace NewPdaSqlServer.service.QC;

@@ -35,16 +32,15 @@
            //    StringUtil.IsNotNullOrEmpty(queryObj.result) &&
            //    !"未完成".Equals(queryObj.result),
            //    a => (a.STATUS ?? "") == "已提交")

            .WhereIF(!string.IsNullOrWhiteSpace(queryObj.keyword), a =>
                a.ItemNo.Contains(queryObj.keyword) ||
                a.ItemName.Contains(queryObj.keyword) ||
                a.LotNo.Contains(queryObj.keyword) ||
                a.ReleaseNo.Contains(queryObj.keyword) ||
                a.SuppName.Contains(queryObj.keyword) 
                a.SuppName.Contains(queryObj.keyword)
            )
            .WhereIF(UtilityHelper.CheckGuid(parsedGuid),
                a => a.guid == parsedGuid )
                a => a.guid == parsedGuid)
            .Where(a => (a.fsubmit ?? 0) == 0)
            .OrderByDescending(a => a.CreateDate)
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
@@ -64,8 +60,8 @@

        var mesQaIqcItem = Db
            .Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1
                && s.ItemId == itemId && s.FTYPE == "1").Select(
                b => new MesQaItemsDetectDetail5
                && s.ItemId == itemId && s.FTYPE == "1").Select(b =>
                new MesQaItemsDetectDetail5
                {
                    ReleaseNo = releaseNo,
                    FacLevel = b.FacLevel,
@@ -237,7 +233,6 @@
        var Ybsl_In = Db.Ado.SqlQuery<MesQaItemsDetectDetail5>(sql).ToList();

        return Ybsl_In;

    }

    public int SetQSItemDetail(MesQaItemsDetectDetail12 detail)
@@ -258,7 +253,8 @@
                result.Add(item);
            }

            return db.Insertable(result).PageSize(1).IgnoreColumnsNull().ExecuteCommand();
            return db.Insertable(result).PageSize(1).IgnoreColumnsNull()
                .ExecuteCommand();
        });

        detail.CreateBy = detail.LastupdateBy;
@@ -303,19 +299,21 @@
        //    result = "不合格";
        else if (noCount >= QsItemOqcItem.FreQty)
            result = "不合格";
        var useTransactionWithOracle = UseTransaction(
            db =>
            {
                var commit = 0;
                commit += db.Updateable<MesQaItemsDetectDetail5>()
                    .SetColumns(s => s.FcheckResu == result)
                    .SetColumns(s => s.FenterQty == count)
                    .SetColumns(s => s.FngRate == (s.CheckQyt == 0 ? (decimal?)null : (decimal?)(Convert.ToDouble(noCount) / Convert.ToDouble(count))))
                    .Where(s => s.Guid == detail.ParentGuid)
                    .ExecuteCommand();
        var useTransactionWithOracle = UseTransaction(db =>
        {
            var commit = 0;
            commit += db.Updateable<MesQaItemsDetectDetail5>()
                .SetColumns(s => s.FcheckResu == result)
                .SetColumns(s => s.FenterQty == count)
                .SetColumns(s => s.FngRate == (s.CheckQyt == 0
                    ? null
                    : (decimal?)(Convert.ToDouble(noCount) /
                                 Convert.ToDouble(count))))
                .Where(s => s.Guid == detail.ParentGuid)
                .ExecuteCommand();

                return commit;
            });
            return commit;
        });

        var isNull = Db.Queryable<MesQaItemsDetectDetail5>()
            .Where(s => s.Guid == detail.ParentGuid && s.FcheckResu == null)
@@ -640,8 +638,8 @@
                    .ExecuteCommand();

                var first = db
                    .Queryable<MesInvItemArnDetail, MesInvItemArn>(
                        (b, a) => new object[]
                    .Queryable<MesInvItemArnDetail, MesInvItemArn>((b, a) =>
                        new object[]
                        {
                            JoinType.Left, b.ParentGuid == a.Guid
                        })
@@ -670,8 +668,8 @@
                executeCommand += db.Updateable<MesInvItemArnDetail>()
                    .SetColumns(s => s.CheckStates == "不合格待审批")
                    .SetColumns(s => s.Ischeck == 1)
                    .SetColumns(
                        s => s.CheckRes == mesQaItemsDetect01.FcheckResu)
                    .SetColumns(s =>
                        s.CheckRes == mesQaItemsDetect01.FcheckResu)
                    .SetColumns(s => s.CheckDate == DateTime.Now)
                    .Where(s => s.ParentGuid == mesInvItemArn.Guid
                                && s.ItemId == mesQaItemsDetect01.ItemId)
@@ -706,13 +704,12 @@
    }



    //删除特征值 
    public int deleteDetail13(LLJDto dto)
    {
        var withOracle = Db.Deleteable<MesQaItemsDetectDetail13>()
                .Where(s => s.Guid.ToString() == dto.id13)
                .ExecuteCommand();
            .Where(s => s.Guid.ToString() == dto.id13)
            .ExecuteCommand();

        return withOracle;
    }
@@ -721,9 +718,9 @@
    public int updateRemarks(LLJDto dto)
    {
        var withOracle = Db.Updateable<MesQaItemsDetect01>()
                .SetColumns(s => s.FngDesc == dto.Remarks)
                .Where(s => s.Guid.ToString() == dto.gid)
                .ExecuteCommand();
            .SetColumns(s => s.FngDesc == dto.Remarks)
            .Where(s => s.Guid.ToString() == dto.gid)
            .ExecuteCommand();

        return withOracle;
    }