From 65438b8c1f9ec323c3c2ae265561dae4ff536379 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期四, 19 六月 2025 14:20:54 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK
---
StandardInterface/MES.Service/service/QC/LljService.cs | 125 +++++++++++++++++++++++++++++++++++++----
1 files changed, 111 insertions(+), 14 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index fe7b172..d5adec6 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/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();
});
}
--
Gitblit v1.9.3