一天一个excel 添加产品条码列

wells.liu

2020-07-13 b2a5e60d5df66bc8a6be7e12eded1f7e923e9196

一天一个excel 添加产品条码列

 src/Bro.M071.Model/Model/KeyUnitData.cs

@@ -1,6 +1,7 @@

using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

namespace Bro.M071.Model.Model
{
@@ -32,6 +33,9 @@
        /// </summary>
        [StringLength(64)]
        public string ItemValue { get; set; }

        [NotMapped]
        public string ProductionBarcode { get; set; }
    }

    public class KeyUnitDataRequest : BaseRequest

 src/Bro.M071.Model/Model/MeasurementUnitResult.cs

@@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

namespace Bro.M071.Model.Model
{
@@ -39,6 +40,9 @@
        /// </summary>
        [StringLength(64)]
        public string MeasurementResult { get; set; }

        [NotMapped]
        public string ProductionBarcode { get; set; }
    }

    public class MeasurementUnitResultRequest : BaseRequest

 src/Bro.M071.Process/M071Process.cs

@@ -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);