From db5e488203b05d785baf1614b727afaf20a03fe6 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期五, 19 十二月 2025 18:52:05 +0800
Subject: [PATCH] llj备注
---
StandardInterface/MESApplication/Controllers/QC/LljController.cs | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/StandardInterface/MESApplication/Controllers/QC/LljController.cs b/StandardInterface/MESApplication/Controllers/QC/LljController.cs
index eb626a0..abe3718 100644
--- a/StandardInterface/MESApplication/Controllers/QC/LljController.cs
+++ b/StandardInterface/MESApplication/Controllers/QC/LljController.cs
@@ -1,4 +1,4 @@
-锘縰sing System.Dynamic;
+using System.Dynamic;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service.QC;
@@ -294,9 +294,7 @@
{
return ResponseResult.ResponseError(ex);
}
- }
-
- //IqcQaSubmit
+ } //IqcQaSubmit
[HttpPost("IqcQaSubmit")]
public ResponseResult IqcQaSubmit(LLJDto rkjDto)
{
@@ -305,6 +303,33 @@
dynamic resultInfos = new ExpandoObject();
var tbBillList =
new LljService().IqcQaSubmit(rkjDto);
+ resultInfos.tbBillList = tbBillList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 淇濆瓨澶囨敞鍒颁富琛�
+ /// </summary>
+ [HttpPost("saveLotNo1")]
+ public ResponseResult saveLotNo1([FromBody] JObject data)
+ {
+ var gid = Convert.ToDecimal(data["gid"].ToString());
+ var releaseNo = data["releaseNo"]?.ToString();
+ var lotNo1 = data["lotNo1"]?.ToString();
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList = new LljService().SaveLotNo1(gid, releaseNo, lotNo1);
resultInfos.tbBillList = tbBillList;
return new ResponseResult
{
@@ -366,10 +391,21 @@
public ResponseResult GetAttachments([FromBody] JObject data)
{
var itemNo = data["itemNo"]?.ToString();
+ var fversion = data["fversion"]?.ToString();
+ var fromPage = data["fromPage"]?.ToString();
+
+ // 鏍规嵁鏉ユ簮椤甸潰鍐冲畾鏄惁杩囨护
+ string filterFversion = null;
+ if (fromPage == "Detail" && !string.IsNullOrEmpty(fversion))
+ {
+ filterFversion = fversion; // Detail椤甸潰闇�瑕佽繃婊�
+ }
+ // Add椤甸潰涓嶄紶閫抐ilterFversion锛屾樉绀烘墍鏈夐檮浠�
+
try
{
dynamic resultInfos = new System.Dynamic.ExpandoObject();
- var tbBillList = new LljService().GetAttachments(itemNo);
+ var tbBillList = new LljService().GetAttachments(itemNo, filterFversion);
if (tbBillList == null || tbBillList.Count == 0)
{
return new ResponseResult
@@ -394,7 +430,7 @@
}
[HttpGet("PreviewFtpFile")]
- public IActionResult PreviewFtpFile([FromQuery] string itemNo, [FromQuery] string fileName, [FromQuery] string ftpServer)
+ public IActionResult PreviewFtpFile([FromQuery] string itemNo, [FromQuery] string fileName, [FromQuery] string ftpServer, [FromQuery] string fversion = null)
{
try
{
@@ -405,7 +441,7 @@
Response.Headers.Add("Access-Control-Expose-Headers", "Content-Type, Content-Length");
var service = new LljService();
- var fileBytes = service.GetFtpFile(itemNo, fileName, ftpServer);
+ var fileBytes = service.GetFtpFile(itemNo, fileName, ftpServer, fversion);
if (fileBytes == null || fileBytes.Length == 0)
{
@@ -424,7 +460,7 @@
}
[HttpGet("DownloadFtpFile")]
- public IActionResult DownloadFtpFile([FromQuery] string itemNo, [FromQuery] string fileName, [FromQuery] string ftpServer)
+ public IActionResult DownloadFtpFile([FromQuery] string itemNo, [FromQuery] string fileName, [FromQuery] string ftpServer, [FromQuery] string fversion = null)
{
try
{
@@ -435,7 +471,7 @@
Response.Headers.Add("Access-Control-Expose-Headers", "Content-Disposition, Content-Length, Content-Type");
var service = new LljService();
- var fileBytes = service.GetFtpFile(itemNo, fileName, ftpServer);
+ var fileBytes = service.GetFtpFile(itemNo, fileName, ftpServer, fversion);
if (fileBytes == null || fileBytes.Length == 0)
{
--
Gitblit v1.9.3