啊鑫
2025-02-19 467eae029f6ce0377c59e06eca0e328211c16c4b
来料检验
已添加4个文件
已修改1个文件
218 ■■■■■ 文件已修改
StandardPda/MES.Service/Dto/service/ImageDataDto.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Modes/MesQaItemsDetectDetail12.cs 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Modes/MesQsImage.cs 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/QC/BaseService.cs 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/QC/BaseController.cs 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Dto/service/ImageDataDto.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
using MES.Service.Modes;
namespace MES.Service.Dto.service;
public class ImageDataDto
{
    public List<MesQsImage>? entity;
}
StandardPda/MES.Service/Modes/MesQaItemsDetectDetail12.cs
@@ -21,25 +21,25 @@
        /// æ£€éªŒç»“æžœ 
        ///</summary>
        [SugarColumn(ColumnName = "FCHECK_RESU")]
        public string FcheckResu { get; set; }
        public string? FcheckResu { get; set; }
        /// <summary>
        /// æ£€éªŒé¡¹ç›® 
        ///</summary>
        [SugarColumn(ColumnName = "FCHECK_ITEM")]
        public string FcheckItem { get; set; }
        public string? FcheckItem { get; set; }
        /// <summary>
        /// ç‰©æ–™æ¡ç  
        ///</summary>
        [SugarColumn(ColumnName = "ITEM_BARCODE")]
        public string ItemBarcode { get; set; }
        public string? ItemBarcode { get; set; }
        /// <summary>
        ///  
        ///</summary>
        [SugarColumn(ColumnName = "RELEASE_NO")]
        public string ReleaseNo { get; set; }
        public string? ReleaseNo { get; set; }
        /// <summary>
        ///  
@@ -57,31 +57,31 @@
        ///  
        ///</summary>
        [SugarColumn(ColumnName = "COMPANY")]
        public string Company { get; set; }
        public string? Company { get; set; }
        /// <summary>
        ///  
        ///</summary>
        [SugarColumn(ColumnName = "FACTORY")]
        public string Factory { get; set; }
        public string? Factory { get; set; }
        /// <summary>
        ///  
        ///</summary>
        [SugarColumn(ColumnName = "FSTAND")]
        public string Fstand { get; set; }
        public string? Fstand { get; set; }
        /// <summary>
        /// ç”Ÿæˆäºº 
        ///</summary>
        [SugarColumn(ColumnName = "LASTUPDATE_BY")]
        public string LastupdateBy { get; set; }
        public string? LastupdateBy { get; set; }
        /// <summary>
        ///  
        ///</summary>
        [SugarColumn(ColumnName = "CREATE_BY")]
        public string CreateBy { get; set; }
        public string? CreateBy { get; set; }
        [SugarColumn(IsIgnore = true)] public int? count { get; set; }
    }
StandardPda/MES.Service/Modes/MesQsImage.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;
namespace MES.Service.Modes;
/// <summary>
///     å›¾ç‰‡ä¿¡æ¯
/// </summary>
[Table("MES_QS_IMAGE")]
[SugarTable("MES_QS_IMAGE")] //用于SqlSugar
public class MesQsImage
{
    /// <summary>
    ///     ä¸»é”®
    /// </summary>
    [Key]
    [Column("ID")]
    [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_QS_IMG",
        ColumnName = "ID")] //用于SqlSugar
    public decimal? Id { get; set; }
    /// <summary>
    ///     æ£€éªŒå•id
    /// </summary>
    [Column("FID")]
    [SugarColumn(ColumnName = "FID")] //用于SqlSugar
    public decimal? Fid { get; set; }
    /// <summary>
    ///     é™„件内容
    /// </summary>
    [Column("IMAGE_DATA")]
    [SugarColumn(ColumnName = "IMAGE_DATA")] //用于SqlSugar
    [StringLength(4000, ErrorMessage = "ImageData长度不能超出4000")]
    public byte[]? ImageData { get; set; }
    /// <summary>
    ///     1为首检,2为巡检,3为入库检,4为来料检
    /// </summary>
    [Column("QS_TYPE")]
    [SugarColumn(ColumnName = "QS_TYPE")] //用于SqlSugar
    [StringLength(1, ErrorMessage = "1为首检,2为巡检,3为入库检长度不能超出1")]
    public string? QsType { get; set; }
    /// <summary>
    ///     å›¾ç‰‡åç§°
    /// </summary>
    [Column("PICTURENAME")]
    [SugarColumn(ColumnName = "PICTURENAME")] //用于SqlSugar
    [StringLength(200, ErrorMessage = "Picturename长度不能超出200")]
    public string? Picturename { get; set; }
    [SugarColumn(IsIgnore = true)] public string? base64Date { get; set; }
}
StandardPda/MES.Service/service/QC/BaseService.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,53 @@
using MES.Service.DB;
using MES.Service.Modes;
namespace MES.Service.service.QC;
public class BaseService
{
    // public string?[] getUserLineNo(string userNo)
    // {
    //     //MesLineUser
    //     var db = SqlSugarHelper.GetInstance();
    //     var mesLineUsers = db.Queryable<MesLineUser>()
    //         .Where(a => a.Fcode == userNo)
    //         .ToList();
    //     // ä½¿ç”¨ Distinct æ–¹æ³•对 LineNo è¿›è¡ŒåŽ»é‡
    //     return mesLineUsers.Select(s => s.LineNo).Distinct().ToArray();
    // }
    public int saveImage(List<MesQsImage> entity)
    {
        var mesQsImages = entity.Where(item => item.Id == null).ToList();
        mesQsImages.ForEach(s =>
        {
            if (!string.IsNullOrEmpty(s.base64Date))
                //将base64转换为byte数组
                s.ImageData = Convert.FromBase64String(s.base64Date);
        });
        return SqlSugarHelper.UseTransactionWithOracle(db =>
            db.Insertable(mesQsImages).ExecuteCommand());
    }
    public int removeImage(decimal? id)
    {
        return SqlSugarHelper.UseTransactionWithOracle(db => db
            .Deleteable(new MesQsImage { Id = id })
            .ExecuteCommand());
    }
    public List<MesQsImage> getByFid(decimal id, string qsType)
    {
        var db = SqlSugarHelper.GetInstance();
        var mesQsImages = db.Queryable<MesQsImage>()
            .Where(s => s.Fid == id && s.QsType == qsType).ToList();
        mesQsImages.ForEach(s =>
        {
            if (s.ImageData is { Length: > 0 })
                s.base64Date = Convert.ToBase64String(s.ImageData);
        });
        return mesQsImages;
    }
}
StandardPda/MESApplication/Controllers/QC/BaseController.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,84 @@
using System.Dynamic;
using MES.Service.Dto.service;
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
namespace MESApplication.Controllers.QC;
[Route("api/[controller]")]
[ApiController]
public class BaseController : ControllerBase
{
    [HttpPost("saveImage")]
    public ResponseResult saveImage([FromBody] ImageDataDto dto)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var tbBillList =
                new BaseService().saveImage(dto.entity);
            resultInfos.tbBillList = tbBillList;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    //removeImage
    [HttpPost("removeImage")]
    public ResponseResult removeImage([FromBody] JObject data)
    {
        var id = Convert.ToInt32(data["id"].ToString());
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var tbBillList =
                new BaseService().removeImage(id);
            resultInfos.tbBillList = tbBillList;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    //getByFid
    [HttpPost("getByFid")]
    public ResponseResult getByFid([FromBody] JObject data)
    {
        var id = Convert.ToInt32(data["fid"].ToString());
        var qsType = data["qsType"].ToString();
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var tbBillList =
                new BaseService().getByFid(id, qsType);
            resultInfos.tbBillList = tbBillList;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
}