M071.git - Gitblit

			@@ -208,7 +208,7 @@
			{
			hint = "机台未就绪，请勿开始测量";
			OnCheckHintUpload?.Invoke(hint, true);
			throw new ProcessException(hint, null, ExceptionLevel.Fatal);
			throw new ProcessException(hint, null, ExceptionLevel.Warning);
			}

			if (string.IsNullOrWhiteSpace(BarCode))
			@@ -553,8 +553,20 @@

			LogAsync(DateTime.Now, $"{pMeasure.Barcode} 检测完成，结果 {pMeasure.PResult}", "");

			if (MachineState == MachineState.Running)
			//if (MachineState == MachineState.Running)
			// MachineState = MachineState.Ready;

			if (MachineState != MachineState.Alarm)
			{
			if (MachineState == MachineState.Pause)
			{
			_machineStateBeforePause = MachineState.Ready;
			}
			else
			{
			MachineState = MachineState.Ready;
			}
			}

			var measurementUnitResultAndKeyUnitDataSet = GetMeasurementUnitResultAndKeyUnitData(pMeasure);

			@@ -661,7 +673,7 @@
			}
			measurementUnitResult.MeasurementType = measurementUnit.MeasureType;
			measurementUnitResult.MeasurementValue = measurementUnit.Spec.ActualValue == null ? "NA" : measurementUnit.Spec.ActualValue.Value.ToString(_precision);
			measurementUnitResult.MeasurementResult = measurementUnit.Spec.MeasureResult.Value ? "OK" : "NG";
			measurementUnitResult.MeasurementResult = measurementUnit.Spec.MeasureResult == null ? "NA" : measurementUnit.Spec.MeasureResult.Value ? "OK" : "NG";

			measurementUnitResults.Add(measurementUnitResult);