111

啊鑫

2025-07-17 93473e2792e5d23a168e575f17190a5e51ad7c9f

111

 MES.Service/Modes/MesQsImage.cs

@@ -42,6 +42,9 @@
    [SugarColumn(ColumnName = "QS_TYPE")] //用于SqlSugar
    [StringLength(1, ErrorMessage = "1为首检，2为巡检，3为入库检长度不能超出1")]
    public string? QsType { get; set; }
    
    [SugarColumn(ColumnName = "ORDER_NO")] //用于SqlSugar
    public string? OrderNo { get; set; }

    /// <summary>
    ///     图片名称

 MES.Service/service/QC/BaseService.cs

@@ -55,7 +55,7 @@
    {
        var db = SqlSugarHelper.GetInstance();
        var mesQsImages = db
            .Queryable<MesQsImage, MesOqcItemsDetectDetail5>((a, b) =>
            .Queryable<MesQsImage, MesQaItemsDetectDetail5>((a, b) =>
                new JoinQueryInfos(JoinType.Left, a.Fid == b.Id))
            .Where((a, b) => b.ReleaseNo == id && a.Id != null).ToList();
        mesQsImages.ForEach(s =>
@@ -65,4 +65,38 @@
        });
        return mesQsImages;
    }
    
    public List<MesQsImage> getByOqcFid(decimal id, string qsType)
    {
        var db = SqlSugarHelper.GetInstance();
        var mesQsImages = db.Queryable<MesQsImage>()
            .Where(s => s.Fid == id && s.QsType == qsType).ToList();

        var mesOqcItemsDetect02 = db.Queryable<MesOqcItemsDetect02>()
            .Where(s=>s.Id == id).First();
        
        if (mesOqcItemsDetect02?.SaleOrderNo != null)
        {
            var baseOrderNo = mesOqcItemsDetect02.SaleOrderNo.Split('-')[0];
            
            var additionalImages = db.Queryable<MesQsImage>()
                .Where(s => s.OrderNo == baseOrderNo && s.QsType == qsType)
                .Where(s => !mesQsImages.Any(existing => existing.Id == s.Id))
                .ToList();
            
            mesQsImages.AddRange(additionalImages);
            
            if (mesQsImages.Count > 9)
            {
                mesQsImages = mesQsImages.Take(9).ToList();
            }
        }
        
        mesQsImages.ForEach(s =>
        {
            if (s.ImageData is { Length: > 0 })
                s.base64Date = Convert.ToBase64String(s.ImageData);
        });
        return mesQsImages;
    }
}

 MESApplication/Controllers/QC/BaseController.cs

@@ -82,6 +82,31 @@
        }
    }
    
    //getByOqcFid
    [HttpPost("getByOqcFid")]
    public ResponseResult getByOqcFid([FromBody] JObject data)
    {
        var id = Convert.ToInt32(data["fid"].ToString());
        var qsType = data["qsType"].ToString();
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var tbBillList =
                new BaseService().getByOqcFid(id, qsType);
            resultInfos.tbBillList = tbBillList;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    
    /// <summary>
    ///     获取来料检单个检验单上传的所有图片
    /// </summary>