SJ,XJ,RKJ检验项单独拍照+提交限制

xwt

2025-10-16 349f2f66fdac1a2d64e0c99201b7f09579470714

 StandardInterface/MESApplication/Controllers/QC/XJController.cs

@@ -610,10 +610,24 @@
    public ResponseResult GetAttachments([FromBody] JObject data)
    {
        var itemNo = data["itemNo"]?.ToString();
        var projName = data["projName"]?.ToString();
        var fromPage = data["fromPage"]?.ToString(); // 新增参数

        // 调试日志
        Console.WriteLine($"XJController.GetAttachments 接收参数: itemNo='{itemNo}', projName='{projName}', fromPage='{fromPage}'");

        // 条件过滤逻辑：根据fromPage决定是否过滤
        string filterProjName = null;
        if (fromPage == "Detail" && !string.IsNullOrEmpty(projName))
        {
            filterProjName = projName;  // Detail页面需要过滤
        }
        // Add页面不传递filterProjName，显示所有附件

        try
        {
            dynamic resultInfos = new System.Dynamic.ExpandoObject();
            var tbBillList = new XJService().GetAttachments(itemNo);
            var tbBillList = new XJService().GetAttachments(itemNo, filterProjName);
            if (tbBillList == null || tbBillList.Count == 0)
            {
                return new ResponseResult
@@ -643,9 +657,10 @@
    /// <param name="itemNo">物料编码</param>
    /// <param name="fileName">文件名</param>
    /// <param name="ftpServer">FTP服务器地址</param>
    /// <param name="projName">项目名称（可选）</param>
    /// <returns>文件内容</returns>
    [HttpGet("PreviewFtpFile")]
    public IActionResult PreviewFtpFile([FromQuery] string itemNo, [FromQuery] string fileName, [FromQuery] string ftpServer)
    public IActionResult PreviewFtpFile([FromQuery] string itemNo, [FromQuery] string fileName, [FromQuery] string ftpServer, [FromQuery] string projName = null)
    {
        try
        {
@@ -656,7 +671,7 @@
            Response.Headers.Add("Access-Control-Expose-Headers", "Content-Type, Content-Length");
            
            var service = new XJService();
            var fileBytes = service.GetFtpFile(itemNo, fileName, ftpServer);
            var fileBytes = service.GetFtpFile(itemNo, fileName, ftpServer, projName);
            
            if (fileBytes == null || fileBytes.Length == 0)
            {
@@ -680,9 +695,10 @@
    /// <param name="itemNo">物料编码</param>
    /// <param name="fileName">文件名</param>
    /// <param name="ftpServer">FTP服务器地址</param>
    /// <param name="projName">项目名称（可选）</param>
    /// <returns>文件下载</returns>
    [HttpGet("DownloadFtpFile")]
    public IActionResult DownloadFtpFile([FromQuery] string itemNo, [FromQuery] string fileName, [FromQuery] string ftpServer)
    public IActionResult DownloadFtpFile([FromQuery] string itemNo, [FromQuery] string fileName, [FromQuery] string ftpServer, [FromQuery] string projName = null)
    {
        try
        {
@@ -693,7 +709,7 @@
            Response.Headers.Add("Access-Control-Expose-Headers", "Content-Disposition, Content-Length, Content-Type");
            
            var service = new XJService();
            var fileBytes = service.GetFtpFile(itemNo, fileName, ftpServer);
            var fileBytes = service.GetFtpFile(itemNo, fileName, ftpServer, projName);
            
            if (fileBytes == null || fileBytes.Length == 0)
            {
@@ -732,5 +748,124 @@
        return Ok();
    }

    /// <summary>
    /// 上传图片到检验项目的PICTURE字段
    /// </summary>
    /// <param name="file">上传的图片文件</param>
    /// <param name="id">检验项目ID</param>
    /// <param name="gid">检验单ID</param>
    /// <param name="billNo">工单号</param>
    /// <param name="createBy">创建人</param>
    /// <returns>上传结果</returns>
    [HttpPost("UploadImageToPicture")]
    public ResponseResult UploadImageToPicture(IFormFile file, [FromForm] string id, [FromForm] string gid, [FromForm] string billNo, [FromForm] string createBy)
    {
        try
        {
            // 参数验证
            if (file == null || file.Length == 0)
            {
                return new ResponseResult
                {
                    status = 1,
                    message = "请选择要上传的图片文件",
                    data = null
                };
            }

            if (string.IsNullOrEmpty(id))
            {
                return new ResponseResult
                {
                    status = 1,
                    message = "检验项目ID不能为空",
                    data = null
                };
            }

            if (string.IsNullOrEmpty(createBy))
            {
                return new ResponseResult
                {
                    status = 1,
                    message = "创建人不能为空",
                    data = null
                };
            }

            // 读取文件字节数组
            byte[] imageBytes;
            using (var memoryStream = new MemoryStream())
            {
                file.CopyTo(memoryStream);
                imageBytes = memoryStream.ToArray();
            }

            // 调用服务方法保存图片
            var service = new XJService();
            var (status, message) = service.UploadImageToPicture(Convert.ToDecimal(id), imageBytes, file.FileName, createBy);

            return new ResponseResult
            {
                status = status,
                message = message,
                data = null
            };
        }
        catch (Exception ex)
        {
            return new ResponseResult
            {
                status = 1,
                message = $"上传图片失败：{ex.Message}",
                data = null
            };
        }
    }

    /// <summary>
    /// 删除检验项目的图片
    /// </summary>
    /// <param name="data">包含检验项目ID的JSON对象</param>
    /// <returns>删除结果</returns>
    [HttpPost("DeleteImageFromPicture")]
    public ResponseResult DeleteImageFromPicture([FromBody] JObject data)
    {
        try
        {
            var id = data["id"]?.ToString();
            
            if (string.IsNullOrEmpty(id))
            {
                return new ResponseResult
                {
                    status = 1,
                    message = "检验项目ID不能为空",
                    data = null
                };
            }

            // 调用服务方法删除图片
            var service = new XJService();
            var (status, message) = service.DeleteImageFromPicture(Convert.ToDecimal(id));

            return new ResponseResult
            {
                status = status,
                message = message,
                data = null
            };
        }
        catch (Exception ex)
        {
            return new ResponseResult
            {
                status = 1,
                message = $"删除图片失败：{ex.Message}",
                data = null
            };
        }
    }


}