From 2f11a821259c77d8e48bb0b83e7f01b0f529b10a Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期三, 23 四月 2025 11:16:02 +0800
Subject: [PATCH] 3月27号首检巡检增加ftp获取文件列表
---
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/MESApplication.deps.json | 5
MES.Service/service/QC/SJService.cs | 81 +++++++++++
MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.dll | 0
MESApplication/bin/Release/net8.0/MESApplication.dll | 0
MESApplication/bin/Debug/net8.0/MESApplication.deps.json | 5
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/MESApplication.pdb | 0
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.dll | 0
MESApplication/Properties/launchSettings.json | 31 ++--
MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json | 5
MES.Service/service/QC/XJService.cs | 4
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MESApplication/Controllers/QC/SJController.cs | 131 ++++++++++++++++++
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Modes/QsQaItemXj.cs | 6
MESApplication/bin/Debug/net8.0/log/2025031715.log | 3
MES.Service/util/FileDownloadResult.cs | 9 +
MESApplication/MESApplication.csproj.user | 2
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user | 4
MESApplication/Controllers/QC/XJController.cs | 128 ++++++++++++++++++
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/bin/Release/net8.0/MES.Service.dll | 0
MES.Service/bin/Release/net8.0/MES.Service.pdb | 0
MES.Service/Modes/QsQaItemXj02.cs | 2
33 files changed, 383 insertions(+), 33 deletions(-)
diff --git a/MES.Service/Modes/QsQaItemXj.cs b/MES.Service/Modes/QsQaItemXj.cs
index 28c435a..074b335 100644
--- a/MES.Service/Modes/QsQaItemXj.cs
+++ b/MES.Service/Modes/QsQaItemXj.cs
@@ -124,6 +124,12 @@
[SugarColumn(ColumnName = "ITEM_ID")]
public decimal? ItemId { get; set; }
+ /// <summary>
+ /// 绾夸綋
+ /// </summary>
+ [SugarColumn(ColumnName = "LINE")]
+ public string? Line { get; set; }
+
[SugarColumn(IsIgnore = true)] public string? Daa020 { get; set; }
[SugarColumn(IsIgnore = true)] public decimal? PlanQty { get; set; }
diff --git a/MES.Service/Modes/QsQaItemXj02.cs b/MES.Service/Modes/QsQaItemXj02.cs
index 02d930c..553aba1 100644
--- a/MES.Service/Modes/QsQaItemXj02.cs
+++ b/MES.Service/Modes/QsQaItemXj02.cs
@@ -42,7 +42,7 @@
public string? Fstand { get; set; }
/// <summary>
- /// 棣栨涓昏〃id
+ /// 宸℃涓昏〃id
/// </summary>
[Column("GID")]
[SugarColumn(ColumnName = "GID")] //鐢ㄤ簬SqlSugar
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index 4c117f8..0e54cb2 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
index 31ec636..a090e7f 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.dll b/MES.Service/bin/Release/net8.0/MES.Service.dll
index 5110f8b..89c1349 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.pdb b/MES.Service/bin/Release/net8.0/MES.Service.pdb
index 392bed0..6d46b3f 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index 47459cd..f853ea4 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -4,6 +4,7 @@
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
+using System.Net;
using System.Xml.Linq;
namespace MES.Service.service.QC;
@@ -69,7 +70,7 @@
.OrderBy(a => a.BillNo, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit);
- if(queryObj.Id != null)
+ /*if(queryObj.Id != null)
{
@@ -88,7 +89,7 @@
return commit;
});
- }
+ }*/
@@ -581,4 +582,80 @@
return withOracle;
}
+
+
+
+ public List<string> GetFtpFileList(string ftpAddress, string username, string password, string remotePath)
+ {
+ List<string> fileList = new List<string>();
+ try
+ {
+ // 鏋勯�燜TP璇锋眰鐨刄RI
+ string requestUri = $"{ftpAddress}/{remotePath}".TrimEnd('/'); // 纭繚璺緞鏍煎紡姝ｇ‘
+
+ // 鍒涘缓FtpWebRequest瀵硅薄
+ FtpWebRequest ftpRequest = (FtpWebRequest)WebRequest.Create(requestUri);
+ ftpRequest.Method = WebRequestMethods.Ftp.ListDirectory;
+ ftpRequest.Credentials = new NetworkCredential(username, password);
+ ftpRequest.UseBinary = true;
+
+ // 鑾峰彇鍝嶅簲
+ using (FtpWebResponse ftpResponse = (FtpWebResponse)ftpRequest.GetResponse())
+ {
+ using (StreamReader responseReader = new StreamReader(ftpResponse.GetResponseStream()))
+ {
+ string line = responseReader.ReadLine();
+ while (line != null)
+ {
+ fileList.Add(line);
+ line = responseReader.ReadLine();
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine("鑾峰彇FTP鏂囦欢鍒楄〃鏃跺彂鐢熼敊璇�: " + ex.Message);
+
+ }
+ return fileList;
+ }
+
+
+ public byte[] DownloadFtpFile(string ftpAddress, string username, string password, string remotePath)
+ {
+ byte[] fileData = null;
+ try
+ {
+ // 鏋勯�燜TP璇锋眰鐨刄RI
+ string requestUri = $"{ftpAddress}/{remotePath}".TrimEnd('/'); // 纭繚璺緞鏍煎紡姝ｇ‘
+
+ // 鍒涘缓FtpWebRequest瀵硅薄
+ FtpWebRequest ftpRequest = (FtpWebRequest)WebRequest.Create(requestUri);
+ ftpRequest.Method = WebRequestMethods.Ftp.DownloadFile;
+ ftpRequest.Credentials = new NetworkCredential(username, password);
+ ftpRequest.UseBinary = true;
+
+ // 鑾峰彇鍝嶅簲
+ using (FtpWebResponse ftpResponse = (FtpWebResponse)ftpRequest.GetResponse())
+ {
+ using (Stream responseStream = ftpResponse.GetResponseStream())
+ using (MemoryStream memoryStream = new MemoryStream())
+ {
+ responseStream.CopyTo(memoryStream);
+ fileData = memoryStream.ToArray();
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine("涓嬭浇FTP鏂囦欢鏃跺彂鐢熼敊璇�: " + ex.Message);
+ }
+ return fileData;
+ }
+
+
+
+
+
}
\ No newline at end of file
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index d548f02..e2fa544 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -344,6 +344,10 @@
{
foreach (var item in items) item.Pid = xjDto.gid;
+ //鏂板鍓嶅厛杩涜鍒犻櫎鏃ч」鐩紙瑕嗙洊鎿嶄綔锛�
+ db.Deleteable<QsQaItemXj01>().Where(it => it.Pid == xjDto.gid).ExecuteCommand();
+ db.Deleteable<QsQaItemXj02>().Where(it => it.Gid == xjDto.gid).ExecuteCommand();
+
return db.Insertable(items).ExecuteCommand();
});
diff --git a/MES.Service/util/FileDownloadResult.cs b/MES.Service/util/FileDownloadResult.cs
new file mode 100644
index 0000000..dd72dfc
--- /dev/null
+++ b/MES.Service/util/FileDownloadResult.cs
@@ -0,0 +1,9 @@
+锘縩amespace MES.Service.util;
+
+public class FileDownloadResult
+ {
+ public string Url { get; set; } // 鏂囦欢涓嬭浇URL
+ public string MimeType { get; set; } // 鏂囦欢绫诲瀷
+ public string FileName { get; set; } // 鏂囦欢鍚�
+ }
+
diff --git a/MESApplication/Controllers/QC/SJController.cs b/MESApplication/Controllers/QC/SJController.cs
index a4f2d9d..e5e7a09 100644
--- a/MESApplication/Controllers/QC/SJController.cs
+++ b/MESApplication/Controllers/QC/SJController.cs
@@ -1,4 +1,5 @@
锘縰sing System.Dynamic;
+using System.Net;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service.QC;
@@ -398,4 +399,134 @@
return ResponseResult.ResponseError(ex);
}
}
+
+
+
+ //FTPLIST
+ [HttpPost("ftpList")]
+ public async Task<ResponseResult> getFtpList([FromBody] JObject data)
+ {
+ var itemno = data["itemno"]?.ToString();
+
+ if (itemno == null || itemno =="") return new ResponseResult
+ {
+ status = 1,
+ message = "鏈壘鍒拌浜у搧鐨勬枃浠朵俊鎭�",
+ data = "鏈壘鍒拌浜у搧鐨勬枃浠朵俊鎭�"
+ };
+
+ var ftpAddress = "ftp://192.168.1.223:21";
+ var username = "administrator";
+ var password = "Rdyl8888";
+ var remotePath = "PQC/SJ/" + itemno;
+
+
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+
+ var ftpFiles = new SJService().GetFtpFileList(ftpAddress, username, password, remotePath);
+ resultInfos.tbBillList = ftpFiles;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+
+ [HttpPost("download")]
+ public async Task<IActionResult> DownloadFile([FromBody] JObject data)
+ {
+ var fileName = data["fileName"]?.ToString();
+ var itemno = data["itemno"]?.ToString();
+
+ var ftpAddress = "ftp://192.168.1.223:21";
+ var username = "administrator";
+ var password = "Rdyl8888";
+ var remotePath = "PQC/SJ/" + itemno;
+
+ try
+ {
+ byte[] fileData = new SJService().DownloadFtpFile(ftpAddress, username, password, $"{remotePath}/{fileName}"); // 鎷兼帴瀹屾暣璺緞
+
+ // 鐢熸垚涓存椂璁块棶 URL锛堢ず渚嬮�昏緫锛�
+ var tempFileId = Guid.NewGuid().ToString();
+ // 灏嗘枃浠剁紦瀛樺埌涓存椂鐩綍锛堝疄闄呴」鐩渶鑰冭檻娓呯悊鏈哄埗锛�
+ var tempPath = Path.Combine(Path.GetTempPath(), tempFileId);
+ System.IO.File.WriteAllBytes(tempPath, fileData);
+
+ // 杩斿洖鍙洿鎺ヨ闂殑 URL
+ var baseUrl = $"{Request.Scheme}://{Request.Host}";
+
+
+
+ return Ok(new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = new
+ {
+ url = $"{baseUrl}/api/SJ/downloadTemp?fileId={tempFileId}&fileName={fileName}",
+ mimeType = GetMimeType(fileName)
+ }
+ });
+ }
+ catch (Exception ex)
+ {
+ return BadRequest(ResponseResult.ResponseError(ex));
+ }
+ }
+
+
+ private string GetMimeType(string fileName)
+ {
+ string mimeType = "application/octet-stream";
+ if (fileName.EndsWith(".jpg") || fileName.EndsWith(".jpeg"))
+ {
+ mimeType = "image/jpeg";
+ }
+ else if (fileName.EndsWith(".png"))
+ {
+ mimeType = "image/png";
+ }
+ else if (fileName.EndsWith(".gif"))
+ {
+ mimeType = "image/gif";
+ }
+ else if (fileName.EndsWith(".pdf"))
+ {
+ mimeType = "application/pdf";
+ }
+ else if (fileName.EndsWith(".doc") || fileName.EndsWith(".docx"))
+ {
+ mimeType = "application/msword";
+ }
+ else if (fileName.EndsWith(".xls") || fileName.EndsWith(".xlsx"))
+ {
+ mimeType = "application/vnd.ms-excel";
+ }
+ return mimeType;
+ }
+
+
+ [HttpGet("downloadTemp")]
+ public IActionResult DownloadTemp(string fileId, string fileName)
+ {
+ var tempPath = Path.Combine(Path.GetTempPath(), fileId);
+ if (!System.IO.File.Exists(tempPath))
+ {
+ return NotFound();
+ }
+ var fileBytes = System.IO.File.ReadAllBytes(tempPath);
+ return File(fileBytes, GetMimeType(fileName), fileName);
+ }
+
}
\ No newline at end of file
diff --git a/MESApplication/Controllers/QC/XJController.cs b/MESApplication/Controllers/QC/XJController.cs
index 9849c34..ce0142a 100644
--- a/MESApplication/Controllers/QC/XJController.cs
+++ b/MESApplication/Controllers/QC/XJController.cs
@@ -495,4 +495,132 @@
return ResponseResult.ResponseError(ex);
}
}
+
+ //FTPLIST
+ [HttpPost("ftpList")]
+ public async Task<ResponseResult> getFtpList([FromBody] JObject data)
+ {
+ var itemno = data["itemno"]?.ToString();
+
+ if (itemno == null || itemno == "") return new ResponseResult
+ {
+ status = 1,
+ message = "鏈壘鍒拌浜у搧鐨勬枃浠朵俊鎭�",
+ data = "鏈壘鍒拌浜у搧鐨勬枃浠朵俊鎭�"
+ };
+
+ var ftpAddress = "ftp://192.168.1.223:21";
+ var username = "administrator";
+ var password = "Rdyl8888";
+ var remotePath = "PQC/XJ/" + itemno;
+
+
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+
+ var ftpFiles = new SJService().GetFtpFileList(ftpAddress, username, password, remotePath);
+ resultInfos.tbBillList = ftpFiles;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+
+ [HttpPost("download")]
+ public async Task<IActionResult> DownloadFile([FromBody] JObject data)
+ {
+ var fileName = data["fileName"]?.ToString();
+ var itemno = data["itemno"]?.ToString();
+
+ var ftpAddress = "ftp://192.168.1.223:21";
+ var username = "administrator";
+ var password = "Rdyl8888";
+ var remotePath = "PQC/XJ/" + itemno;
+
+ try
+ {
+ byte[] fileData = new SJService().DownloadFtpFile(ftpAddress, username, password, $"{remotePath}/{fileName}"); // 鎷兼帴瀹屾暣璺緞
+
+ // 鐢熸垚涓存椂璁块棶 URL锛堢ず渚嬮�昏緫锛�
+ var tempFileId = Guid.NewGuid().ToString();
+ // 灏嗘枃浠剁紦瀛樺埌涓存椂鐩綍锛堝疄闄呴」鐩渶鑰冭檻娓呯悊鏈哄埗锛�
+ var tempPath = Path.Combine(Path.GetTempPath(), tempFileId);
+ System.IO.File.WriteAllBytes(tempPath, fileData);
+
+ // 杩斿洖鍙洿鎺ヨ闂殑 URL
+ var baseUrl = $"{Request.Scheme}://{Request.Host}";
+
+
+
+ return Ok(new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = new
+ {
+ url = $"{baseUrl}/api/XJ/downloadTemp?fileId={tempFileId}&fileName={fileName}",
+ mimeType = GetMimeType(fileName)
+ }
+ });
+ }
+ catch (Exception ex)
+ {
+ return BadRequest(ResponseResult.ResponseError(ex));
+ }
+ }
+
+
+ private string GetMimeType(string fileName)
+ {
+ string mimeType = "application/octet-stream";
+ if (fileName.EndsWith(".jpg") || fileName.EndsWith(".jpeg"))
+ {
+ mimeType = "image/jpeg";
+ }
+ else if (fileName.EndsWith(".png"))
+ {
+ mimeType = "image/png";
+ }
+ else if (fileName.EndsWith(".gif"))
+ {
+ mimeType = "image/gif";
+ }
+ else if (fileName.EndsWith(".pdf"))
+ {
+ mimeType = "application/pdf";
+ }
+ else if (fileName.EndsWith(".doc") || fileName.EndsWith(".docx"))
+ {
+ mimeType = "application/msword";
+ }
+ else if (fileName.EndsWith(".xls") || fileName.EndsWith(".xlsx"))
+ {
+ mimeType = "application/vnd.ms-excel";
+ }
+ return mimeType;
+ }
+
+
+ [HttpGet("downloadTemp")]
+ public IActionResult DownloadTemp(string fileId, string fileName)
+ {
+ var tempPath = Path.Combine(Path.GetTempPath(), fileId);
+ if (!System.IO.File.Exists(tempPath))
+ {
+ return NotFound();
+ }
+ var fileBytes = System.IO.File.ReadAllBytes(tempPath);
+ return File(fileBytes, GetMimeType(fileName), fileName);
+ }
+
}
\ No newline at end of file
diff --git a/MESApplication/MESApplication.csproj.user b/MESApplication/MESApplication.csproj.user
index 6ff63cb..66f91bf 100644
--- a/MESApplication/MESApplication.csproj.user
+++ b/MESApplication/MESApplication.csproj.user
@@ -5,6 +5,6 @@
</PropertyGroup>
<PropertyGroup>
<ActiveDebugProfile>IIS Express</ActiveDebugProfile>
- <NameOfLastUsedPublishProfile>E:\Desktop\鏂板缓鏂囦欢澶筡RD_MES_Api\MESApplication\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>F:\F鐩樻闈笓灞瀄娑﹁揪椤圭洰\娑﹁揪椤圭洰api\StandardPda\MESApplication\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
index 5dcaec7..9378eae 100644
--- a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,8 +4,8 @@
-->
<Project>
<PropertyGroup>
- <_PublishTargetUrl>E:\Desktop\鏂板缓鏂囦欢澶筡RD_MES_Api\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
- <History>True|2025-03-10T08:49:08.3476948Z||;True|2024-12-24T15:39:58.5366570+08:00||;True|2024-11-26T18:32:03.9568766+08:00||;True|2024-11-21T02:11:35.8050745+08:00||;True|2024-09-21T16:35:22.6651659+08:00||;True|2024-09-21T16:14:11.3450387+08:00||;True|2024-09-19T17:16:11.7338751+08:00||;True|2024-09-19T17:11:21.0116707+08:00||;True|2024-09-19T13:54:25.7455472+08:00||;True|2024-09-15T13:55:51.7095153+08:00||;True|2024-09-12T17:10:20.4734556+08:00||;True|2024-09-10T15:54:07.7463519+08:00||;True|2024-09-06T14:40:56.3762241+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
+ <_PublishTargetUrl>F:\F鐩樻闈笓灞瀄娑﹁揪椤圭洰\娑﹁揪椤圭洰api\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
+ <History>True|2025-03-27T15:22:42.3501020Z;True|2025-03-10T16:49:08.3476948+08:00;True|2024-12-24T15:39:58.5366570+08:00;True|2024-11-26T18:32:03.9568766+08:00;True|2024-11-21T02:11:35.8050745+08:00;True|2024-09-21T16:35:22.6651659+08:00;True|2024-09-21T16:14:11.3450387+08:00;True|2024-09-19T17:16:11.7338751+08:00;True|2024-09-19T17:11:21.0116707+08:00;True|2024-09-19T13:54:25.7455472+08:00;True|2024-09-15T13:55:51.7095153+08:00;True|2024-09-12T17:10:20.4734556+08:00;True|2024-09-10T15:54:07.7463519+08:00;True|2024-09-06T14:40:56.3762241+08:00;True|2024-08-20T17:12:00.2924570+08:00;True|2024-08-17T10:57:05.6670396+08:00;True|2024-08-17T10:56:46.8068041+08:00;True|2024-08-16T14:09:17.0526491+08:00;True|2024-08-15T08:40:32.8134665+08:00;True|2024-08-14T10:00:27.7017207+08:00;True|2024-08-14T08:54:44.8284031+08:00;True|2024-08-07T10:32:10.3689256+08:00;True|2024-08-05T15:45:03.0864530+08:00;True|2024-08-03T09:59:13.7916520+08:00;True|2024-07-31T17:27:28.1965929+08:00;True|2024-07-31T15:27:34.7943845+08:00;True|2024-07-30T15:04:50.5849235+08:00;True|2024-07-30T14:09:06.2877325+08:00;True|2024-07-29T16:11:30.4493940+08:00;True|2024-07-23T14:30:34.4591002+08:00;True|2024-07-22T14:17:39.8186158+08:00;True|2024-04-10T12:55:31.3963752+08:00;True|2024-04-08T13:59:25.5487203+08:00;True|2024-04-06T09:30:09.5350539+08:00;True|2024-04-06T08:46:05.8814658+08:00;True|2024-04-05T14:06:52.0448024+08:00;True|2024-04-05T12:47:46.0561601+08:00;True|2024-02-26T08:46:22.0988887+08:00;True|2024-02-24T19:17:13.6770376+08:00;True|2024-02-24T14:32:37.4450337+08:00;True|2024-02-23T10:22:06.5150173+08:00;True|2024-02-22T13:19:56.6997993+08:00;True|2024-02-22T10:53:17.7929585+08:00;True|2024-02-21T17:08:06.5553444+08:00;True|2024-02-19T16:24:37.4912012+08:00;True|2024-02-02T10:07:23.2726075+08:00;True|2024-02-02T08:36:49.2904460+08:00;True|2024-01-29T17:44:43.6800769+08:00;True|2024-01-23T09:47:26.7811926+08:00;True|2024-01-18T16:23:30.3373836+08:00;True|2024-01-17T14:22:04.2552286+08:00;True|2024-01-16T16:54:42.2316892+08:00;True|2024-01-16T16:37:23.8028858+08:00;True|2024-01-16T09:25:24.4007775+08:00;True|2024-01-15T10:18:57.3362616+08:00;True|2024-01-15T10:07:14.2044763+08:00;True|2024-01-10T14:03:36.4451130+08:00;True|2024-01-09T16:45:32.9601815+08:00;True|2024-01-06T14:16:34.2732220+08:00;True|2024-01-06T14:11:45.2134717+08:00;True|2024-01-06T11:30:58.9198887+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/MESApplication/Properties/launchSettings.json b/MESApplication/Properties/launchSettings.json
index 2b619d7..b1c68c4 100644
--- a/MESApplication/Properties/launchSettings.json
+++ b/MESApplication/Properties/launchSettings.json
@@ -1,23 +1,14 @@
-锘縶
- "$schema": "http://json.schemastore.org/launchsettings.json",
- "iisSettings": {
- "windowsAuthentication": false,
- "anonymousAuthentication": true,
- "iisExpress": {
- "applicationUrl": "http://localhost:10054",
- "sslPort": 0
- }
- },
+{
"profiles": {
"http": {
"commandName": "Project",
- "dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
- "applicationUrl": "http://localhost:5184",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
- }
+ },
+ "dotnetRunMessages": true,
+ "applicationUrl": "http://localhost:5184"
},
"IIS Express": {
"commandName": "IISExpress",
@@ -25,7 +16,17 @@
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
- }
+ },
+ "nativeDebugging": true
+ }
+ },
+ "$schema": "http://json.schemastore.org/launchsettings.json",
+ "iisSettings": {
+ "windowsAuthentication": false,
+ "anonymousAuthentication": true,
+ "iisExpress": {
+ "applicationUrl": "http://192.168.1.164:10054",
+ "sslPort": 0
}
}
-}
+}
\ No newline at end of file
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index 4c117f8..0e54cb2 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
index 31ec636..a090e7f 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.deps.json b/MESApplication/bin/Debug/net8.0/MESApplication.deps.json
index 95a84e5..a38b276 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.deps.json
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.deps.json
@@ -1412,10 +1412,7 @@
"SqlSugarCore": "5.1.4.158"
},
"runtime": {
- "MES.Service.dll": {
- "assemblyVersion": "1.0.0",
- "fileVersion": "1.0.0.0"
- }
+ "MES.Service.dll": {}
}
}
}
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll
index 022c527..3f63ff0 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.exe b/MESApplication/bin/Debug/net8.0/MESApplication.exe
index 07b19ec..8baae59 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
index c8cfe27..8cbcfab 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/log/2025031715.log b/MESApplication/bin/Debug/net8.0/log/2025031715.log
new file mode 100644
index 0000000..6aa5d8f
--- /dev/null
+++ b/MESApplication/bin/Debug/net8.0/log/2025031715.log
@@ -0,0 +1,3 @@
+2025-03-17 15:13:04:390 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.SJController.getWrokNoDatile(JObject data) in F:\\F鐩樻闈笓灞瀄\娑﹁揪椤圭洰\\娑﹁揪椤圭洰api\\StandardPda\\MESApplication\\Controllers\\QC\\SJController.cs:line 90\r\n at lambda_method265(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeActionMethodAsync()\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.Next(State& next, Scope& scope, Object& state, Boolean& isCompleted)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeNextActionFilterAsync()","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-03-17 15:13:04:427 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index 5110f8b..89c1349 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.pdb b/MESApplication/bin/Release/net8.0/MES.Service.pdb
index 392bed0..6d46b3f 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.deps.json b/MESApplication/bin/Release/net8.0/MESApplication.deps.json
index 95a84e5..a38b276 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.deps.json
+++ b/MESApplication/bin/Release/net8.0/MESApplication.deps.json
@@ -1412,10 +1412,7 @@
"SqlSugarCore": "5.1.4.158"
},
"runtime": {
- "MES.Service.dll": {
- "assemblyVersion": "1.0.0",
- "fileVersion": "1.0.0.0"
- }
+ "MES.Service.dll": {}
}
}
}
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.dll b/MESApplication/bin/Release/net8.0/MESApplication.dll
index 2dda0e9..f7602f1 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.exe b/MESApplication/bin/Release/net8.0/MESApplication.exe
index 07b19ec..8baae59 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.pdb b/MESApplication/bin/Release/net8.0/MESApplication.pdb
index 55577fe..4587e80 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
index 5110f8b..89c1349 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
index 392bed0..6d46b3f 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json b/MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json
index 6cd3c2a..e23a3b1 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json
@@ -1160,10 +1160,7 @@
"SqlSugarCore": "5.1.4.158"
},
"runtime": {
- "MES.Service.dll": {
- "assemblyVersion": "1.0.0",
- "fileVersion": "1.0.0.0"
- }
+ "MES.Service.dll": {}
}
}
}
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
index 2dda0e9..f7602f1 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
index 07b19ec..8baae59 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
index 55577fe..4587e80 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ
--
Gitblit v1.9.3