StandardPda/MES.Service/Dto/service/ImageDataDto.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
StandardPda/MES.Service/Modes/MesQaItemsDetectDetail12.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
StandardPda/MES.Service/Modes/MesQsImage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
StandardPda/MES.Service/service/QC/BaseService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
StandardPda/MESApplication/Controllers/QC/BaseController.cs | ●●●●● 补丁 | 查看 | 原始文档 | 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); } } }