添加平面补偿值 修改Excel输出细节

xcd

2020-07-16 d955f446a91a4377e1a87a74141542ee35508930

添加平面补偿值
修改Excel输出细节

 src/Bro.M071.Process/M071Config.cs

@@ -75,6 +75,11 @@
        [Editor(typeof(ComplexCollectionEditor<MeasurementUnit>), typeof(UITypeEditor))]
        public List<MeasurementUnit> MeasurementUnitCollection { get; set; } = new List<MeasurementUnit>();

        [Category("检测设置")]
        [Description("平面补偿值")]
        [DisplayName("4.平面补偿值")]
        public double PlanCompensation { get; set; }

        //[Category("检测设置")]
        //[DisplayName("结果数据保存路径")]
        //[Description("检测结果数据保存路径")]

 src/Bro.M071.Process/M071Process.cs

@@ -758,8 +758,12 @@
                        {
                            int slantStartCol = slantSheet.Dimension.Columns;

                            var barcodeCell = slantSheet.Cells[1, slantStartCol + 1, 1, slantStartCol + 2];
                            barcodeCell.Merge = true;
                            //var barcodeCell = slantSheet.Cells[1, slantStartCol + 1, 1, slantStartCol + 2];
                            //barcodeCell.Merge = true;
                            //barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
                            //SetTitleCell(barcodeCell);

                            var barcodeCell = slantSheet.Cells[1, slantStartCol + 1];
                            barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
                            SetTitleCell(barcodeCell);

@@ -767,9 +771,9 @@
                            valueCell.Value = "Value";
                            SetTitleCell(valueCell);

                            var resultCell = slantSheet.Cells[2, slantStartCol + 2];
                            resultCell.Value = "Result";
                            SetTitleCell(resultCell);
                            //var resultCell = slantSheet.Cells[2, slantStartCol + 2];
                            //resultCell.Value = "Result";
                            //SetTitleCell(resultCell);

                            slantMeasures.ForEach(m =>
                            {
@@ -781,15 +785,15 @@
                                }

                                var cellValue = slantSheet.Cells[rowIndex + 1 + 2, slantStartCol + 1];
                                var cellResult = slantSheet.Cells[rowIndex + 1 + 2, slantStartCol + 2];
                                //var cellResult = slantSheet.Cells[rowIndex + 1 + 2, slantStartCol + 2];

                                cellValue.Value = m.MeasurementValue;
                                cellResult.Value = m.MeasurementResult;
                                //cellResult.Value = m.MeasurementResult;

                                if (m.MeasurementResult != "OK")
                                {
                                    SetNGCell(cellValue);
                                    SetNGCell(cellResult);
                                    //SetNGCell(cellResult);
                                }
                            });
                        }
@@ -812,8 +816,12 @@
                                    keysList.Add($"{keys}_{position}");
                                }

                                var barcodeCell = alignmentSheet.Cells[1, aligneStartCol + 1, 1, aligneStartCol + 2];
                                barcodeCell.Merge = true;
                                //var barcodeCell = alignmentSheet.Cells[1, aligneStartCol + 1, 1, aligneStartCol + 2];
                                //barcodeCell.Merge = true;
                                //barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
                                //SetTitleCell(barcodeCell);

                                var barcodeCell = alignmentSheet.Cells[1, aligneStartCol + 1];
                                barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
                                SetTitleCell(barcodeCell);

@@ -821,9 +829,9 @@
                                valueCell.Value = "Value";
                                SetTitleCell(valueCell);

                                var resultCell = alignmentSheet.Cells[2, aligneStartCol + 2];
                                resultCell.Value = "Result";
                                SetTitleCell(resultCell);
                                //var resultCell = alignmentSheet.Cells[2, aligneStartCol + 2];
                                //resultCell.Value = "Result";
                                //SetTitleCell(resultCell);

                                alignmentMeasures.ForEach(a =>
                                {
@@ -835,15 +843,15 @@
                                    }

                                    var cellValue = alignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 1];
                                    var cellResult = alignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 2];
                                    //var cellResult = alignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 2];

                                    cellValue.Value = a.MeasurementValue;
                                    cellResult.Value = a.MeasurementResult;
                                    //cellResult.Value = a.MeasurementResult;

                                    if (a.MeasurementResult != "OK")
                                    {
                                        SetNGCell(cellValue);
                                        SetNGCell(cellResult);
                                        //SetNGCell(cellResult);
                                    }
                                });
                            }
@@ -867,8 +875,12 @@
                                    keysList.Add($"{keys}_{position}");
                                }

                                var barcodeCell = rowAlignmentSheet.Cells[1, aligneStartCol + 1, 1, aligneStartCol + 2];
                                barcodeCell.Merge = true;
                                //var barcodeCell = rowAlignmentSheet.Cells[1, aligneStartCol + 1, 1, aligneStartCol + 2];
                                //barcodeCell.Merge = true;
                                //barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
                                //SetTitleCell(barcodeCell);

                                var barcodeCell = rowAlignmentSheet.Cells[1, aligneStartCol + 1];
                                barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
                                SetTitleCell(barcodeCell);

@@ -876,9 +888,9 @@
                                valueCell.Value = "Value";
                                SetTitleCell(valueCell);

                                var resultCell = rowAlignmentSheet.Cells[2, aligneStartCol + 2];
                                resultCell.Value = "Result";
                                SetTitleCell(resultCell);
                                //var resultCell = rowAlignmentSheet.Cells[2, aligneStartCol + 2];
                                //resultCell.Value = "Result";
                                //SetTitleCell(resultCell);

                                rowAlignmentMeasures.ForEach(a =>
                                {
@@ -890,15 +902,15 @@
                                    }

                                    var cellValue = rowAlignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 1];
                                    var cellResult = rowAlignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 2];
                                    //var cellResult = rowAlignmentSheet.Cells[rowIndex + 1 + 2, aligneStartCol + 2];

                                    cellValue.Value = a.MeasurementValue;
                                    cellResult.Value = a.MeasurementResult;
                                    //cellResult.Value = a.MeasurementResult;

                                    if (a.MeasurementResult != "OK")
                                    {
                                        SetNGCell(cellValue);
                                        SetNGCell(cellResult);
                                        //SetNGCell(cellResult);
                                    }
                                });
                            }
@@ -913,10 +925,10 @@

        private void SetNGCell(ExcelRange cell)
        {
            cell.Style.Font.Color.SetColor(Color.White);
            cell.Style.Font.Color.SetColor(Color.Red);
            cell.Style.Font.Bold = true;
            cell.Style.Fill.PatternType = ExcelFillStyle.Solid;
            cell.Style.Fill.BackgroundColor.SetColor(Color.Red);
            //cell.Style.Fill.PatternType = ExcelFillStyle.Solid;
            //cell.Style.Fill.BackgroundColor.SetColor(Color.Red);
        }

        private void SetTitleCell(ExcelRange cell, bool isCenterAlign = true)
@@ -1132,6 +1144,8 @@
                                     {
                                         //results = results.Select(u => double.Parse(u.ToString("f2"))).ToList();
                                         LogAsync(DateTime.Now, $"{k.AliasName}原始数据", $"{string.Join(" ", results)}");

                                         results.ForEach(u => u = u - Config.PlanCompensation);
                                         resultDict = k.KeyResultList.ToDictionary(u => u, u =>
                                              {
                                                  int index = k.KeyResultList.IndexOf(u);