From 8b24ad8df638deaa3fec77c1533c12ce6129eb71 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期一, 09 六月 2025 14:14:20 +0800
Subject: [PATCH] llj紧急放行接口
---
StandardInterface/MES.Service/service/QC/LljService.cs | 95 ++++++++++++++++++++++++++++++-
StandardInterface/MES.Service/Modes/LtsLlj.cs | 4 +
StandardInterface/MES.Service/Modes/MesQaItemsDetect01.cs | 6 ++
StandardInterface/MESApplication/Controllers/QC/LljController.cs | 43 ++++++++++++++
4 files changed, 144 insertions(+), 4 deletions(-)
diff --git a/StandardInterface/MES.Service/Modes/LtsLlj.cs b/StandardInterface/MES.Service/Modes/LtsLlj.cs
index 2aecc8a..5d25562 100644
--- a/StandardInterface/MES.Service/Modes/LtsLlj.cs
+++ b/StandardInterface/MES.Service/Modes/LtsLlj.cs
@@ -201,4 +201,8 @@
/// </summary>
[SugarColumn(IsIgnore = true)]
public string? NewFngDesc { get; set; }
+ /// <summary>
+ /// 绱ф�ユ斁琛屾爣璇�
+ /// </summary>
+ public int EMERGENCY { get; set; }
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Modes/MesQaItemsDetect01.cs b/StandardInterface/MES.Service/Modes/MesQaItemsDetect01.cs
index cebf04e..6dcf54a 100644
--- a/StandardInterface/MES.Service/Modes/MesQaItemsDetect01.cs
+++ b/StandardInterface/MES.Service/Modes/MesQaItemsDetect01.cs
@@ -459,4 +459,10 @@
/// </summary>
[SugarColumn(ColumnName = "MANAGER_USER")]
public string? ManagerUser { get; set; }
+
+ /// <summary>
+ /// 缁忕悊瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "MANAGER_USER")]
+ public int EMERGENCY { get; set; }
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index e07051c..733986e 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -52,8 +52,7 @@
.Contains(queryObj.SearchValue.ToLower()))
.OrderByDescending(a => a.Id)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
-
-
+ var emergencyValues = pageList.Select(item => item.EMERGENCY).ToList();
return (pageList, totalCount);
}
@@ -103,6 +102,92 @@
}
+ //绱ф�ユ斁琛�
+ 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() ?? "" };
+ }
private string ExtractSubstring(string input, char startChar, char endChar)
{
var startIndex = input.IndexOf(startChar);
@@ -194,7 +279,8 @@
a.FreQty,
a.CheckQyt,
a.FcheckResu,
- a.FcheckItemDesc
+ a.FcheckItemDesc,
+ a.Funit
}).Select((a, b) => new MesQaItemsDetectDetail5
{
Id = a.Id,
@@ -215,7 +301,8 @@
FenterQty = SqlFunc.AggregateCount(b.Id),
FcheckResu = a.FcheckResu,
// FcheckItemDesc = a.FcheckItemDesc
- FcheckItemDesc = a.FspecRequ
+ FcheckItemDesc = a.FspecRequ,
+ Funit = a.Funit
}).ToList();
}
diff --git a/StandardInterface/MESApplication/Controllers/QC/LljController.cs b/StandardInterface/MESApplication/Controllers/QC/LljController.cs
index 2c242fe..8112f51 100644
--- a/StandardInterface/MESApplication/Controllers/QC/LljController.cs
+++ b/StandardInterface/MESApplication/Controllers/QC/LljController.cs
@@ -273,4 +273,47 @@
return ResponseResult.ResponseError(ex);
}
}
+ [HttpPost("EmergencyRelease")]
+ public ResponseResult EmergencyRelease([FromBody] JObject data)
+ {
+ var id = Convert.ToInt32(data["id"].ToString());
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList = new LljService().EmergencyRelease(id);
+ resultInfos.tbBillList = tbBillList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ [HttpPost("WithdrawEmergencyRelease")]
+ public ResponseResult WithdrawEmergencyRelease([FromBody] JObject data)
+ {
+ var id = Convert.ToInt32(data["id"].ToString());
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList = new LljService().WithdrawEmergencyRelease(id);
+ resultInfos.tbBillList = tbBillList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3