Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK

xwt

7 天以前 65438b8c1f9ec323c3c2ae265561dae4ff536379

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

@@ -75,10 +75,9 @@
            //            UserName = i.Fname != null || i.Fname != "" ? i.Fname : g.Fname,
            //            CreateUserName = e.Fname
            //        }, true)
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount); 

        var emergencyValues = pageList.Select(item => item.EMERGENCY).ToList();
        //return (pageList, totalCount);
        var emergencyValues = pageList.Select(item => item.EMERGENCY).ToList(); 
        return (pageList, totalCount);
    }

@@ -128,14 +127,104 @@

    }
    //紧急放行
    //public string[] EmergencyRelease(int id)
    //{
    //    var db = SqlSugarHelper.GetInstance();
         
        
    //    int emergencyStatus = db.Queryable<MesQaItemsDetect01>() 
    //                            .Where(t => t.Id == id)
    //                            .Select(t => t.EMERGENCY) 
    //                            .First();

    //    if (emergencyStatus != 0)
    //    {
    //        return new string[] { "1", "非紧急状态，无法执行紧急放行" };
    //    }

        
    //    var outputResult = new SugarParameter("PO_RESULT", null,
    //        DbType.Int32, ParameterDirection.Output, 4000);

    //    var outputMessage = new SugarParameter("PO_MSG", null,
    //        DbType.String, ParameterDirection.Output, 4000);

    //    var parameters = new List<SugarParameter>
    //{
    //    new("P_ID", id, DbType.Int32, ParameterDirection.Input),
    //    outputResult,
    //    outputMessage
    //};

    //    db.Ado.ExecuteCommand(
    //        "BEGIN prc_MES_QA_ITEMS_update1(:P_ID, :PO_RESULT, :PO_MSG); END;",
    //        parameters.ToArray());

    //    var lotNo1 = db.Queryable<MesQaItemsDetect01>()
    //               .Where(t => t.Id == id)
    //               .Select(t => t.LotNo1)
    //               .First();

    //    var resultValue = outputResult.Value?.ToString();
    //    var messageValue = outputMessage.Value?.ToString();
    //    return new string[] { resultValue, messageValue, lotNo1?.ToString() ?? "" };
    //}

    //public string[] WithdrawEmergencyRelease(int id)
    //{
    //    var db = SqlSugarHelper.GetInstance();

      
    //    int emergencyStatus = db.Queryable<MesQaItemsDetect01>() 
    //                            .Where(t => t.Id == id)
    //                            .Select(t => t.EMERGENCY) 
    //                            .First();

    //    if (emergencyStatus != 0)
    //    {
    //        return new string[] { "1", "非紧急状态，无需撤回" };
    //    }

    //    var outputResult = new SugarParameter("PO_RESULT", null,
    //        DbType.Int32, ParameterDirection.Output, 4000);

    //    var outputMessage = new SugarParameter("PO_MSG", null,
    //        DbType.String, ParameterDirection.Output, 4000);

    //    var parameters = new List<SugarParameter>
    //{
    //    new("P_ID", id, DbType.Int32, ParameterDirection.Input),
    //    outputResult,
    //    outputMessage
    //};

    //    db.Ado.ExecuteCommand(
    //        "BEGIN prc_MES_QA_ITEMS_update2(:P_ID, :PO_RESULT, :PO_MSG); END;",
    //        parameters.ToArray());

    //    var lotNo1 = db.Queryable<MesQaItemsDetect01>()
    //               .Where(t => t.Id == id)
    //               .Select(t => t.LotNo1)
    //               .First();
        

    //    var resultValue = outputResult.Value?.ToString();
    //    var messageValue = outputMessage.Value?.ToString();
    //    return new string[] { resultValue, messageValue, lotNo1?.ToString() ?? "" };
    //}




     
    public string[] EmergencyRelease(int id)
    {
        var db = SqlSugarHelper.GetInstance();

        
        int emergencyStatus = db.Queryable<MesQaItemsDetect01>() 

        int emergencyStatus = db.Queryable<MesQaItemsDetect01>()
                                .Where(t => t.Id == id)
                                .Select(t => t.EMERGENCY) 
                                .Select(t => t.EMERGENCY)
                                .First();

        if (emergencyStatus != 0)
@@ -143,7 +232,7 @@
            return new string[] { "1", "非紧急状态，无法执行紧急放行" };
        }

        

        var outputResult = new SugarParameter("PO_RESULT", null,
            DbType.Int32, ParameterDirection.Output, 4000);

@@ -175,10 +264,10 @@
    {
        var db = SqlSugarHelper.GetInstance();

      
        int emergencyStatus = db.Queryable<MesQaItemsDetect01>() 

        int emergencyStatus = db.Queryable<MesQaItemsDetect01>()
                                .Where(t => t.Id == id)
                                .Select(t => t.EMERGENCY) 
                                .Select(t => t.EMERGENCY)
                                .First();

        if (emergencyStatus != 0)
@@ -207,12 +296,12 @@
                   .Where(t => t.Id == id)
                   .Select(t => t.LotNo1)
                   .First();
        


        var resultValue = outputResult.Value?.ToString();
        var messageValue = outputMessage.Value?.ToString();
        return new string[] { resultValue, messageValue, lotNo1?.ToString() ?? "" };
    }
    } 

    private string ExtractSubstring(string input, char startChar, char endChar)
    {
@@ -305,7 +394,9 @@
                a.FreQty,
                a.CheckQyt,
                a.FcheckResu,
                a.FcheckItemDesc,a.Funit
                a.FcheckItemDesc,
                a.Funit,
                a.Meom
            }).Select((a, b) => new MesQaItemsDetectDetail5
            {
                Id = a.Id,
@@ -327,7 +418,8 @@
                FcheckResu = a.FcheckResu,
                // FcheckItemDesc = a.FcheckItemDesc
                FcheckItemDesc = a.FspecRequ,
                Funit  =a.Funit
                Funit = a.Funit,
                Meom = a.Meom,
            }).ToList();
    }

@@ -604,6 +696,11 @@
                     it.Funit == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
                .Where(it => it.Id == dto.pid)
                .ExecuteCommand();
            return db.Updateable<MesQaItemsDetectDetail5>()
                 .SetColumns(it =>
                     it.Meom == dto.Meom) 
                .Where(it => it.Id == dto.pid)
                .ExecuteCommand();
        });
    }