来料检增加字段

xwt

3 天以前 8ba0722979e389a8a2f5835022a7d305ab215c08

 StandardInterface/MES.Service/service/QC/LljService.cs

@@ -65,17 +65,9 @@
                        .Contains(queryObj.SearchValue.ToLower())
                     || a.ItemModel.ToLower()
                        .Contains(queryObj.SearchValue.ToLower()))
          //  .OrderByDescending((a, b,
            
            .OrderBy ((a, b,e, f, g, i) => a.Id)
            //.Select((a, b,
            //        e, f, g, i) => new LtsLlj
            //        {
            //            //UserName = g.Fname,
            //            //UserName = (i.Fname!=null ||i.Fname!="") ? i.Fname : g.Fname,
            //            UserName = i.Fname != null || i.Fname != "" ? i.Fname : g.Fname,
            //            CreateUserName = e.Fname
            //        }, true)
            //  .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(); 
@@ -319,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";
        
        // 标准化FTP服务器地址
        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服务器地址不能为空");
        }
        
        // 确保以ftp://开头
        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;
@@ -674,15 +861,17 @@
        return withOracle;
    }

    //主表修改备注字段
    //主表修改字段
    public int saveRemarksGid(LLJDto dto)
    {
        return SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            return db.Updateable<MesQaItemsDetect01>()
                .SetColumns(it =>
                    it.FngDesc == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
                .SetColumns(it => it.PHSY == dto.PHSY)//破坏实验数
                .SetColumns(it => it.FngDesc == dto.Remarks)
                .SetColumns(it => it.PHSY == dto.PHSY)
                .SetColumns(it => it.BLYY == dto.BLYY)
                .SetColumns(it => it.SSCJ == dto.SSCJ)
                .SetColumns(it => it.PSZT == dto.PSZT)
                .Where(it => it.ReleaseNo == dto.releaseNo)
                .ExecuteCommand();
        });