From 71af12d1d4abf46e4d4ba89a8e64c8a8dc190362 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期四, 27 三月 2025 18:56:15 +0800
Subject: [PATCH] 1.来料检list页面添加下拉框，可精准选择要筛选的项目 2.新建实验室送检接口
---
StandardPda/MESApplication/Controllers/QC/LljController.cs | 35 ++++++++++-
StandardPda/MES.Service/service/QC/LljService.cs | 84 +++++++++++++++++++++++++---
StandardPda/MES.Service/Dto/service/SysSubmit.cs | 23 +++++++
StandardPda/MES.Service/Dto/service/XJPageResult.cs | 7 ++
4 files changed, 136 insertions(+), 13 deletions(-)
diff --git a/StandardPda/MES.Service/Dto/service/SysSubmit.cs b/StandardPda/MES.Service/Dto/service/SysSubmit.cs
new file mode 100644
index 0000000..3dc1020
--- /dev/null
+++ b/StandardPda/MES.Service/Dto/service/SysSubmit.cs
@@ -0,0 +1,23 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MES.Service.Dto.service
+{
+ public class SysSubmit
+ {
+ public string? PI_BILLNO { get; set; }
+ public string? PI_USER { get; set; }
+ public string? PI_SAMPLE_STATUS { get; set; }
+ public string? PI_SAMPLE_TYPE { get; set; }
+ public string? PI_SAMPLE_REASON { get; set; }
+ public string? PI_INSPECT_TYPE { get; set; }
+ public string? PI_SAMPLE_PREPARATION { get; set; }
+ public string? PI_URGENCY { get; set; }
+ public string? PI_FIRMWAREVERSION { get; set; }
+ public string? PI_HARDWAREVERSION { get; set; }
+ public string? PI_REMARK { get; set; }
+ }
+}
diff --git a/StandardPda/MES.Service/Dto/service/XJPageResult.cs b/StandardPda/MES.Service/Dto/service/XJPageResult.cs
index e511381..dc3eb6a 100644
--- a/StandardPda/MES.Service/Dto/service/XJPageResult.cs
+++ b/StandardPda/MES.Service/Dto/service/XJPageResult.cs
@@ -10,7 +10,12 @@
public string? id { get; set; }
/// <summary>
- /// 鎼滅储鏉′欢锛屾牴鎹鏉′欢绛涢�変緵搴斿晢 鐗╂枡缂栫爜 鐗╂枡鍚嶇О鐨勬暟鎹�
+ /// 鎼滅储鏉′欢锛屽疄闄呯敤鎴疯緭鍏ョ殑鍐呭
/// </summary>
public string? SearchValue { get; set; }
+
+ /// <summary>
+ /// 涓嬫媺妗嗘悳绱㈡潯浠�
+ /// </summary>
+ public string? SelectedIndex { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/QC/LljService.cs b/StandardPda/MES.Service/service/QC/LljService.cs
index fc972d3..471b21c 100644
--- a/StandardPda/MES.Service/service/QC/LljService.cs
+++ b/StandardPda/MES.Service/service/QC/LljService.cs
@@ -51,14 +51,20 @@
// (a, b, c) => itemIds.Contains(a.ItemId))
.WhereIF(id > 0, (a, b, d) => a.Id == id)
.WhereIF(true, (a, b, d, e, f, g) => (g.Fcode == queryObj.createUser || g.Fcode == null))
- //鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉版悳绱�
- //.WhereIF(queryObj.SearchValue!=null && queryObj.SearchValue!="", (a) => a.SuppName == queryObj.SearchValue|| a.ItemName == queryObj.SearchValue || a.ItemNo == queryObj.SearchValue )
- .WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
- (a, b, d) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())
- || a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
- || a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())
- || d.ProjectCodes.ToLower().Contains(queryObj.SearchValue.ToLower())
- ))
+ //鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉帮紝椤圭洰鎼滅储
+ //.WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
+ //(a, b, d) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())
+ //|| a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
+ //|| a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())
+ //|| d.ProjectCodes.ToLower().Contains(queryObj.SearchValue.ToLower())
+ //))
+
+ //鏍规嵁涓嬫媺妗嗘悳绱㈡潯浠剁瓫閫夛紙0椤圭洰, 1鐗╂枡缂栧彿, 2鐗╂枡鍚嶇О, 3渚涘簲鍟�, 4閲囪喘鍛橈級
+ .WhereIF(queryObj.SelectedIndex == "0" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (d.ProjectCodes.ToLower().Contains(queryObj.SearchValue.ToLower())))
+ .WhereIF(queryObj.SelectedIndex == "1" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())))
+ .WhereIF(queryObj.SelectedIndex == "2" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())))
+ .WhereIF(queryObj.SelectedIndex == "3" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())))
+ .WhereIF(queryObj.SelectedIndex == "4" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d, e) => (e.Fname.ToLower().Contains(queryObj.SearchValue.ToLower())))
.OrderByDescending((a, b, d) => a.Id)
.Select((a, b, d, e, f, g) => new LtsLlj
{
@@ -192,7 +198,13 @@
//}
- //鏍规嵁妫�楠屾爣鍑嗘潵璁＄畻妫�楠屼釜鏁�
+ /// <summary>
+ /// 璋冪敤瀛樺偍杩囩▼锛岄噸鏂拌幏鍙栨楠岄」鐩�
+ /// </summary>
+ /// <param name="itemNo"></param>
+ /// <param name="quantity"></param>
+ /// <param name="releaseNo"></param>
+ /// <returns></returns>
public string[] SetItems(string itemNo,
decimal quantity, string releaseNo)
{
@@ -229,7 +241,61 @@
msg[1] = messageValue;
return msg;
+ }
+ public string[] SaveSysSubmit(SysSubmit sysSubmit)
+ {
+ // 瀹氫箟杈撳嚭鍙傛暟
+ var outputResult = new SugarParameter("o_Result", null,
+ DbType.Int32, ParameterDirection.Output,
+ 4000);
+ var outputMessage = new SugarParameter("o_Msg", null,
+ DbType.String,
+ ParameterDirection.Output, 4000);
+
+ // 瀹氫箟杈撳叆鍙傛暟
+ var parameters = new List<SugarParameter>
+ {
+ new("PI_BILLNO", sysSubmit.PI_BILLNO,
+ DbType.String, ParameterDirection.Input),
+ new("PI_USER", sysSubmit.PI_USER,
+ DbType.String, ParameterDirection.Input),
+ new("PI_SAMPLE_STATUS", sysSubmit.PI_SAMPLE_STATUS,
+ DbType.String, ParameterDirection.Input),
+ new("PI_SAMPLE_TYPE", sysSubmit.PI_SAMPLE_TYPE,
+ DbType.String, ParameterDirection.Input),
+ new("PI_SAMPLE_REASON", sysSubmit.PI_SAMPLE_REASON,
+ DbType.String, ParameterDirection.Input),
+ new("PI_INSPECT_TYPE", sysSubmit.PI_INSPECT_TYPE,
+ DbType.String, ParameterDirection.Input),
+ new("PI_SAMPLE_PREPARATION", sysSubmit.PI_SAMPLE_PREPARATION,
+ DbType.String, ParameterDirection.Input),
+ new("PI_URGENCY", sysSubmit.PI_URGENCY,
+ DbType.String, ParameterDirection.Input),
+ new("PI_FIRMWAREVERSION", sysSubmit.PI_FIRMWAREVERSION,
+ DbType.String, ParameterDirection.Input),
+ new("PI_HARDWAREVERSION", sysSubmit.PI_HARDWAREVERSION,
+ DbType.String, ParameterDirection.Input),
+ new("PI_REMARK", sysSubmit.PI_REMARK,
+ DbType.String, ParameterDirection.Input),
+ outputResult,
+ outputMessage
+ };
+
+ var db = SqlSugarHelper.GetInstance();
+
+ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+ db.Ado.ExecuteCommand(
+ "BEGIN PRC_MES_IQC_QC_SYSSUBMIT(:PI_BILLNO,:PI_USER,:PI_SAMPLE_STATUS,:PI_SAMPLE_TYPE,:PI_SAMPLE_REASON,:PI_INSPECT_TYPE,:PI_SAMPLE_PREPARATION,:PI_URGENCY,:PI_FIRMWAREVERSION,:PI_HARDWAREVERSION,:PI_REMARK, :o_Result, :o_Msg); END;",
+ parameters.ToArray());
+
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+ var resultValue = outputResult.Value?.ToString();
+ var messageValue = outputMessage.Value?.ToString();
+ string[] msg = new string[2];
+ msg[0] = resultValue;
+ msg[1] = messageValue;
+ return msg;
}
private string ExtractSubstring(string input, char startChar, char endChar)
diff --git a/StandardPda/MESApplication/Controllers/QC/LljController.cs b/StandardPda/MESApplication/Controllers/QC/LljController.cs
index 5e1b71e..79a84b6 100644
--- a/StandardPda/MESApplication/Controllers/QC/LljController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/LljController.cs
@@ -45,8 +45,8 @@
try
{
dynamic resultInfos = new ExpandoObject();
-
- string[] msg= new LljService().SetItems(itemNo, quantity, releaseNo);
+
+ string[] msg = new LljService().SetItems(itemNo, quantity, releaseNo);
return new ResponseResult
{
@@ -274,7 +274,11 @@
}
}
- //IqcQaSubmit
+ /// <summary>
+ /// 鑾峰彇U9鍥剧焊鏁版嵁
+ /// </summary>
+ /// <param name="data"></param>
+ /// <returns></returns>
[HttpPost("GetFileUrlByU9List")]
public async Task<ResponseResult> GetFileUrlByU9List([FromBody] JObject data)
{
@@ -310,4 +314,29 @@
return ResponseResult.ResponseError(ex);
}
}
+ /// <summary>
+ /// 瀹為獙瀹ら�佹鏁版嵁淇濆瓨
+ /// </summary>
+ /// <param name="sysSubmit">瀹為獙瀹ら�佹鏁版嵁</param>
+ /// <returns></returns>
+ [HttpPost("SaveSysSubmit")]
+ public ResponseResult SaveSysSubmit(SysSubmit sysSubmit)
+ {
+ try
+ {
+
+ string[] msg = new LljService().SaveSysSubmit(sysSubmit);
+
+ return new ResponseResult
+ {
+ status = int.Parse(msg[0]),
+ message = msg[1],
+ data = msg[1]
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3