From dabfdd9dbf0364b1134daaad86af7e13f6437295 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期四, 30 十月 2025 12:40:30 +0800
Subject: [PATCH] XJ,SJ,RKJ检验项目序号,LLJ单个检验项目FTP附件信息

---
 StandardInterface/MES.Service/service/QC/SJService.cs |  554 +++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 492 insertions(+), 62 deletions(-)

diff --git a/StandardInterface/MES.Service/service/QC/SJService.cs b/StandardInterface/MES.Service/service/QC/SJService.cs
index 91e8c9e..fc8c81e 100644
--- a/StandardInterface/MES.Service/service/QC/SJService.cs
+++ b/StandardInterface/MES.Service/service/QC/SJService.cs
@@ -44,69 +44,145 @@
         if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
             lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
 
-        var query = db.Queryable<SJPageResult>()
-            .WhereIF(lineNo != null && lineNo.Length > 0,
-                a => lineNo.Contains(a.line))
-            .WhereIF(queryObj.Id != null, a => a.Id == queryObj.Id)
-            .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
-                a => a.BillNo == queryObj.BillNo)
-            .WhereIF(
-                StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
-                "鏈畬鎴�".Equals(queryObj.Result),
-                a => a.Fsubmit == 0)
-            .WhereIF(
-                StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
-                !"鏈畬鎴�".Equals(queryObj.Result),
-                a => a.Fsubmit == 1);
-
-        // 鏂板鐨勫姩鎬佹悳绱㈤�昏緫
-        if (!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField))
+        // 濡傛灉鏈夎溅闂存垨绾夸綋绛涢�夛紝闇�瑕佽仈鎺� MES_LINE 琛�
+        if (!string.IsNullOrEmpty(queryObj.departmentId) || !string.IsNullOrEmpty(queryObj.lineId))
         {
-            switch (queryObj.searchField)
+            var query = db.Queryable<SJPageResult, MesLine>((a, m) => 
+                    new JoinQueryInfos(JoinType.Left, a.line == m.LineNo))
+                .WhereIF(lineNo != null && lineNo.Length > 0,
+                    (a, m) => lineNo.Contains(a.line))
+                .WhereIF(queryObj.Id != null, (a, m) => a.Id == queryObj.Id)
+                .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
+                    (a, m) => a.BillNo == queryObj.BillNo)
+                .WhereIF(
+                    StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+                    "鏈畬鎴�".Equals(queryObj.Result),
+                    (a, m) => a.Fsubmit == 0)
+                .WhereIF(
+                    StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+                    !"鏈畬鎴�".Equals(queryObj.Result),
+                    (a, m) => a.Fsubmit == 1)
+                // 娣诲姞杞﹂棿绛涢��
+                .WhereIF(!string.IsNullOrEmpty(queryObj.departmentId),
+                    (a, m) => m.DepotId.ToString() == queryObj.departmentId)
+                // 娣诲姞绾夸綋绛涢��
+                .WhereIF(!string.IsNullOrEmpty(queryObj.lineId),
+                    (a, m) => m.LineNo == queryObj.lineId);
+
+            // 娣诲姞鎼滅储鏉′欢
+            if (!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField))
             {
-                case "daa001":  // 宸ュ崟
-                    query = query.Where(x => x.daa001.Contains(queryObj.SearchValue));
-                    break;
-                case "billNo":  // 妫�楠屽崟鍙�
-                    query = query.Where(x => x.BillNo.Contains(queryObj.SearchValue));
-                    break;
-                case "line":    // 浜х嚎
-                    query = query.Where(x => x.line.Contains(queryObj.SearchValue));
-                    break;
-                case "itemNo":  // 鐗╂枡缂栫爜
-                    query = query.Where(x => x.ItemNo.Contains(queryObj.SearchValue));
-                    break;
-                case "daa003":  // 鐗╂枡鍚嶇О
-                    query = query.Where(x => x.Daa003.Contains(queryObj.SearchValue));
-                    break;
-                default:
-                    // 濡傛灉娌℃湁鎸囧畾瀛楁鎴栧瓧娈典笉鍖归厤锛屼娇鐢ㄥ師鏈夌殑妯$硦鏌ヨ閫昏緫浣滀负鍏滃簳鏂规
-                    query = query.Where(x => 
-                        x.ItemNo.Contains(queryObj.SearchValue) ||
-                        x.Daa003.Contains(queryObj.SearchValue) ||
-                        x.daa001.Contains(queryObj.SearchValue) ||
-                        x.BillNo.Contains(queryObj.SearchValue) ||
-                        x.line.Contains(queryObj.SearchValue));
-                    break;
+                switch (queryObj.searchField)
+                {
+                    case "daa001":  // 宸ュ崟
+                        query = query.Where((a, m) => a.daa001.Contains(queryObj.SearchValue));
+                        break;
+                    case "billNo":  // 妫�楠屽崟鍙�
+                        query = query.Where((a, m) => a.BillNo.Contains(queryObj.SearchValue));
+                        break;
+                    case "line":    // 浜х嚎
+                        query = query.Where((a, m) => a.line.Contains(queryObj.SearchValue));
+                        break;
+                    case "itemNo":  // 鐗╂枡缂栫爜
+                        query = query.Where((a, m) => a.ItemNo.Contains(queryObj.SearchValue));
+                        break;
+                    case "daa003":  // 鐗╂枡鍚嶇О
+                        query = query.Where((a, m) => a.Daa003.Contains(queryObj.SearchValue));
+                        break;
+                    default:
+                        query = query.Where((a, m) => 
+                            a.ItemNo.Contains(queryObj.SearchValue) ||
+                            a.Daa003.Contains(queryObj.SearchValue) ||
+                            a.daa001.Contains(queryObj.SearchValue) ||
+                            a.BillNo.Contains(queryObj.SearchValue) ||
+                            a.line.Contains(queryObj.SearchValue));
+                        break;
+                }
             }
+            else if (string.IsNullOrEmpty(queryObj.searchField) && !string.IsNullOrEmpty(queryObj.SearchValue))
+            {
+                query = query.Where((a, m) => 
+                    a.ItemNo.Contains(queryObj.SearchValue) ||
+                    a.Daa003.Contains(queryObj.SearchValue) ||
+                    a.daa001.Contains(queryObj.SearchValue) ||
+                    a.BillNo.Contains(queryObj.SearchValue) ||
+                    a.line.Contains(queryObj.SearchValue));
+            }
+
+            var totalCount = 0;
+            var data = query.OrderBy((a, m) => a.BillNo, OrderByType.Desc)
+                .Select((a, m) => a)
+                .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+
+            return (data, totalCount);
         }
-        // 涓轰簡鍏煎鏃х増鏈紝濡傛灉娌℃湁浼犻�� searchField锛屼娇鐢ㄥ師鏉ョ殑鏌ヨ閫昏緫
-        else if (string.IsNullOrEmpty(queryObj.searchField) && !string.IsNullOrEmpty(queryObj.SearchValue))
+        else
         {
-            // 淇濇寔鍘熸湁鐨勫瀛楁妯$硦鏌ヨ閫昏緫
-            query = query.Where(x => 
-                x.ItemNo.Contains(queryObj.SearchValue) ||
-                x.Daa003.Contains(queryObj.SearchValue) ||
-                x.daa001.Contains(queryObj.SearchValue) ||
-                x.BillNo.Contains(queryObj.SearchValue) ||
-                x.line.Contains(queryObj.SearchValue));
+            // 娌℃湁杞﹂棿鍜岀嚎浣撶瓫閫夋椂锛屼娇鐢ㄥ師鏉ョ殑鏌ヨ閫昏緫
+            var query = db.Queryable<SJPageResult>()
+                .WhereIF(lineNo != null && lineNo.Length > 0,
+                    a => lineNo.Contains(a.line))
+                .WhereIF(queryObj.Id != null, a => a.Id == queryObj.Id)
+                .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
+                    a => a.BillNo == queryObj.BillNo)
+                .WhereIF(
+                    StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+                    "鏈畬鎴�".Equals(queryObj.Result),
+                    a => a.Fsubmit == 0)
+                .WhereIF(
+                    StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+                    !"鏈畬鎴�".Equals(queryObj.Result),
+                    a => a.Fsubmit == 1);
+
+            // 鏂板鐨勫姩鎬佹悳绱㈤�昏緫
+            if (!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField))
+            {
+                switch (queryObj.searchField)
+                {
+                    case "daa001":  // 宸ュ崟
+                        query = query.Where(x => x.daa001.Contains(queryObj.SearchValue));
+                        break;
+                    case "billNo":  // 妫�楠屽崟鍙�
+                        query = query.Where(x => x.BillNo.Contains(queryObj.SearchValue));
+                        break;
+                    case "line":    // 浜х嚎
+                        query = query.Where(x => x.line.Contains(queryObj.SearchValue));
+                        break;
+                    case "itemNo":  // 鐗╂枡缂栫爜
+                        query = query.Where(x => x.ItemNo.Contains(queryObj.SearchValue));
+                        break;
+                    case "daa003":  // 鐗╂枡鍚嶇О
+                        query = query.Where(x => x.Daa003.Contains(queryObj.SearchValue));
+                        break;
+                    default:
+                        // 濡傛灉娌℃湁鎸囧畾瀛楁鎴栧瓧娈典笉鍖归厤锛屼娇鐢ㄥ師鏈夌殑妯$硦鏌ヨ閫昏緫浣滀负鍏滃簳鏂规
+                        query = query.Where(x => 
+                            x.ItemNo.Contains(queryObj.SearchValue) ||
+                            x.Daa003.Contains(queryObj.SearchValue) ||
+                            x.daa001.Contains(queryObj.SearchValue) ||
+                            x.BillNo.Contains(queryObj.SearchValue) ||
+                            x.line.Contains(queryObj.SearchValue));
+                        break;
+                }
+            }
+            // 涓轰簡鍏煎鏃х増鏈紝濡傛灉娌℃湁浼犻�� searchField锛屼娇鐢ㄥ師鏉ョ殑鏌ヨ閫昏緫
+            else if (string.IsNullOrEmpty(queryObj.searchField) && !string.IsNullOrEmpty(queryObj.SearchValue))
+            {
+                // 淇濇寔鍘熸湁鐨勫瀛楁妯$硦鏌ヨ閫昏緫
+                query = query.Where(x => 
+                    x.ItemNo.Contains(queryObj.SearchValue) ||
+                    x.Daa003.Contains(queryObj.SearchValue) ||
+                    x.daa001.Contains(queryObj.SearchValue) ||
+                    x.BillNo.Contains(queryObj.SearchValue) ||
+                    x.line.Contains(queryObj.SearchValue));
+            }
+
+            var totalCount = 0;
+            var data = query.OrderBy(a => a.BillNo, OrderByType.Desc)
+                .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+
+            return (data, totalCount);
         }
-
-        var totalCount = 0;
-        var data = query.OrderBy(a => a.BillNo, OrderByType.Desc)
-            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
-
-        return (data, totalCount);
     }
 
 
@@ -208,7 +284,8 @@
                 Mnum = b.Mnum,  // 浠庝富琛ㄨ幏鍙朚NUM
                 Dnum = b.Dnum,  // 浠庡瓙琛ㄨ幏鍙朌NUM
                 Snum = a.Snum,  // 閫佹鎵规暟
-                Remarks = a.Remarks
+                Remarks = a.Remarks,
+                Forder = a.Forder  // 椤哄簭瀛楁
             }).ToList();
 
         var array = qsItemIpiItems.Select(s => s.Id).ToArray();
@@ -300,8 +377,10 @@
                 qsItemIpiItem.imageData = Convert.ToBase64String(s.Picture);
             });
 
-        //鎺掑簭锛屾湭瀹屾垚鐨勬帓鍦ㄥ墠闈�
-        qsItemIpiItems = qsItemIpiItems.OrderBy(s => s.isCheck).ToList();
+        //鎺掑簭锛氬彧鎸塅ORDER椤哄簭鎺掑簭
+        qsItemIpiItems = qsItemIpiItems
+            .OrderBy(s => s.Forder ?? 0)
+            .ToList();
 
         // 涓烘瘡涓楠岄」鐩敓鎴愮┐鍙蜂俊鎭�
         qsItemIpiItems.ForEach(item =>
@@ -676,8 +755,8 @@
         new("P_ID", id, System.Data.DbType.Decimal, ParameterDirection.Input),
         new("P_NO", no, System.Data.DbType.String, ParameterDirection.Input),
         new("P_USER", user, System.Data.DbType.String, ParameterDirection.Input),
-        new("P_MNUM", mnum ?? 1, System.Data.DbType.Decimal, ParameterDirection.Input),
-        new("P_DNUM", dnum ?? "", System.Data.DbType.String, ParameterDirection.Input),
+        new("P_MNUM", mnum, System.Data.DbType.Decimal, ParameterDirection.Input),
+        new("P_DNUM", dnum, System.Data.DbType.String, ParameterDirection.Input),
         outputResult,
         outputMessage
     };
@@ -735,6 +814,234 @@
         {
             throw new Exception(ex.Message);
         }
+    }
+
+    /// <summary>
+    /// 鑾峰彇闄勪欢淇℃伅
+    /// </summary>
+    /// <param name="itemNo">鐗╂枡缂栫爜</param>
+    /// <returns>闄勪欢鍒楄〃</returns>
+    public List<QamftpDto> GetAttachments(string itemNo, string projName = null)
+    {
+        var db = SqlSugarHelper.GetInstance();
+        try
+        {
+            var query = db.Queryable<MesQamftp>()
+                .Where(x => x.ItemNo == itemNo)
+                .Where(x => x.Ftype == "棣栨");  
+            
+            // 濡傛灉浼犲叆浜唒rojName锛屽垯鎸塅version杩囨护
+            if (!string.IsNullOrEmpty(projName))
+            {
+                query = query.Where(x => x.Fversion == projName);
+            }
+            
+            return query.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,
+                    Pid = x.Pid
+                }).ToList();
+        }
+        catch (Exception ex)
+        {
+            throw new Exception($"鏌ヨ闄勪欢淇℃伅澶辫触: {ex.Message}");
+        }
+    }
+
+    /// <summary>
+    /// 浠嶧TP鏈嶅姟鍣ㄨ幏鍙栨枃浠讹紙棣栨浣跨敤OPC鐩綍锛�
+    /// </summary>
+    /// <param name="itemNo">鐗╂枡缂栫爜</param>
+    /// <param name="fileName">鏂囦欢鍚�</param>
+    /// <param name="ftpServer">FTP鏈嶅姟鍣ㄥ湴鍧�</param>
+    /// <param name="projName">椤圭洰鍚嶇О</param>
+    /// <returns>鏂囦欢瀛楄妭鏁扮粍</returns>
+    public byte[] GetFtpFile(string itemNo, string fileName, string ftpServer, string projName = null)
+    {
+        // 鍙傛暟楠岃瘉
+        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鏂囦欢璺緞 - 棣栨浣跨敤OPC鐩綍锛屽鏋滀紶鍏ヤ簡projName鍒欎娇鐢ㄦ柊鏍煎紡
+        string ftpPath;
+        if (!string.IsNullOrEmpty(projName))
+        {
+            ftpPath = $"{normalizedServer}/OPC/{itemNo}/{projName}/{fileName}";
+        }
+        else
+        {
+            ftpPath = $"{normalizedServer}/OPC/{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}");
+        }
+    }
+    
+    /// <summary>
+    /// 鏍囧噯鍖朏TP鏈嶅姟鍣ㄥ湴鍧�
+    /// </summary>
+    /// <param name="ftpServer">FTP鏈嶅姟鍣ㄥ湴鍧�</param>
+    /// <returns>鏍囧噯鍖栧悗鐨凢TP鏈嶅姟鍣ㄥ湴鍧�</returns>
+    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;
+    }
+
+    /// <summary>
+    /// 鑾峰彇鏂囦欢鐨勫唴瀹圭被鍨�
+    /// </summary>
+    /// <param name="fileName">鏂囦欢鍚�</param>
+    /// <returns>MIME绫诲瀷</returns>
+    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",
+            ".log" => "text/plain",
+            ".md" => "text/markdown",
+            ".html" or ".htm" => "text/html",
+            ".css" => "text/css",
+            ".js" => "application/javascript",
+            ".json" => "application/json",
+            ".xml" => "application/xml",
+            
+            // 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",
+            
+            // 鍏朵粬甯歌鏍煎紡
+            ".csv" => "text/csv",
+            ".zip" => "application/zip",
+            ".rar" => "application/x-rar-compressed",
+            ".7z" => "application/x-7z-compressed",
+            ".tar" => "application/x-tar",
+            ".gz" => "application/gzip",
+            
+            // 榛樿
+            _ => "application/octet-stream"
+        };
     }
 
     /// <summary>
@@ -800,4 +1107,127 @@
 
         return result;
     }
+
+    /// <summary>
+    /// 涓婁紶鍥剧墖鍒版楠岄」鐩殑PICTURE瀛楁
+    /// </summary>
+    /// <param name="id">妫�楠岄」鐩甀D</param>
+    /// <param name="imageBytes">鍥剧墖瀛楄妭鏁扮粍</param>
+    /// <param name="fileName">鍘熷鏂囦欢鍚�</param>
+    /// <param name="createBy">鍒涘缓浜�</param>
+    /// <returns>鎿嶄綔缁撴灉</returns>
+    public (int status, string message) UploadImageToPicture(decimal id, byte[] imageBytes, string fileName, string createBy)
+    {
+        try
+        {
+            if (imageBytes == null || imageBytes.Length == 0)
+            {
+                return (1, "鍥剧墖鏁版嵁涓虹┖");
+            }
+
+            if (string.IsNullOrEmpty(fileName))
+            {
+                return (1, "鏂囦欢鍚嶄负绌�");
+            }
+
+            // 楠岃瘉鍥剧墖鏍煎紡
+            var allowedExtensions = new[] { ".jpg", ".jpeg", ".png", ".gif", ".bmp", ".webp" };
+            var extension = System.IO.Path.GetExtension(fileName).ToLower();
+            if (!allowedExtensions.Contains(extension))
+            {
+                return (1, "涓嶆敮鎸佺殑鍥剧墖鏍煎紡锛屼粎鏀寔锛歫pg, jpeg, png, gif, bmp, webp");
+            }
+
+            // 楠岃瘉鍥剧墖澶у皬锛堥檺鍒朵负5MB锛�
+            if (imageBytes.Length > 5 * 1024 * 1024)
+            {
+                return (1, "鍥剧墖澶у皬涓嶈兘瓒呰繃5MB");
+            }
+
+            // 鐢熸垚鏃堕棿鎴虫枃浠跺悕锛屾牸寮忥細1746945271304.jpg
+            var timestamp = DateTimeOffset.Now.ToUnixTimeMilliseconds();
+            var timestampFileName = $"{timestamp}{extension}";
+
+            var result = SqlSugarHelper.UseTransactionWithOracle(db =>
+            {
+                // 妫�鏌ユ楠岄」鐩槸鍚﹀瓨鍦�
+                var exists = db.Queryable<QsItemIpiItem>()
+                    .Where(s => s.Id == id)
+                    .Any();
+
+                if (!exists)
+                {
+                    throw new Exception("妫�楠岄」鐩笉瀛樺湪");
+                }
+
+                // 鏇存柊PICTURE瀛楁锛圠ONG RAW绫诲瀷锛夊拰PICTURENAME瀛楁锛堟椂闂存埑鏂囦欢鍚嶏級
+                var updateResult = db.Updateable<QsItemIpiItem>()
+                    .SetColumns(s => s.Picture == imageBytes)
+                    .SetColumns(s => s.Picturename == timestampFileName)
+                    .Where(s => s.Id == id)
+                    .ExecuteCommand();
+
+                return updateResult;
+            });
+
+            if (result > 0)
+            {
+                return (0, "鍥剧墖淇濆瓨鎴愬姛");
+            }
+            else
+            {
+                return (1, "鍥剧墖淇濆瓨澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勬楠岄」鐩�");
+            }
+        }
+        catch (Exception ex)
+        {
+            return (1, $"鍥剧墖淇濆瓨澶辫触锛歿ex.Message}");
+        }
+    }
+
+    /// <summary>
+    /// 鍒犻櫎妫�楠岄」鐩殑鍥剧墖
+    /// </summary>
+    /// <param name="id">妫�楠岄」鐩甀D</param>
+    /// <returns>鎿嶄綔缁撴灉</returns>
+    public (int status, string message) DeleteImageFromPicture(decimal id)
+    {
+        try
+        {
+            var result = SqlSugarHelper.UseTransactionWithOracle(db =>
+            {
+                // 妫�鏌ユ楠岄」鐩槸鍚﹀瓨鍦�
+                var exists = db.Queryable<QsItemIpiItem>()
+                    .Where(s => s.Id == id)
+                    .Any();
+
+                if (!exists)
+                {
+                    throw new Exception("妫�楠岄」鐩笉瀛樺湪");
+                }
+
+                // 娓呯┖PICTURE瀛楁鍜孭ICTURENAME瀛楁
+                var updateResult = db.Updateable<QsItemIpiItem>()
+                    .SetColumns(s => s.Picture == null)
+                    .SetColumns(s => s.Picturename == null)
+                    .Where(s => s.Id == id)
+                    .ExecuteCommand();
+
+                return updateResult;
+            });
+
+            if (result > 0)
+            {
+                return (0, "鍥剧墖鍒犻櫎鎴愬姛");
+            }
+            else
+            {
+                return (1, "鍥剧墖鍒犻櫎澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勬楠岄」鐩�");
+            }
+        }
+        catch (Exception ex)
+        {
+            return (1, $"鍥剧墖鍒犻櫎澶辫触锛歿ex.Message}");
+        }
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3