From 41975878bf0b8d3632d8c5f21714502a57632070 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期三, 23 七月 2025 16:08:39 +0800
Subject: [PATCH] 紧急放行修改
---
StandardInterface/MES.Service/service/QC/LljService.cs | 422 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 409 insertions(+), 13 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index e07051c..0bd98f5 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -1,10 +1,12 @@
锘縰sing System.Data;
+using System.Xml;
using Masuit.Tools;
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
+using Tea.Utils;
using DbType = System.Data.DbType;
@@ -22,23 +24,36 @@
var totalCount = 0;
- //var itemIds = GetQaItem(db, queryObj.createUser);
-
- var pageList = db.Queryable<LtsLlj>()
+ var pageList = db.Queryable<LtsLlj, IqcBefore, SysUser,
+ IqcBeforeFrom, SysUser, SysUser>((a, b,
+ e, f, g, i) =>
+ new JoinQueryInfos(JoinType.Left, a.ItemId == b.ItemId,
+ JoinType.Left, a.CreateBy == e.Fcode,
+ JoinType.Left, f.Id == b.Pid,
+ JoinType.Left, f.Sid == Convert.ToDecimal(g.Fid),
+ JoinType.Left, f.CheckUser == i.Fcode
+ ))
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- a => a.FcheckResu == null)
+ (a, b,
+ e, f, g, i) => a.FcheckResu == null)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- a => a.FcheckResu != null)
- .WhereIF(id > 0, a => a.Id == id)
+ (a, b,
+ e, f, g, i) => a.FcheckResu != null)
+ .WhereIF(id > 0, (a, b,
+ e, f, g, i) => a.Id == id)
+ .WhereIF(queryObj.createUser != "PL017" && queryObj.UserIndex == "0", (a, b,
+ e, f, g, i) => (g.Fcode == queryObj.createUser || i.Fcode == queryObj.createUser ||
+ (g.Fcode == null && i.Fcode == null)))//鍒ゆ柇姝ゅ崟鐨勬楠屽憳锛屾垨鑰呮楠屼负绌哄氨鏄剧ず姝ゅ崟鎹�
//鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉版悳绱�
//.WhereIF(queryObj.SearchValue!=null && queryObj.SearchValue!="", (a) => a.SuppName == queryObj.SearchValue|| a.ItemName == queryObj.SearchValue || a.ItemNo == queryObj.SearchValue )
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
- a => a.SuppName.ToLower()
+ (a, b,
+ e, f, g, i) => a.SuppName.ToLower()
.Contains(queryObj.SearchValue.ToLower())
|| a.ItemName.ToLower()
.Contains(queryObj.SearchValue.ToLower())
@@ -50,10 +65,12 @@
.Contains(queryObj.SearchValue.ToLower())
|| a.ItemModel.ToLower()
.Contains(queryObj.SearchValue.ToLower()))
- .OrderByDescending(a => a.Id)
- .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+ // .OrderByDescending((a, b,
+ .OrderBy("CASE WHEN a.EMERGENCY = 1 THEN 0 ELSE 1 END, CASE WHEN a.STATUS = '宸叉彁浜�' THEN 0 ELSE 1 END, a.IQC_DATE desc, a.ID asc")
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+ var emergencyValues = pageList.Select(item => item.EMERGENCY).ToList();
return (pageList, totalCount);
}
@@ -102,6 +119,182 @@
return msg;
}
+ //绱ф�ユ斁琛�
+ //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() ?? "" };
+ //}
+
+
+
+
+
+ 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)
{
@@ -118,6 +311,201 @@
return input.Substring(startIndex + 1, length);
}
+ public List<QamftpDto> GetAttachments(string ItemNo)
+ {
+ if (string.IsNullOrEmpty(ItemNo))
+ {
+ throw new ArgumentException("妫�楠屽崟鍙蜂笉鑳戒负绌�");
+ }
+
+ var db = SqlSugarHelper.GetInstance();
+ try
+ {
+ return db.Queryable<MesQamftp>()
+ .Where(x => x.ItemNo == ItemNo)
+ .OrderBy(x => x.Fdate, OrderByType.Desc)
+ // .ThenBy(x => x.CreateDate, 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}");
+ }
+ }
+
+ 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鏂囦欢璺緞
+ string ftpPath = $"{normalizedServer}/IQC/{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($"鑾峰彇鏂囦欢澶辫触: {ex.Message}");
+ }
+ }
+
+ private string NormalizeFtpServer(string ftpServer)
+ {
+ if (string.IsNullOrEmpty(ftpServer))
+ {
+ throw new ArgumentException("FTP鏈嶅姟鍣ㄥ湴鍧�涓嶈兘涓虹┖");
+ }
+
+ // 纭繚浠tp://寮�澶�
+ string normalizedServer = ftpServer.StartsWith("ftp://") ? ftpServer : $"ftp://{ftpServer}";
+
+ // 鐗规畩澶勭悊宸茬煡鏈嶅姟鍣ㄥ湴鍧�
+ if (normalizedServer == "ftp://36.26.21.214")
+ {
+ normalizedServer = "ftp://36.26.21.214:21";
+ }
+ else if (!normalizedServer.Contains(":") && normalizedServer.StartsWith("ftp://"))
+ {
+ normalizedServer += ":21"; // 榛樿FTP绔彛
+ }
+
+ // 寮�鍙戠幆澧冧娇鐢ㄦ湰鍦版湇鍔″櫒
+ normalizedServer = "ftp://192.168.1.22:21";
+
+ return normalizedServer;
+ }
+
+ public string GetContentType(string fileName)
+ {
+ if (string.IsNullOrEmpty(fileName))
+ return "application/octet-stream";
+
+ var extension = System.IO.Path.GetExtension(fileName).ToLower();
+
+ return extension switch
+ {
+ // PDF鏂囦欢
+ ".pdf" => "application/pdf",
+
+ // 鍥剧墖鏂囦欢
+ ".jpg" or ".jpeg" => "image/jpeg",
+ ".png" => "image/png",
+ ".gif" => "image/gif",
+ ".bmp" => "image/bmp",
+ ".webp" => "image/webp",
+ ".svg" => "image/svg+xml",
+ ".ico" => "image/x-icon",
+
+ // 鏂囨湰鏂囦欢
+ ".txt" => "text/plain; charset=utf-8",
+ ".log" => "text/plain; charset=utf-8",
+ ".md" => "text/markdown; charset=utf-8",
+ ".csv" => "text/csv; charset=utf-8",
+ ".xml" => "text/xml; charset=utf-8",
+ ".json" => "application/json; charset=utf-8",
+
+ // Office鏂囨。
+ ".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",
+
+ // 鍘嬬缉鏂囦欢
+ ".zip" => "application/zip",
+ ".rar" => "application/x-rar-compressed",
+ ".7z" => "application/x-7z-compressed",
+
+ // 鍏朵粬甯歌鏍煎紡
+ ".dwg" => "application/acad",
+ ".dxf" => "application/dxf",
+ ".step" or ".stp" => "application/step",
+ ".iges" or ".igs" => "application/iges",
+
+ // 榛樿浜岃繘鍒舵祦
+ _ => "application/octet-stream"
+ };
+ }
public int saveItem(LLJDto rkjDto)
{
var items = rkjDto.items;
@@ -194,7 +582,9 @@
a.FreQty,
a.CheckQyt,
a.FcheckResu,
- a.FcheckItemDesc
+ a.FcheckItemDesc,
+ a.Funit,
+ a.Meom
}).Select((a, b) => new MesQaItemsDetectDetail5
{
Id = a.Id,
@@ -215,7 +605,9 @@
FenterQty = SqlFunc.AggregateCount(b.Id),
FcheckResu = a.FcheckResu,
// FcheckItemDesc = a.FcheckItemDesc
- FcheckItemDesc = a.FspecRequ
+ FcheckItemDesc = a.FspecRequ,
+ Funit = a.Funit,
+ Meom = a.Meom,
}).ToList();
}
@@ -477,6 +869,7 @@
return db.Updateable<MesQaItemsDetect01>()
.SetColumns(it =>
it.FngDesc == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
+ .SetColumns(it => it.PHSY == dto.PHSY)//鐮村潖瀹為獙鏁�
.Where(it => it.ReleaseNo == dto.releaseNo)
.ExecuteCommand();
});
@@ -488,8 +881,11 @@
return SqlSugarHelper.UseTransactionWithOracle(db =>
{
return db.Updateable<MesQaItemsDetectDetail5>()
- .SetColumns(it =>
- it.Funit == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
+ .SetColumns(it => new MesQaItemsDetectDetail5
+ {
+ Funit = dto.Remarks,
+ Meom = dto.Meom
+ })
.Where(it => it.Id == dto.pid)
.ExecuteCommand();
});
--
Gitblit v1.9.3