M071.git - Gitblit

			@@ -61,7 +61,6 @@

			Reset(null, null, null);
			FullReset(null);

			}

			private void InitialMotionCardBaseAxisAlarm()
			@@ -82,7 +81,7 @@
			private void InitialSetting()
			{
			//数据库迁移检查
			DatabaseInitialize.Initialize();
			//DatabaseInitialize.Initialize();

			MotionCardSettingCheck();

			@@ -196,7 +195,7 @@
			}

			MachineState = MachineState.Running;
			OnMeasureStart?.BeginInvoke(null, null);
			OnMeasureStart?.Invoke();

			var measurements = Config.MeasurementUnitCollection.Where(u => u.IsEnabled).ToList().DeepSerializeClone();
			measurements.ForEach(m =>
			@@ -226,9 +225,12 @@

			Config.SnapshotPointCollection.Where(u => u.IsEnabled).ToList().ForEach(s =>
			{
			_pauseHandle.WaitHandle.WaitOne();
			_pausedHandle.Wait();

			if (MachineState != MachineState.Running)
			if (MachineState == MachineState.Ready)
			return;

			if (MachineState != MachineState.Running && MachineState != MachineState.Pause)
			{
			throw new ProcessException("机台状态不在运行中，退出检测");
			}
			@@ -336,10 +338,14 @@
			{
			if (sender is ProductionMeasurement pMeasure)
			{
			lock (pMeasure)
			var production = productionList.FirstOrDefault(u => u.Barcode == pMeasure.Barcode);
			if (production == null)
			return;

			lock (production)
			{
			//检查是否全部完成
			pMeasure.Measurements.ForEach(m =>
			pMeasure.Measurements?.ForEach(m =>
			{
			if (m.KeyUnitCollection.All(k => k.IsDone != null))
			{
			@@ -381,7 +387,7 @@
			indicator.ResultState = m.Spec.MeasureResult;
			pMeasure.ElementList.Add(indicator);
			//输出图形基元到界面
			OnElementUpdated?.BeginInvoke(indicator, null, null);
			OnElementUpdated?.Invoke(indicator);

			SaveKeyImages(pMeasure.Barcode, m);

			@@ -414,8 +420,8 @@
			{
			}

			////Excel报表输出（单个产品的excel导出）
			//ExportProductionExcel(measurementUnitResultAndKeyUnitDataSet);
			//Excel报表输出（单个产品的excel导出）
			ExportProductionExcel(measurementUnitResultAndKeyUnitDataSet);
			////数据库保存
			//SaveProductionData(measurementUnitResultAndKeyUnitDataSet);

			@@ -493,7 +499,8 @@
			{
			MeasurementUnitResult measurementUnitResult = new MeasurementUnitResult();
			measurementUnitResult.ProductionMeasurementRecordsId = productionMeasurementRecords.ID;
			measurementUnitResult.MeasurementName = measurementUnit.Name;
			measurementUnitResult.ProductionBarcode = productionMeasurementRecords.ProductionBarcode;
			measurementUnitResult.MeasurementName = measurementUnit.GetDisplayText();
			measurementUnitResult.MeasurementType = measurementUnit.MeasureType;
			measurementUnitResult.MeasurementValue = measurementUnit.Spec.ActualValue.ToString();
			measurementUnitResult.MeasurementResult = measurementUnit.Spec.MeasureResult.Value ? "OK" : "NG";
			@@ -508,6 +515,7 @@
			if (!isExist)//已存在不重复添加原始数据
			{
			KeyUnitData keyUnitData = new KeyUnitData();
			keyUnitData.ProductionBarcode = productionMeasurementRecords.ProductionBarcode;
			keyUnitData.Key = keyUnit.Key;
			keyUnitData.MeasurementItem = keyValue.Key;
			keyUnitData.ItemValue = keyValue.Value.ToString();
			@@ -544,12 +552,14 @@
			excelExportDto.Worksheets = new List<string>() { "原始数据", "检测结果" };
			var keyUnitColumns = new Dictionary<string, string>()
			{
			{"ProductionBarcode", "产品条码"},
			{"Key", "键"},
			{"MeasurementItem", "检测项"},
			{"ItemValue", "检测值"}
			};
			var measurementUnitResultColumns = new Dictionary<string, string>()
			{
			{"ProductionBarcode", "产品条码"},
			{"MeasurementName", "检测名称"},
			{"MeasurementType", "检测类型"},
			{"MeasurementValue", "检测值"},
			@@ -561,14 +571,14 @@
			excelExportDto.WorksheetDataTable[excelExportDto.Worksheets[0]] = ExcelExportHelper.ListToDataTable(measurementUnitResultAndKeyUnitDataSet.KeyUnitDataList, keyUnitColumns);
			excelExportDto.WorksheetDataTable[excelExportDto.Worksheets[1]] = ExcelExportHelper.ListToDataTable(measurementUnitResultAndKeyUnitDataSet.MeasurementUnitResultList, measurementUnitResultColumns); ;

			byte[] filecontent = ExcelExportHelper.ExportExcel(excelExportDto, false);
			string dir = Path.Combine(Config.LogPath, DateTime.Now.ToString("yyyyMMdd"));
			if (!Directory.Exists(dir))
			if (!Directory.Exists(Config.LogPath))
			{
			Directory.CreateDirectory(dir);
			Directory.CreateDirectory(Config.LogPath);
			}
			var fileName = Path.Combine(Config.LogPath, $"ProductionData_{DateTime.Now.ToString("yyyyMMdd")}.xlsx");

			FileStream fs = new FileStream(Path.Combine(dir, $"{measurementUnitResultAndKeyUnitDataSet.ProductionMeasurementRecord.ProductionBarcode}_{DateTime.Now.ToString("HHmmss")}.xlsx"), FileMode.Create, FileAccess.Write);
			byte[] filecontent = ExcelExportHelper.CreateOrAppendExcel(excelExportDto, fileName);
			FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write);
			fs.Write(filecontent, 0, filecontent.Length);
			fs.Flush();
			fs.Close();
			@@ -719,14 +729,14 @@
			});
			}

			string dir = Path.Combine(Config.ImageSaveFolder, "Clips", $"{snapshotName}_{DateTime.Now.ToString("HHmmss")}");
			string dir = Path.Combine(Config.ImageSaveFolder, "Clips", $"{DateTime.Now.ToString("yyyyMMdd")}", $"{snapshotName}_{DateTime.Now.ToString("HHmmss")}");
			if (!Directory.Exists(dir))
			{
			Directory.CreateDirectory(dir);
			}

			Parallel.For(1, count.I + 1, (i) =>
			//for (int i = 1; i <= count.I; i++)
			//Parallel.For(1, count.I + 1, (i) =>
			for (int i = 1; i <= count.I; i++)
			{
			HOperatorSet.SelectObj(images, out HObject image, i);

			@@ -758,10 +768,11 @@
			var results = _halconToolDict[keyToolKey].GetResultTuple("OUTPUT_Results").HTupleToDouble();
			if (results.Count == 0 \|\| results.Any(u => u < 0))
			{
			LogAsync(DateTime.Now, $"{k.AliasName}检测结果异常", "");
			LogAsync(DateTime.Now, $"{k.AliasName}原始数据异常", "");
			}
			else
			{
			LogAsync(DateTime.Now, $"{k.AliasName}原始数据", $"{string.Join(" ", results)}");
			resultDict = k.KeyResultList.ToDictionary(u => u, u =>
			{
			int index = k.KeyResultList.IndexOf(u);
			@@ -780,7 +791,7 @@

			//image.Dispose();
			}
			);
			//);

			//if (count.I != 1)
			//{