some update

Server/Apis/Siger.ApiACC/Controllers/TraceController.cs

@@ -13,8 +13,6 @@ using Siger.Middlelayer.Repository;
 using Siger.Middlelayer.Repository.Repositories.Interface;
 using Siger.Middlelayer.AccRepository.Response;
 using Siger.Middlelayer.Common.Extensions;
-using Siger.Middlelayer.Dapper.CheckTrace.Repostriories;
-using Siger.Middlelayer.Dapper.CheckTrace.Data;
 
 namespace Siger.ApiACC.Controllers
 {
@@ -104,59 +102,6 @@ namespace Siger.ApiACC.Controllers
             SaveTraceData(trace, uid);
             return new ObjectResult(CommonEnum.Succefull);
         }
-        /// <summary>
-        /// 保存Trace 1.2
-        /// </summary>
-        /// <param name="trace"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [NoTokenValidateFilter]
-        public IActionResult SaveTraceInfo([FromBody]RequestTraceDetailsList trace)
-        {
-            var machine = _sigerProjectLevelSectionMachine.Get(f => f.section_id == trace.SectionID);
-            var newTrace = new SnTrace
-            {
-                MaterialID = 0,
-                ProductID = 0,
-                SectionID = trace.SectionID,
-                MachineID = machine?.machine_id ?? 0,
-                WorkOrder = "",
-                SN = trace.SN ?? "",
-                Result = trace.Result,
-                UserID = 0,
-                RouteID = 0,
-                CreateTime = DateTime.Now,
-                CheckType = 0
-            };
-
-            var dtslist = new List<SnTraceDetailList>();
-            var traceRepostory = new TraceDetailRepository(trace.companyId, trace.projectId);
-            foreach (var item in trace.Details)
-            {
-                var result = item.Result;
-                var itemVal = 0d;
-
-                // double数值超大时保存到result
-                if (item.Value.Length > 15)
-                    result = item.Value;
-                else
-                    itemVal = item.Value.ToDouble();
-
-                dtslist.Add(new SnTraceDetailList
-                {
-                    ItemName = item.Item,
-                    Result = result,
-                    Value = itemVal,
-                });
-            }
-            var ret = traceRepostory.InsertTraceDetail(newTrace, dtslist, trace.projectId);
-            if (ret)
-            {
-                return new ObjectResult(CommonEnum.Succefull);
-            }
-            throw new BadRequestException(CommonEnum.Fail);
-        }
-
         [HttpPost]
         public IActionResult SaveTFTrace([FromBody]RequestTFSaveTrace trace)
         {

Server/Apis/Siger.ApiDashboard/Controllers/DashboardQmsController.cs

@@ -8,7 +8,6 @@ using Siger.Middlelayer.Common.Extensions;
 using Siger.Middlelayer.Common.Helpers;
 using Siger.Middlelayer.Common.ModuleEnum;
 using Siger.Middlelayer.Dapper;
-using Siger.Middlelayer.Dapper.CheckTrace.Repostriories;
 using Siger.Middlelayer.DashboardRepository.Repositories.Interface;
 using Siger.Middlelayer.QmsRepository.Repositories.Interface;
 using Siger.Middlelayer.Repository;
@@ -34,6 +33,7 @@ namespace Siger.ApiDashboard.Controllers
         private readonly IDashboardFactoryChanel _dashboardFactoryChanel;
         private readonly IDashboardLevelRepository _dashboardLevel;
         private readonly IInspectStandardRepository _standardRepository;
+        private readonly ICheckSnTraceDetailRepository _traceDetailRepository;
 
         /// <inheritdoc />
         public DashboardQmsController(IUnitOfWork unitOfWork, 
@@ -42,7 +42,7 @@ namespace Siger.ApiDashboard.Controllers
             Isiger_wms_bussinese_contactsRepository businessRepository, ISigerAndonInfoRepository andonInfoRepository,
             IQmsReworkDataRepository reworkDataRepository, ISigerAndonExpectionTypeRepository andonExpectionRepository,
             ISigerSystemConfigRepository systemConfigRepository, IDashboardFactoryChanel dashboardFactory,
-            IDashboardLevelRepository dashboardLevel, IInspectStandardRepository standardRepository)
+            IDashboardLevelRepository dashboardLevel, IInspectStandardRepository standardRepository, ICheckSnTraceDetailRepository traceDetailRepository)
         {
             _unitOfWork = unitOfWork;
             _traceMaterialRepository = traceMaterialRepository;
@@ -57,6 +57,7 @@ namespace Siger.ApiDashboard.Controllers
             _dashboardFactoryChanel = dashboardFactory;
             _dashboardLevel = dashboardLevel;
             _standardRepository = standardRepository;
+            _traceDetailRepository = traceDetailRepository;
         }
         [HttpGet]
         public IActionResult GetIncomingCheckResult()
@@ -115,12 +116,10 @@ namespace Siger.ApiDashboard.Controllers
                 throw new BadRequestException(RequestEnum.LevelSectionNotFound);
             }
             var res = new GetCheckStationStatusResult();
-            var _traceRepostory = new TraceDetailRepository(CompanyId, ProjectId);
             var daterange = DateTimeHelper.GetDateTimeRange(DateTime.Now.ToString());
             var stime = daterange.StarTime.ToString(ParameterConstant.DateTimeFormat);
             var etime = daterange.EndTime.ToString(ParameterConstant.DateTimeFormat);
-            var data = _traceRepostory.GetSnTracePageList(new List<int>(), 0, 0, 0, type,
-                "", "", new List<long>(), stime, etime, 1, 10, ProjectId, "1", 0).ToList();
+            var data = _traceDetailRepository.GetSnTraceList(new List<int>(), 0, 0, type, stime, etime, ProjectId).ToList();
             var typeOne = type.ToString(); var typeEnd = $",{typeOne}"; var typeStart = $"{typeOne},"; var typeTwo = $",{typeOne},";//精确匹配，避免类似12匹配到1的情况
             var sectionIds = _standardRepository.GetList(t => t.projectid == ProjectId && t.status == (int)RowState.Valid &&
                 (t.checktype.Contains(",") ? (t.checktype.Contains(typeTwo) || t.checktype.StartsWith(typeStart) || t.checktype.EndsWith(typeEnd)) : (t.checktype == typeOne))).Select(t => t.sectionid).Distinct().ToList();
@@ -255,7 +254,6 @@ namespace Siger.ApiDashboard.Controllers
                 throw new BadRequestException(RequestEnum.LevelSectionNotFound);
             }
             var res = new GetChannelFtqResult();
-            var _traceRepostory = new TraceDetailRepository(CompanyId, ProjectId);
             var _yieldRepository = new LocationYieldRepository(CompanyId, ProjectId);
             var daterange = DateTimeHelper.GetDateTimeRange(date);
             var stime = daterange.StarTime;
@@ -267,8 +265,7 @@ namespace Siger.ApiDashboard.Controllers
                 lstSections.AddRange(stations);
                 lines = lines.Where(f => f.id == section);
             }
-            var data = _traceRepostory.GetSnTracePageList(lstSections, 0, 0, 0, 0,
-                "", "", new List<long> { }, stime.ToString(ParameterConstant.DateTimeFormat), etime.ToString(ParameterConstant.DateTimeFormat), 1, 10, ProjectId, "1", 0).ToList();
+            var data = _traceDetailRepository.GetSnTraceList(lstSections, 0, 0, 0, stime.ToString(ParameterConstant.DateTimeFormat), etime.ToString(ParameterConstant.DateTimeFormat), ProjectId).ToList();
 
             var stationLow = new List<LineFtqObj>();
             var ychart = new double[] { 98.92 , 87.9 , 99.45 , 100 , 96.11 };
@@ -279,61 +276,12 @@ namespace Siger.ApiDashboard.Controllers
                     t.id == line.id);
                 if (channel != null)
                 {
-                    //var sections = GetSectionSelect(1, line.id);
-                    //var yieldDatas = _yieldRepository.GetLocationYieldsBySectionIds(new List<int> { line.id }, stime, etime).ToList();
                     res.X.Add(channel.title);
-                    //var list = data.Where(t => sections.Select(q => q.id).Contains(t.SectionID)).ToList();
-                    //double okRate = 1;
-
-                    //var yieldCount = 0;
-                    //var recordCount = 0d;
-                    //var yield = yieldDatas.Sum(t => t.yield);
-                    //foreach (var _section in sections)
-                    //{
-                    //    var ngNum = list.Count(t => t.SectionID == _section.id && t.Result.ToUpper() == "NG");
-                    //    if (yield == 0)
-                    //        continue;
-                    //    var actualYield = (yield - ngNum) > 0 ? (yield - ngNum) : 0;
-                    //    var rate = yield > 0 ? actualYield / (double)yield : 0;
-                    //    if (rate < okRate)
-                    //    {
-                    //        okRate = rate;
-                    //    }
-
-                    //    yieldCount += actualYield;
-                    //    recordCount += yield;
-                    //}
-
-                    //stationLow.Add(new LineFtqObj
-                    //{
-                    //    OkRate = okRate,
-                    //    Station = channel.id,
-                    //    OkCount = yieldCount,
-                    //    TotalCount = recordCount,
-                    //});
                     
                     res.Y.Add(ychart[i]);
                     i++;
                 }
             }
-
-            //if (section != 0) //通道显示
-            //{
-            //    res.totalFtq = res.Y[0];
-            //}
-            //else
-            //{
-            //    var lowChanel = stationLow.OrderBy(f => f.OkRate).FirstOrDefault();
-            //    if (lowChanel.TotalCount == 0)
-            //    {
-            //        res.totalFtq = 0;
-            //    }
-            //    else
-            //    {
-            //        var rateTotal = lowChanel.OkCount / lowChanel.TotalCount;
-            //        res.totalFtq = Math.Round((rateTotal > 1 ? 1 : rateTotal) * 100, 2);
-            //    }
-            //}
             res.totalFtq = 99.78;
 
             return new ObjectResult(res);
@@ -352,15 +300,13 @@ namespace Siger.ApiDashboard.Controllers
                 throw new BadRequestException(RequestEnum.LevelSectionNotFound);
             }
             var res = new GetChannelFtqResult();
-            var _traceRepostory = new TraceDetailRepository(CompanyId, ProjectId);
             var daterange = DateTimeHelper.GetDateTimeRange(DateTime.Now.ToString());
             var stime = daterange.StarTime.ToString(ParameterConstant.DateTimeFormat);
             var etime = daterange.EndTime.ToString(ParameterConstant.DateTimeFormat);
 
             var _yieldRepository = new LocationYieldRepository(CompanyId, ProjectId);
 
-            var data = _traceRepostory.GetSnTracePageList(new List<int> { }, 0, 0, 0, 0,
-                "", "", new List<long> { }, stime.ToStr(), etime.ToStr(), 1, 10, ProjectId, "1", 0).ToList();
+            var data = _traceDetailRepository.GetSnTraceList(new List<int> { }, 0, 0, 0, stime.ToString(), etime.ToString(), ProjectId).ToList();
             var yieldCount = 0;
             var recordCount = 0d;
             foreach (var line in lines)

Server/Apis/Siger.ApiDashboard/Tasks/AutoTaskJobcs.cs

@@ -13,7 +13,6 @@ using Siger.Middlelayer.Dapper;
 using Siger.Middlelayer.DashboardRepository.Response;
 using Siger.Middlelayer.Common.Helpers;
 using Siger.Middlelayer.Common.ModuleEnum;
-using Siger.Middlelayer.Dapper.CheckTrace.Repostriories;
 using Siger.Middlelayer.TpmRepository;
 using Siger.Middlelayer.QmsRepository;
 using Siger.Middlelayer.Share.Enum.ModuleEnum;
@@ -231,11 +230,10 @@ namespace Siger.ApiDashboard.Tasks
         {
             try
             {
-                var _traceRepostory = new TraceDetailRepository(companyId, projectId);
                 var _yieldRepository = new LocationYieldRepository(companyId, projectId);
 
-                var data = _traceRepostory.GetSnTracePageList(new List<int> { }, 0, 0, 0, 0,
-                    "", "", new List<long> { }, begin.ToString(ParameterConstant.DateTimeFormat), end.ToString(ParameterConstant.DateTimeFormat), 1, 10, projectId, "1", 0).ToList();
+                var data = _qmsDbContext.siger_check_sn_trace_inspection.Where(q => q.projectid == projectId && q.status == (int)RowState.Valid && q.checking_time <= end &&
+                    q.checking_time >= begin).ToList();
                 var lines = GetLine(projectId).ToList();
                 foreach (var line in lines)
                 {
@@ -244,7 +242,7 @@ namespace Siger.ApiDashboard.Tasks
                     //var yieldDatas = _yieldRepository.GetLocationYieldsBySectionIds(sections.Select(t => t.id), begin, end).ToList();
                     //var bottleMachine = GetBottleMachine(projectId, line.id,false);
 
-                    var list = data.Where(t => sections.Select(q => q.id).Contains(t.SectionID)).ToList();
+                    var list = data.Where(t => sections.Select(q => q.id).Contains(t.sectionid)).ToList();
                     double okRate = 1;
                     //var minOk = 0d;
                     //var minTtl = 0d;
@@ -253,7 +251,7 @@ namespace Siger.ApiDashboard.Tasks
                     var yield = yieldDatas.Sum(t => t.yield);
                     foreach (var _section in sections)
                     {
-                        var ngNum = list.Count(t => t.SectionID == _section.id && t.Result.ToUpper() == "NG");
+                        var ngNum = list.Count(t => t.sectionid == _section.id && t.result == ((int)SendTestType.Unqualified).ToString());
                         if (yield == 0)
                             continue;
                         var actualYield = (yield - ngNum) > 0 ? (yield - ngNum) : 0;

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationProduceHistoryRepository.cs

@@ -12,7 +12,7 @@ using Siger.Middlelayer.Repository.Paged;
 
 namespace Siger.Middlelayer.AccRepository.Repositories
 {
-    internal class AutomationProduceHistoryRepository : AccRepositoryBase<siger_automation_fixture_tools>, IAutomationProduceHistoryRepository
+    internal class AutomationProduceHistoryRepository : AccRepositoryBase<siger_automation_produce_history>, IAutomationProduceHistoryRepository
     {
         private ApiAccDbContext _context;
         public AutomationProduceHistoryRepository(ApiAccDbContext context) : base(context)