libs/PFW.7z

Binary files differ

 libs/PFW/Bro.Common.Device.dll

Binary files differ

 libs/PFW/Bro.Common.Model.dll

Binary files differ

 libs/PFW/Bro.DataBase.Model.dll

Binary files differ

 libs/PFW/Bro.Process.DataBase.dll

Binary files differ

 libs/PFW/Bro.Process.dll

Binary files differ

 libs/PFW/Bro.UI.Device.Winform.dll

Binary files differ

 libs/PFW/Bro.UI.Main.deps.json

@@ -16,21 +16,21 @@
          "Krypton.Docking": "6.2111.312",
          "ScottPlot.WinForms": "4.1.58",
          "SunnyUI": "3.0.9",
          "runtimepack.Microsoft.Windows.SDK.NET.Ref": "10.0.19041.28"
          "runtimepack.Microsoft.Windows.SDK.NET.Ref": "10.0.19041.52"
        },
        "runtime": {
          "Bro.UI.Main.dll": {}
        }
      },
      "runtimepack.Microsoft.Windows.SDK.NET.Ref/10.0.19041.28": {
      "runtimepack.Microsoft.Windows.SDK.NET.Ref/10.0.19041.52": {
        "runtime": {
          "Microsoft.Windows.SDK.NET.dll": {
            "assemblyVersion": "10.0.19041.24",
            "fileVersion": "10.0.19041.28"
            "assemblyVersion": "10.0.19041.38",
            "fileVersion": "10.0.19041.52"
          },
          "WinRT.Runtime.dll": {
            "assemblyVersion": "2.0.0.0",
            "fileVersion": "2.0.1.40881"
            "assemblyVersion": "2.1.0.0",
            "fileVersion": "2.1.6.47881"
          }
        }
      },
@@ -1009,7 +1009,10 @@
          "Bro.UI.Model.Winform": "1.0.0"
        },
        "runtime": {
          "Bro.Common.Device.dll": {}
          "Bro.Common.Device.dll": {
            "assemblyVersion": "1.0.0",
            "fileVersion": "1.0.40124.0"
          }
        }
      },
      "Bro.Common.Model/1.0.0": {
@@ -1021,7 +1024,10 @@
          "System.Resources.ResourceManager": "4.3.0"
        },
        "runtime": {
          "Bro.Common.Model.dll": {}
          "Bro.Common.Model.dll": {
            "assemblyVersion": "1.0.0",
            "fileVersion": "1.0.40127.0"
          }
        },
        "resources": {
          "en-US/Bro.Common.Model.resources.dll": {
@@ -1035,7 +1041,10 @@
          "Microsoft.EntityFrameworkCore": "7.0.0"
        },
        "runtime": {
          "Bro.DataBase.Model.dll": {}
          "Bro.DataBase.Model.dll": {
            "assemblyVersion": "1.0.0",
            "fileVersion": "1.0.0.0"
          }
        }
      },
      "Bro.Process/1.0.0": {
@@ -1047,7 +1056,10 @@
          "Bro.UI.Model.Winform": "1.0.0"
        },
        "runtime": {
          "Bro.Process.dll": {}
          "Bro.Process.dll": {
            "assemblyVersion": "1.0.0",
            "fileVersion": "1.0.40125.0"
          }
        }
      },
      "Bro.Process.DataBase/1.0.0": {
@@ -1061,7 +1073,10 @@
          "System.Configuration.ConfigurationManager": "6.0.0"
        },
        "runtime": {
          "Bro.Process.DataBase.dll": {}
          "Bro.Process.DataBase.dll": {
            "assemblyVersion": "1.0.0",
            "fileVersion": "1.0.21116.0"
          }
        }
      },
      "Bro.UI.Device.Winform/1.0.0": {
@@ -1071,7 +1086,10 @@
          "Bro.UI.Model.Winform": "1.0.0"
        },
        "runtime": {
          "Bro.UI.Device.Winform.dll": {}
          "Bro.UI.Device.Winform.dll": {
            "assemblyVersion": "1.0.0",
            "fileVersion": "1.0.30415.0"
          }
        }
      },
      "Bro.UI.Model.Winform/1.0.0": {
@@ -1081,7 +1099,10 @@
          "SunnyUI": "3.0.9"
        },
        "runtime": {
          "Bro.UI.Model.Winform.dll": {}
          "Bro.UI.Model.Winform.dll": {
            "assemblyVersion": "1.0.0",
            "fileVersion": "1.0.21118.0"
          }
        }
      },
      "halcondotnet/12.0.0.0": {
@@ -1116,7 +1137,7 @@
      "serviceable": false,
      "sha512": ""
    },
    "runtimepack.Microsoft.Windows.SDK.NET.Ref/10.0.19041.28": {
    "runtimepack.Microsoft.Windows.SDK.NET.Ref/10.0.19041.52": {
      "type": "runtimepack",
      "serviceable": false,
      "sha512": ""

 libs/PFW/Bro.UI.Main.dll

Binary files differ

 libs/PFW/Bro.UI.Main.exe

Binary files differ

 libs/PFW/Bro.UI.Model.Winform.dll

Binary files differ

 libs/halcon12/halcondotnet.dll

Binary files differ

 libs/halcon12/hdevenginedotnet.dll

Binary files differ

 src/Bro.M135.Common/ProductModel.cs

@@ -76,6 +76,8 @@

        public bool IsPreStationOK { get; set; } = false;

        public List<string> ImagePaths { get; set; } = new List<string>();

        public DateTime? EndTime { get; set; } = null;

        object _checkResultLock = new object();

 src/Bro.M141.Process/M141Process.cs

@@ -38,8 +38,11 @@

        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();
@@ -55,7 +58,6 @@
        public override void InitialProcessMethods()
        {
            base.InitialProcessMethods();


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



        public override void Open()
@@ -120,6 +121,7 @@
            base.Close();

        }


        public void Heartplc()
        {
@@ -417,8 +419,6 @@
        Dictionary<string, List<string>> _positionSpecHeads = new Dictionary<string, List<string>>();




        volatile int uploadId = 0;


@@ -512,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>();



 src/Bro.M141.Process/M141Process_ImageCheck.cs

@@ -747,7 +747,7 @@

            UpdateDefectAsync(defects);
            var defectClass = GetDefectClassFromDefectList(defects);
            UpdateResult(DateTime.Now, p.SN, defectClass.ClassName, "");
            UpdateResult(DateTime.Now, p.SN, defectClass.ClassName, "",p.ImagePaths);

            //产品序号+1
            //Interlocked.Increment(ref _productIndex);

 src/Bro.M141_AOI1.Process/AOI1Process.cs

@@ -48,6 +48,7 @@
            base.Open();
        }


        [ProcessMethod("", "PositionCheck_P1", "工位1检测", InvokeType.TestInvoke)]
        public ResponseMessage PositionCheck_P1(IOperationConfig config, IDevice invokeDevice, IDevice sourceDevice)
        {
@@ -64,6 +65,7 @@

            return msg;
        }


        [ProcessMethod("", "PositionCheck_P2", "工位2检测", InvokeType.TestInvoke)]
        public ResponseMessage PositionCheck_P2(IOperationConfig config, IDevice invokeDevice, IDevice sourceDevice)
@@ -82,6 +84,7 @@
            return msg;
        }


        [ProcessMethod("", "PositionCheck_P3", "工位3检测", InvokeType.TestInvoke)]
        public ResponseMessage PositionCheck_P3(IOperationConfig config, IDevice invokeDevice, IDevice sourceDevice)
        {
@@ -98,7 +101,6 @@

            return msg;
        }



        [ProcessMethod("ImageCheck", "ReadBarcode", "读码", InvokeType.TestInvoke)]
@@ -234,6 +236,7 @@
            return "NOREAD";
        }


        private bool CheckBarcodeValid(string barcode)
        {
            bool isBarcodeValid = true;