index修改

wells.liu

2020-07-10 29e271c591bb00bb131b42a5964f0a4470e12cff

 src/Bro.M071.Process/M071Process.cs

@@ -379,7 +379,7 @@

                //MES输出 todo
                if (Config.IsEnableMESUpload)
                { 
                {
                }

                //Excel报表输出 （单个产品的excel导出）
@@ -472,17 +472,20 @@
                    {
                        foreach (var keyValue in keyUnit.MeasureValueDict)//获取单个键的单个测量item 结果
                        {
                            KeyUnitData keyUnitData = new KeyUnitData();
                            keyUnitData.Key = keyUnit.Key;
                            keyUnitData.MeasurementItem = keyValue.Key;
                            keyUnitData.ItemValue = keyValue.Value.ToString();
                            keyUnitDatas.Add(keyUnitData);
                            bool isExist = keyUnitDatas.FirstOrDefault(u => u.Key == keyUnit.Key && u.MeasurementItem == keyValue.Key) != null;
                            if (!isExist)//已存在 不重复添加原始数据
                            {
                                KeyUnitData keyUnitData = new KeyUnitData();
                                keyUnitData.Key = keyUnit.Key;
                                keyUnitData.MeasurementItem = keyValue.Key;
                                keyUnitData.ItemValue = keyValue.Value.ToString();
                                keyUnitDatas.Add(keyUnitData);

                            MeasurementAndKeyDataRelation measurementAndKeyDataRelation = new MeasurementAndKeyDataRelation();
                            measurementAndKeyDataRelation.MeasurementUnitResultId = measurementUnitResult.ID;
                            measurementAndKeyDataRelation.KeyUnitDataId = keyUnitData.ID;
                            measurementAndKeyDataRelationList.Add(measurementAndKeyDataRelation);

                                MeasurementAndKeyDataRelation measurementAndKeyDataRelation = new MeasurementAndKeyDataRelation();
                                measurementAndKeyDataRelation.MeasurementUnitResultId = measurementUnitResult.ID;
                                measurementAndKeyDataRelation.KeyUnitDataId = keyUnitData.ID;
                                measurementAndKeyDataRelationList.Add(measurementAndKeyDataRelation);
                            }
                        }
                    }
                }
@@ -524,7 +527,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);