1

ZR.Service/mes/qc/IService/IQcGp12ServiceStatisticsService.cs

@@ -11,8 +11,20 @@ namespace ZR.Service.Business.IBusinessService
     /// </summary>
     public interface IQcGp12ServiceStatisticsService : IBaseService<QcGp12ServiceStatistics>
     {
+        /// <summary>
+        /// 获取原始数据
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
         PagedInfo<QcGp12ServiceStatisticsDto> GetList(QcGp12ServiceStatisticsQueryDto parm);
 
+        /// <summary>
+        /// 获取修正格式后的列表数据
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        List<QcGp12ServiceStatisticsDto> GetReviseList(QcGp12ServiceStatisticsQueryDto parm);
+
         QcGp12ServiceStatistics GetInfo(string Id);
 
         QcGp12ServiceStatistics AddQcGp12ServiceStatistics(QcGp12ServiceStatistics parm);

ZR.Service/mes/qc/QcGp12Service.cs

@@ -75,10 +75,10 @@ namespace ZR.Service.Business
             return labelAnalysisDto;
         }
 
-        // 零件号解析
+        // 标签的零件号解析
         public string DoAnalyzePartnumber(string label)
         {
-            // 外箱标签零件号抓取
+            // 标签零件号抓取
             var predicate = Expressionable
                 .Create<QcGp12BaseLabelAnalysis>()
                 .And(it => it.Code == "PartNumber")
@@ -104,11 +104,11 @@ namespace ZR.Service.Business
             return "";
         }
 
-        // 数量解析
+        // 标签的数量解析
         public int DoAnalyzeQuantity(string label)
         {
             int result = 0;
-            // 外箱标签零件号抓取
+            // 标签零件号抓取
             var predicate = Expressionable
                 .Create<QcGp12BaseLabelAnalysis>()
                 .And(it => it.Code == "Quantity")

ZR.Service/mes/qc/QcGp12ServiceStatisticsService.cs

@@ -1,21 +1,27 @@
 using System;
-using SqlSugar;
+using System.Linq;
 using Infrastructure.Attribute;
 using Infrastructure.Extensions;
+using Newtonsoft.Json;
+using SqlSugar;
 using ZR.Model;
-using ZR.Model.Dto;
 using ZR.Model.Business;
+using ZR.Model.Dto;
 using ZR.Repository;
 using ZR.Service.Business.IBusinessService;
-using System.Linq;
 
 namespace ZR.Service.Business
 {
     /// <summary>
     /// 质量GP12统计报表业务模块Service业务层处理
     /// </summary>
-    [AppService(ServiceType = typeof(IQcGp12ServiceStatisticsService), ServiceLifetime = LifeTime.Transient)]
-    public class QcGp12ServiceStatisticsService : BaseService<QcGp12ServiceStatistics>, IQcGp12ServiceStatisticsService
+    [AppService(
+        ServiceType = typeof(IQcGp12ServiceStatisticsService),
+        ServiceLifetime = LifeTime.Transient
+    )]
+    public class QcGp12ServiceStatisticsService
+        : BaseService<QcGp12ServiceStatistics>,
+            IQcGp12ServiceStatisticsService
     {
         /// <summary>
         /// 查询质量GP12统计报表业务模块列表
@@ -33,7 +39,6 @@ namespace ZR.Service.Business
             return response;
         }
 
-
         /// <summary>
         /// 获取详情
         /// </summary>
@@ -41,9 +46,7 @@ namespace ZR.Service.Business
         /// <returns></returns>
         public QcGp12ServiceStatistics GetInfo(string Id)
         {
-            var response = Queryable()
-                .Where(x => x.Id == Id)
-                .First();
+            var response = Queryable().Where(x => x.Id == Id).First();
 
             return response;
         }
@@ -102,5 +105,112 @@ namespace ZR.Service.Business
             return Update(model, true);
         }
 
+        public List<QcGp12ServiceStatisticsDto> GetReviseList(QcGp12ServiceStatisticsQueryDto parm)
+        {
+            var predicate = Expressionable
+                .Create<QcGp12ServiceStatistics>()
+                .AndIF(
+                    !string.IsNullOrEmpty(parm.WorkOrder),
+                    x => x.WorkOrder.Contains(parm.WorkOrder)
+                )
+                .AndIF(
+                    !string.IsNullOrEmpty(parm.PartNumber),
+                    x => x.PartNumber.Contains(parm.PartNumber)
+                )
+                .AndIF(
+                    !string.IsNullOrEmpty(parm.Description),
+                    x => x.Description.Contains(parm.Description)
+                )
+                .AndIF(!string.IsNullOrEmpty(parm.Team), x => x.Team == parm.Team)
+                .AndIF(!string.IsNullOrEmpty(parm.SiteNo), x => x.SiteNo == parm.SiteNo)
+                .AndIF(!string.IsNullOrEmpty(parm.ComNo), x => x.ComNo == parm.ComNo)
+                .AndIF(parm.IsOnetime.HasValue, x => x.IsOnetime == parm.IsOnetime.Value)
+                .AndIF(parm.IsBack.HasValue, x => x.IsBack == parm.IsBack.Value)
+                .AndIF(parm.IsPolish.HasValue, x => x.IsPolish == parm.IsPolish.Value)
+                .AndIF(parm.IsOut.HasValue, x => x.IsOut == parm.IsOut.Value)
+                .AndIF(
+                    parm.StartTime.HasValue && parm.EndTime.HasValue,
+                    x => x.StartTime >= parm.StartTime.Value && x.StartTime <= parm.EndTime.Value
+                )
+                .And(x => x.Status == "1")
+                .ToExpression();
+            var query = Context.Queryable<QcGp12ServiceStatistics>().Where(predicate);
+            var result = query
+                .OrderByIF(parm.StatisticsOrderType == 1, it => it.WorkOrder)
+                .OrderByIF(parm.StatisticsOrderType == 2, it => it.PartNumber)
+                .OrderByIF(parm.StatisticsOrderType == 3, it => it.QualifiedRate, OrderByType.Desc)
+                .OrderByIF(parm.StatisticsOrderType == 4, it => it.StartTime)
+                .OrderBy(it => it.GroupCode)
+                .OrderBy(it => it.GroupSort)
+                .ToList();
+            List<QcGp12BaseDefect> defectList = Context.Queryable<QcGp12BaseDefect>().ToList();
+            var resultList = new List<QcGp12ServiceStatisticsDto>();
+            foreach (var item in result)
+            {
+                var dto = new QcGp12ServiceStatisticsDto
+                {
+                    Id = item.Id,
+                    WorkOrder = item.WorkOrder,
+                    PartNumber = item.PartNumber,
+                    Description = item.Description,
+                    Specification = item.Specification,
+                    Color = item.Color,
+                    Team = item.Team,
+                    SiteNo = item.SiteNo,
+                    ComNo = item.ComNo,
+                    IsOnetime = item.IsOnetime,
+                    IsBack = item.IsBack,
+                    IsPolish = item.IsPolish,
+                    IsOut = item.IsOut,
+                    StartTime = item.StartTime,
+                    EndTime = item.EndTime,
+                    Label = item.Label,
+                    RequireNumber = item.RequireNumber,
+                    QualifiedNumber = item.QualifiedNumber,
+                    QualifiedRate = item.QualifiedRate,
+                    PolishNumber = item.PolishNumber,
+                    DamoNumber = item.DamoNumber,
+                    BaofeiNumber = item.BaofeiNumber,
+                    GroupCode = item.GroupCode,
+                    GroupSort = item.GroupSort,
+                    GroupDefectJson = item.GroupDefectJson,
+                    Type = item.Type,
+                    Status = item.Status,
+                    Remark = item.Remark,
+                    CreatedBy = item.CreatedBy,
+                    CreatedTime = item.CreatedTime,
+                    UpdatedBy = item.UpdatedBy,
+                    UpdatedTime = item.UpdatedTime
+                };
+                // 解析 GroupDefectJson
+                if (!string.IsNullOrEmpty(item.GroupDefectJson))
+                {
+                    try
+                    {
+                        var defects = JsonConvert.DeserializeObject<
+                            List<QcGp12RecordWorkorderDefect>
+                        >(item.GroupDefectJson);
+                        foreach (var defect in defects)
+                        {
+                            var baseDefect = defectList.FirstOrDefault(d =>
+                                d.Code == defect.DefectCode
+                            );
+                            if (baseDefect != null)
+                            {
+                                var propertyName = $"{defect.DefectCode}";
+                                dto.AddDynamicProperty(propertyName, defect.DefectNum);
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine($"Error parsing GroupDefectJson: {ex.Message}");
+                    }
+                }
+                resultList.Add(dto);
+            }
+
+            return resultList;
+        }
     }
-}
+}