From 27ec4a74d3ed9aa8ce1ee8e5d0955596c67cb996 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期一, 13 七月 2020 18:36:39 +0800
Subject: [PATCH] Excel追加 +设置样式做好了
---
src/Bro.M071.Process/M071Process.cs | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index a0e47ae..5090d47 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/src/Bro.M071.Process/M071Process.cs
@@ -82,7 +82,7 @@
private void InitialSetting()
{
//鏁版嵁搴撹縼绉绘鏌�
- //DatabaseInitialize.Initialize();
+ DatabaseInitialize.Initialize();
MotionCardSettingCheck();
@@ -489,18 +489,18 @@
measurementUnitResultAndKeyUnitDataSet.ProductionMeasurementRecord = productionMeasurementRecords;
- foreach (var MeasurementUnitResult in pData.Measurements)//鑾峰彇鍒板崟涓祴閲忛」缁撴灉
+ foreach (var measurementUnit in pData.Measurements)//鑾峰彇鍒板崟涓祴閲忛」缁撴灉
{
MeasurementUnitResult measurementUnitResult = new MeasurementUnitResult();
measurementUnitResult.ProductionMeasurementRecordsId = productionMeasurementRecords.ID;
- measurementUnitResult.MeasurementName = MeasurementUnitResult.Name;
- measurementUnitResult.MeasurementType = MeasurementUnitResult.MeasureType;
- measurementUnitResult.MeasurementValue = MeasurementUnitResult.Spec.ActualValue.ToString();
- measurementUnitResult.MeasurementResult = MeasurementUnitResult.Spec.MeasureResult.Value ? "OK" : "NG";
+ measurementUnitResult.MeasurementName = measurementUnit.Name;
+ measurementUnitResult.MeasurementType = measurementUnit.MeasureType;
+ measurementUnitResult.MeasurementValue = measurementUnit.Spec.ActualValue.ToString();
+ measurementUnitResult.MeasurementResult = measurementUnit.Spec.MeasureResult.Value ? "OK" : "NG";
measurementUnitResults.Add(measurementUnitResult);
- foreach (var keyUnit in MeasurementUnitResult.KeyUnitCollection)//鑾峰彇鍗曚釜閿殑娴嬮噺缁撴灉
+ foreach (var keyUnit in measurementUnit.KeyUnitCollection)//鑾峰彇鍗曚釜閿殑娴嬮噺缁撴灉
{
foreach (var keyValue in keyUnit.MeasureValueDict)//鑾峰彇鍗曚釜閿殑鍗曚釜娴嬮噺item 缁撴灉
{
@@ -561,14 +561,15 @@
excelExportDto.WorksheetDataTable[excelExportDto.Worksheets[0]] = ExcelExportHelper.ListToDataTable(measurementUnitResultAndKeyUnitDataSet.KeyUnitDataList, keyUnitColumns);
excelExportDto.WorksheetDataTable[excelExportDto.Worksheets[1]] = ExcelExportHelper.ListToDataTable(measurementUnitResultAndKeyUnitDataSet.MeasurementUnitResultList, measurementUnitResultColumns); ;
- byte[] filecontent = ExcelExportHelper.ExportExcel(excelExportDto, false);
string dir = Path.Combine(Config.LogPath, DateTime.Now.ToString("yyyyMMdd"));
if (!Directory.Exists(dir))
{
Directory.CreateDirectory(dir);
}
+ var fileName = Path.Combine(dir, $"{measurementUnitResultAndKeyUnitDataSet.ProductionMeasurementRecord.ProductionBarcode}_{DateTime.Now.ToString("HHmmss")}.xlsx");
- FileStream fs = new FileStream(Path.Combine(dir, $"{measurementUnitResultAndKeyUnitDataSet.ProductionMeasurementRecord.ProductionBarcode}_{DateTime.Now.ToString("HHmmss")}.xlsx"), FileMode.Create, FileAccess.Write);
+ byte[] filecontent = ExcelExportHelper.CreateOrAppendExcel(excelExportDto, fileName);
+ FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write);
fs.Write(filecontent, 0, filecontent.Length);
fs.Flush();
fs.Close();
--
Gitblit v1.8.0