M071.git - Gitblit

			@@ -50,6 +50,8 @@

			base.Open();

			InitialMotionCardBaseAxisAlarm();

			SwitchBeep(false);
			SwitchLightGreen(false);
			SwitchLightRed(false);
			@@ -59,10 +61,25 @@
			FullReset(null);
			}

			private void InitialMotionCardBaseAxisAlarm()
			{
			if (outputCtrlCard != null)
			{
			outputCtrlCard.OnAxisAlarmRaised -= MotionCard_OnAxisAlarmRaised;
			outputCtrlCard.OnAxisAlarmRaised += MotionCard_OnAxisAlarmRaised;
			}
			}

			private void MotionCard_OnAxisAlarmRaised(int axisIndex, string alarmMsg)
			{
			RaisedAlarm(alarmMsg);
			MachineState = MachineState.Alarm;
			}

			private void InitialSetting()
			{
			//数据库迁移检查
			DatabaseInitialize.Initialize();
			//DatabaseInitialize.Initialize();

			MotionCardSettingCheck();

			@@ -202,6 +219,11 @@
			Config.SnapshotPointCollection.Where(u => u.IsEnabled).ToList().ForEach(s =>
			{
			_pauseHandle.WaitHandle.WaitOne();

			if (MachineState != MachineState.Running)
			{
			throw new ProcessException("机台状态不在运行中，退出检测");
			}

			IDevice device = DeviceCollection.FirstOrDefault(u => u.Id == s.MotionOp.Device);
			if (device == null)
			@@ -472,7 +494,7 @@
			{
			foreach (var keyValue in keyUnit.MeasureValueDict)//获取单个键的单个测量item 结果
			{
			bool isExist = keyUnitDatas.FirstOrDefault(u => u.Key == keyUnit.Key && u.MeasurementItem == keyValue.Key) != null;
			bool isExist = keyUnitDatas.Any(u => u.Key == keyUnit.Key && u.MeasurementItem == keyValue.Key);
			if (!isExist)//已存在不重复添加原始数据
			{
			KeyUnitData keyUnitData = new KeyUnitData();
			@@ -503,6 +525,9 @@

			private async void ExportProductionExcel(ProductionMeasurementUnitResultAndKeyUnitDataSet measurementUnitResultAndKeyUnitDataSet)
			{
			if (!Config.IsCSVOutputEnabled)
			return;

			await Task.Run(() =>
			{
			ExcelExportSet excelExportDto = new ExcelExportSet();