From f9c7f114f3eabb14532bca76671598b130f91aeb Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期三, 24 九月 2025 16:47:52 +0800
Subject: [PATCH] SJ，LLJ,RKJ修改
---
StandardInterface/MES.Service/service/QC/RKJService.cs | 311 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 306 insertions(+), 5 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/RKJService.cs b/StandardInterface/MES.Service/service/QC/RKJService.cs
index 06e7a22..86c7046 100644
--- a/StandardInterface/MES.Service/service/QC/RKJService.cs
+++ b/StandardInterface/MES.Service/service/QC/RKJService.cs
@@ -1,10 +1,14 @@
锘縰sing MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
+using MES.Service.Modes.QcIssueResult;
+using MES.Service.service.QcIssueResult;
using MES.Service.util;
using SqlSugar;
using System.Linq;
using System.Data;
+using System.Net;
+using System.Web;
namespace MES.Service.service.QC;
@@ -305,11 +309,8 @@
QsCode = a.QsCode,
QsName = a.QsName,
isCheck = SqlFunc.AggregateCount(b.Id),
- Result = a.IsPass == 1 &&
- a.LevelNum == SqlFunc.AggregateCount(b.Id) ? "鍚堟牸"
- : a.IsPass == 0 &&
- a.LevelNum == SqlFunc.AggregateCount(b.Id) ? "涓嶅悎鏍�"
- : "鏈畬鎴�"
+ Result = SqlFunc.AggregateCount(b.Id) == 0 ? "鏈畬鎴�" :
+ a.IsPass == 1 ? "鍚堟牸" : "涓嶅悎鏍�"
}).OrderBy("result desc").ToList();
}
@@ -624,6 +625,13 @@
!"鏈畬鎴�".Equals(queryObj.result),
(a, da, b) => a.FcheckResu != null && a.FcheckResu != "")
.WhereIF(id > 0, (a, da, b) => a.Id == id)
+ // 娣诲姞fsubmit瀛楁杩囨护閫昏緫
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.fsubmit) && queryObj.fsubmit == "1",
+ (a, da, b) => a.Fsubmit == 1)
+ .WhereIF(
+ StringUtil.IsNullOrEmpty(queryObj.fsubmit) || queryObj.fsubmit == "0",
+ (a, da, b) => a.Fsubmit == 0 || a.Fsubmit == null)
.Select((a, da, b) => new QsItemOqcReq
{
Id = a.Id,
@@ -641,6 +649,11 @@
Remarks = a.Remarks,
WorkShop = a.WorkShop,
DepartmentId = a.DepartmentId,
+ Fsubmit = a.Fsubmit, // 娣诲姞fsubmit瀛楁鍒拌繑鍥炵粨鏋�
+ Blyy = a.Blyy, // 娣诲姞涓嶈壇鍘熷洜瀛楁
+ Pszt = a.Pszt, // 娣诲姞璇勫鐘舵�佸瓧娈�
+ Sscj = a.Sscj, // 娣诲姞鎵�灞炶溅闂村瓧娈�
+ FngDesc = a.FngDesc, // 娣诲姞涓嶈壇鎻忚堪瀛楁
// 浠庡叧鑱旇〃鑾峰彇鐨勫瓧娈�
ItemName = b.ItemName,
ItemModel = b.ItemModel,
@@ -811,6 +824,78 @@
{
return SqlSugarHelper.UseTransactionWithOracle(db =>
{
+ // 鑾峰彇妫�楠屽崟璇︾粏淇℃伅
+ var inspectionData = db.Queryable<QsItemOqcReq>()
+ .Where(it => it.Id == id)
+ .First();
+
+ if (inspectionData == null)
+ {
+ throw new Exception("妫�楠屽崟涓嶅瓨鍦�");
+ }
+
+ // 妫�鏌ラ拤閽夋帹閫佹潯浠讹細PSZT涓哄緟鍒わ紝涓斾笉鑹師鍥犮�佷笉鑹弿杩般�佹墍灞炶溅闂翠笉涓虹┖
+ bool shouldPushToDingTalk = inspectionData.Pszt == "寰呭垽" &&
+ !string.IsNullOrEmpty(inspectionData.Blyy) &&
+ !string.IsNullOrEmpty(inspectionData.FngDesc) &&
+ !string.IsNullOrEmpty(inspectionData.Sscj);
+
+ // 濡傛灉婊¤冻鎺ㄩ�佹潯浠讹紝鍒欐帹閫佸埌閽夐拤
+ if (shouldPushToDingTalk)
+ {
+ try
+ {
+ // 鏋勫缓閽夐拤鎺ㄩ�佹暟鎹�
+ var dingTalkData = new GetQcIssueResultDetail
+ {
+ FbatchQty = inspectionData.Quantity?.ToString(), // 閫佹鏁伴噺
+ ItemName = inspectionData.ItemName,
+ ItemNo = inspectionData.ItemNo,
+ SuppName = "鐢熶骇鍏ュ簱", // 鍥哄畾鍊�
+ AppicationReason = inspectionData.FngDesc, // 涓嶈壇鎻忚堪
+ BadReason = inspectionData.Blyy, // 涓嶈壇鍘熷洜
+ remark = inspectionData.Remarks,
+ ReleaseNo = inspectionData.ReleaseNo,
+ StaffNo = userNo,
+ IqcStatus = inspectionData.Pszt, // 璇勫鐘舵��
+ Department = inspectionData.Sscj, // 浣跨敤鎵�灞炶溅闂翠綔涓洪儴闂�
+ WorkShop = inspectionData.Sscj, // 鎵�灞炶溅闂�
+ EMERGENCY = "0" // 鍥哄畾鍊间负0
+ };
+
+ // 璋冪敤閽夐拤鎺ㄩ�佹湇鍔�
+ var qcIssueResultManager = new QcIssueResultManager();
+ string dingTalkResult = qcIssueResultManager.GetProcessNo(dingTalkData, "RKJ");
+
+ // 瑙ｆ瀽閽夐拤杩斿洖缁撴灉锛岃幏鍙栨祦绋嬪疄渚婭D
+ if (dingTalkResult.Contains("閽夐拤宸ヤ綔娴佸疄渚嬪惎鍔ㄦ垚鍔�"))
+ {
+ // 鎻愬彇instanceId
+ int startIndex = dingTalkResult.IndexOf("\"InstanceId\":\"") + 14;
+ int endIndex = dingTalkResult.IndexOf("\"", startIndex);
+ if (startIndex > 13 && endIndex > startIndex)
+ {
+ string instanceId = dingTalkResult.Substring(startIndex, endIndex - startIndex);
+
+ // 淇濆瓨閽夐拤娴佺▼淇℃伅
+ qcIssueResultManager.SaveProcessNo(
+ inspectionData.ReleaseNo,
+ instanceId,
+ userNo,
+ inspectionData.Sscj,
+ inspectionData.Pszt
+ );
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ // 閽夐拤鎺ㄩ�佸け璐ヤ笉褰卞搷妫�楠屾彁浜わ紝鍙褰曟棩蹇�
+ Console.WriteLine($"閽夐拤鎺ㄩ�佸け璐�: {ex.Message}");
+ }
+ }
+
+ // 鏇存柊妫�楠屽崟鐘舵��
return db.Updateable<QsItemOqcReq>()
.SetColumns(it => it.Fsubmit == 1) // 璁剧疆鎻愪氦鐘舵�佷负1锛堝凡鎻愪氦锛�
.SetColumns(it => it.FcheckBy == userNo) // 璁剧疆妫�楠屼汉
@@ -851,4 +936,220 @@
return (result, message);
}
+
+ /// <summary>
+ /// 鑾峰彇闄勪欢淇℃伅
+ /// </summary>
+ /// <param name="ItemNo">鐗╂枡缂栫爜</param>
+ /// <returns>闄勪欢鍒楄〃</returns>
+ public List<QamftpDto> GetAttachments(string ItemNo)
+ {
+ var db = SqlSugarHelper.GetInstance();
+ try
+ {
+ return db.Queryable<MesQamftp>()
+ .Where(x => x.ItemNo == ItemNo)
+ .OrderBy(x => x.Fdate, OrderByType.Desc)
+ .Select(x => new QamftpDto
+ {
+ Id = x.Id,
+ itemNo = x.ItemNo,
+ Ftype = x.Ftype,
+ Fattach = x.Fattach,
+ Fversion = x.Fversion,
+ Fdate = x.Fdate,
+ CreateBy = x.CreateBy,
+ CreateDate = x.CreateDate,
+ Company = x.Company,
+ Factory = x.Factory,
+ F_type = x.F_type,
+ LastupdateBy = x.LastupdateBy,
+ LastupdateDate = x.LastupdateDate,
+ ItemId = x.ItemId
+ }).ToList();
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鏌ヨ闄勪欢淇℃伅澶辫触: {ex.Message}");
+ }
+ }
+
+ /// <summary>
+ /// 浠嶧TP鏈嶅姟鍣ㄨ幏鍙栨枃浠�
+ /// </summary>
+ /// <param name="itemNo">鐗╂枡缂栫爜</param>
+ /// <param name="fileName">鏂囦欢鍚�</param>
+ /// <param name="ftpServer">FTP鏈嶅姟鍣ㄥ湴鍧�</param>
+ /// <returns>鏂囦欢瀛楄妭鏁扮粍</returns>
+ public byte[] GetFtpFile(string itemNo, string fileName, string ftpServer)
+ {
+ // 鍙傛暟楠岃瘉
+ if (string.IsNullOrEmpty(itemNo) || string.IsNullOrEmpty(fileName) || string.IsNullOrEmpty(ftpServer))
+ {
+ throw new ArgumentException("鍙傛暟涓嶈兘涓虹┖: itemNo, fileName, ftpServer");
+ }
+
+ string ftpUser = "hm_ftp";
+ string ftpPwd = "dell_123";
+
+ // 鏍囧噯鍖朏TP鏈嶅姟鍣ㄥ湴鍧�
+ string normalizedServer = NormalizeFtpServer(ftpServer);
+
+ // 鏋勫缓FTP鏂囦欢璺緞 - RKJ浣跨敤FQC鏂囦欢澶�
+ string ftpPath = $"{normalizedServer}/FQC/{itemNo}/{fileName}";
+
+ try
+ {
+ var request = (System.Net.FtpWebRequest)System.Net.WebRequest.Create(ftpPath);
+ request.Method = System.Net.WebRequestMethods.Ftp.DownloadFile;
+ request.Credentials = new System.Net.NetworkCredential(ftpUser, ftpPwd);
+ request.UseBinary = true;
+ request.UsePassive = false;
+ request.Timeout = 30000; // 30绉掕秴鏃�
+ request.ReadWriteTimeout = 30000;
+
+ using (var response = (System.Net.FtpWebResponse)request.GetResponse())
+ using (var ftpStream = response.GetResponseStream())
+ using (var ms = new System.IO.MemoryStream())
+ {
+ if (ftpStream == null)
+ {
+ throw new Exception("FTP鍝嶅簲娴佷负绌�");
+ }
+
+ ftpStream.CopyTo(ms);
+ var fileBytes = ms.ToArray();
+
+ if (fileBytes.Length == 0)
+ {
+ return null; // 鏂囦欢涓虹┖鎴栦笉瀛樺湪
+ }
+
+ return fileBytes;
+ }
+ }
+ catch (System.Net.WebException ex)
+ {
+ if (ex.Response is System.Net.FtpWebResponse ftpResponse)
+ {
+ switch (ftpResponse.StatusCode)
+ {
+ case System.Net.FtpStatusCode.ActionNotTakenFileUnavailable:
+ return null; // 鏂囦欢涓嶅瓨鍦�
+ case System.Net.FtpStatusCode.NotLoggedIn:
+ throw new Exception("FTP璁よ瘉澶辫触锛岃妫�鏌ョ敤鎴峰悕鍜屽瘑鐮�");
+ case System.Net.FtpStatusCode.ActionNotTakenFilenameNotAllowed:
+ throw new Exception("鏂囦欢鍚嶄笉琚厑璁告垨璺緞鏃犳晥");
+ default:
+ throw new Exception($"FTP閿欒 ({ftpResponse.StatusCode}): {ftpResponse.StatusDescription}");
+ }
+ }
+
+ // 澶勭悊瓒呮椂鍜岀綉缁滈敊璇�
+ if (ex.Status == System.Net.WebExceptionStatus.Timeout)
+ {
+ throw new Exception("FTP杩炴帴瓒呮椂锛岃绋嶅悗閲嶈瘯");
+ }
+
+ throw new Exception($"FTP杩炴帴澶辫触: {ex.Message}");
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鑾峰彇FTP鏂囦欢澶辫触: {ex.Message}");
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏂囦欢鍐呭绫诲瀷
+ /// </summary>
+ /// <param name="fileName">鏂囦欢鍚�</param>
+ /// <returns>鍐呭绫诲瀷</returns>
+ public string GetContentType(string fileName)
+ {
+ if (string.IsNullOrEmpty(fileName))
+ return "application/octet-stream";
+
+ var extension = System.IO.Path.GetExtension(fileName).ToLowerInvariant();
+ return extension switch
+ {
+ ".pdf" => "application/pdf",
+ ".jpg" or ".jpeg" => "image/jpeg",
+ ".png" => "image/png",
+ ".gif" => "image/gif",
+ ".bmp" => "image/bmp",
+ ".txt" => "text/plain",
+ ".doc" => "application/msword",
+ ".docx" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+ ".xls" => "application/vnd.ms-excel",
+ ".xlsx" => "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+ ".ppt" => "application/vnd.ms-powerpoint",
+ ".pptx" => "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+ _ => "application/octet-stream"
+ };
+ }
+
+ /// <summary>
+ /// 鏍囧噯鍖朏TP鏈嶅姟鍣ㄥ湴鍧�
+ /// </summary>
+ /// <param name="ftpServer">FTP鏈嶅姟鍣ㄥ湴鍧�</param>
+ /// <returns>鏍囧噯鍖栧悗鐨勫湴鍧�</returns>
+ private string NormalizeFtpServer(string ftpServer)
+ {
+ if (string.IsNullOrEmpty(ftpServer))
+ throw new ArgumentException("FTP鏈嶅姟鍣ㄥ湴鍧�涓嶈兘涓虹┖");
+
+ // 绉婚櫎鍙兘鐨勫崗璁墠缂�
+ var normalized = ftpServer.Trim();
+ if (normalized.StartsWith("ftp://", StringComparison.OrdinalIgnoreCase))
+ {
+ normalized = normalized.Substring(6);
+ }
+ else if (normalized.StartsWith("ftps://", StringComparison.OrdinalIgnoreCase))
+ {
+ normalized = normalized.Substring(7);
+ }
+
+ // 纭繚浠tp://寮�澶�
+ if (!normalized.StartsWith("ftp://", StringComparison.OrdinalIgnoreCase))
+ {
+ normalized = "ftp://" + normalized;
+ }
+
+ return normalized;
+ }
+
+ /// <summary>
+ /// 淇濆瓨涓嬫媺妗嗗瓧娈碉紙涓嶈壇鍘熷洜銆佽瘎瀹＄姸鎬併�佹墍灞炶溅闂达級
+ /// </summary>
+ /// <param name="dto">鍖呭惈瀛楁鏁版嵁鐨凞TO</param>
+ /// <returns>鏇存柊缁撴灉</returns>
+ public int SaveDropdownFields(RKJDto dto)
+ {
+ return SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ return db.Updateable<QsItemOqcReq>()
+ .SetColumns(it => it.Blyy == dto.BLYY)
+ .SetColumns(it => it.Pszt == dto.PSZT)
+ .SetColumns(it => it.Sscj == dto.SSCJ)
+ .Where(it => it.ReleaseNo == dto.releaseNo)
+ .ExecuteCommand();
+ });
+ }
+
+ /// <summary>
+ /// 淇濆瓨涓嶈壇鎻忚堪
+ /// </summary>
+ /// <param name="gid">妫�楠屽崟ID</param>
+ /// <param name="fngDesc">涓嶈壇鎻忚堪</param>
+ /// <returns>鏇存柊缁撴灉</returns>
+ public int SaveFngDesc(decimal gid, string fngDesc)
+ {
+ return SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ return db.Updateable<QsItemOqcReq>()
+ .SetColumns(it => it.FngDesc == fngDesc)
+ .Where(it => it.Id == gid)
+ .ExecuteCommand();
+ });
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3