板卡默认动作参数调整

xcd

2020-07-11 f606e2d3e01f9bce8ecd1df600ae5b09422c48f3

 src/Bro.M071.Process/M071Process.cs

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

            base.Open();

            InitialMotionCardBaseAxisAlarm();

            SwitchBeep(false);
            SwitchLightGreen(false);
            SwitchLightRed(false);
@@ -57,6 +59,21 @@

            Reset(null, null, null);
            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()
@@ -472,7 +489,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 +520,9 @@

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

            await Task.Run(() =>
            {
                ExcelExportSet excelExportDto = new ExcelExportSet();
@@ -527,7 +547,7 @@
                excelExportDto.WorksheetDataTable[excelExportDto.Worksheets[1]] = ExcelExportHelper.ListToDataTable(measurementUnitResultAndKeyUnitDataSet.MeasurementUnitResultList, measurementUnitResultColumns); ;

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