From c01cce7ac1dc691c6b667b298ce0637b924102ea Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期二, 14 七月 2020 16:29:09 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Process/M071Process.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index 5090d47..70d01cd 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/src/Bro.M071.Process/M071Process.cs
@@ -414,8 +414,8 @@
{
}
- ////Excel鎶ヨ〃杈撳嚭 锛堝崟涓骇鍝佺殑excel瀵煎嚭锛�
- //ExportProductionExcel(measurementUnitResultAndKeyUnitDataSet);
+ //Excel鎶ヨ〃杈撳嚭 锛堝崟涓骇鍝佺殑excel瀵煎嚭锛�
+ ExportProductionExcel(measurementUnitResultAndKeyUnitDataSet);
////鏁版嵁搴撲繚瀛�
//SaveProductionData(measurementUnitResultAndKeyUnitDataSet);
@@ -493,6 +493,7 @@
{
MeasurementUnitResult measurementUnitResult = new MeasurementUnitResult();
measurementUnitResult.ProductionMeasurementRecordsId = productionMeasurementRecords.ID;
+ measurementUnitResult.ProductionBarcode = productionMeasurementRecords.ProductionBarcode;
measurementUnitResult.MeasurementName = measurementUnit.Name;
measurementUnitResult.MeasurementType = measurementUnit.MeasureType;
measurementUnitResult.MeasurementValue = measurementUnit.Spec.ActualValue.ToString();
@@ -508,6 +509,7 @@
if (!isExist)//宸插瓨鍦� 涓嶉噸澶嶆坊鍔犲師濮嬫暟鎹�
{
KeyUnitData keyUnitData = new KeyUnitData();
+ keyUnitData.ProductionBarcode = productionMeasurementRecords.ProductionBarcode;
keyUnitData.Key = keyUnit.Key;
keyUnitData.MeasurementItem = keyValue.Key;
keyUnitData.ItemValue = keyValue.Value.ToString();
@@ -544,12 +546,14 @@
excelExportDto.Worksheets = new List<string>() { "鍘熷鏁版嵁", "妫�娴嬬粨鏋�" };
var keyUnitColumns = new Dictionary<string, string>()
{
+ {"ProductionBarcode", "浜у搧鏉＄爜"},
{"Key", "閿�"},
{"MeasurementItem", "妫�娴嬮」"},
{"ItemValue", "妫�娴嬪��"}
};
var measurementUnitResultColumns = new Dictionary<string, string>()
{
+ {"ProductionBarcode", "浜у搧鏉＄爜"},
{"MeasurementName", "妫�娴嬪悕绉�"},
{"MeasurementType", "妫�娴嬬被鍨�"},
{"MeasurementValue", "妫�娴嬪��"},
@@ -561,12 +565,11 @@
excelExportDto.WorksheetDataTable[excelExportDto.Worksheets[0]] = ExcelExportHelper.ListToDataTable(measurementUnitResultAndKeyUnitDataSet.KeyUnitDataList, keyUnitColumns);
excelExportDto.WorksheetDataTable[excelExportDto.Worksheets[1]] = ExcelExportHelper.ListToDataTable(measurementUnitResultAndKeyUnitDataSet.MeasurementUnitResultList, measurementUnitResultColumns); ;
- string dir = Path.Combine(Config.LogPath, DateTime.Now.ToString("yyyyMMdd"));
- if (!Directory.Exists(dir))
+ if (!Directory.Exists(Config.LogPath))
{
- Directory.CreateDirectory(dir);
+ Directory.CreateDirectory(Config.LogPath);
}
- var fileName = Path.Combine(dir, $"{measurementUnitResultAndKeyUnitDataSet.ProductionMeasurementRecord.ProductionBarcode}_{DateTime.Now.ToString("HHmmss")}.xlsx");
+ var fileName = Path.Combine(Config.LogPath, $"ProductionData_{DateTime.Now.ToString("yyyyMMdd")}.xlsx");
byte[] filecontent = ExcelExportHelper.CreateOrAppendExcel(excelExportDto, fileName);
FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write);
--
Gitblit v1.8.0