离线测试测试功能增加OKNG分类测试功能，添加图片资源释放延时优化最终结果少存图合并

kingno

2025-06-17 88d9954c0e8900a646975bd501b3a5479789a638

 src/Bro.M141.Process/M141Process.cs

@@ -38,31 +38,26 @@

        public M141Process(string productCode) : base(productCode) { }
        #endregion

        TaskFactory _taskFactory = new TaskFactory(TaskCreationOptions.LongRunning, TaskContinuationOptions.LongRunning);

        public event Action<string, P_PRODUCT_DETAIL, string> OnSinglePostionDetectResultUpdate;

        protected M141Config M141Config => Config as M141Config;

        public static object _productListLock = new object();
        public List<ProductModel> ProductList = new List<ProductModel>();
        MachineLearningBase ML = null;
        TcpListenerWrap TcpListener = null;
        Spec _errorSpec = null;

        TcpListenerWrap _realTimeServer = null;

        volatile int _productIndex = 0;

        int _backgroundImageWidth = 2448;
        //volatile int _productIndex = 0;

        M141Process_Mysql mysqlhelper = new M141Process_Mysql();




        public override void InitialProcessMethods()
        {
            base.InitialProcessMethods();


            if (ThHeartPlc == null)
            {
@@ -89,7 +84,6 @@
        bool devicestate = false;
        PLCBase Plc2;
        public Thread ThHeartPlc;



        public override void Open()
@@ -128,9 +122,13 @@

        }


        public void Heartplc()
        {
            Thread.Sleep(1000);

            //Open();

            string _statisticFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Statistic.json");
            if (File.Exists(_statisticFilePath))
            {
@@ -421,8 +419,6 @@
        Dictionary<string, List<string>> _positionSpecHeads = new Dictionary<string, List<string>>();




        volatile int uploadId = 0;


@@ -516,8 +512,8 @@
                        //    dicpid[tem] = pidList[i];
                        //}


                        List<DetectResult> detectResults = ML?.RunMLDetectionSync(imgSet, pidList, measureBind.DetectionId);
                        //var c=products[0].ImagePaths;
                        List<DetectResult> detectResults = ML?.RunMLDetectionSync(imgSet, pidList, measureBind.DetectionId,false,null,null,"", products[0].ImagePaths);
                        List<DetectResult> ngResults = new List<DetectResult>();


@@ -768,7 +764,7 @@
                        {
                            products.ForEach(p =>
                            {
                                var pResults = resultList.Where(u => u.PID == p.PID).ToList();
                                var pResults = resultList.ToList();
                                p.AddNewDetectResults(M141Config.StationCode, measureBind.WorkPosition, pResults);
                                LogAsync(DateTime.Now, EnumHelper.LogLevel.Action, $"产品{p.PID}_{p.SEQUENCE}添加工位{measureBind.WorkPosition}检测结果，数量{pResults.Count}");
                            });
@@ -998,6 +994,7 @@
                    {
                        p.BasketCode = mysqlhelper.Getbasketcode(p.SEQUENCE, out string sntem);
                        p.SN = sntem;
                        p.PID = $"{sntem}_{i}";
                        if ("NoRead".Equals(p.BasketCode))
                        {
                            LogAsync(DateTime.Now, EnumHelper.LogLevel.Error, $"{p.PID}_{p.SEQUENCE}获取框具码失败 赋值Noread");
@@ -1032,8 +1029,9 @@

                    //初始化产品的检测次数
                    var checkIndexList = M141Config.MeasureBindCollection.Where(u => u.WorkPosition == b.WorkPosition && u.ProductIndices.Contains(i)).Select(u => u.CheckIndex).OrderBy(u => u).ToList();
                    p.InitialPositionCheckList(b.WorkPosition, checkIndexList);
                    p.InitialPositionCheckList(b.WorkPosition, checkIndexList, M141Config.StationCode);
                    LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"产品{p.PID}_{p.SEQUENCE}已清理{b.WorkPosition}检测数据。当前已完成工位{string.Join(",", p.Details.Select(u => u.PositionName))}");

                });

                //初始化工位的检测次数
@@ -1197,6 +1195,8 @@
                    newp.BasketCode = p.BasketCode;
                    newp.Result = p.Result;
                    newp.SN = p.SN;

                    Thread.Sleep(500);
                    var plist = mysqlhelper.GetProductList(p.SEQUENCE);


@@ -1207,6 +1207,7 @@
                            newp.Details.AddRange(item.Details);
                        }
                    }
                    LogAsync(DateTime.Now, EnumHelper.LogLevel.Error, $"AllDeviceProductRecord从数据库获取到数据{p.SEQUENCE} plist数量{plist.Count} Details数量{newp.Details.Count}");

                    //newp.Details.AddRange(p.Details);