From 875a4c2ad21ec2b7c937955773e9687f1c43bb64 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期五, 10 七月 2020 17:36:39 +0800
Subject: [PATCH] 板卡暂停/恢复提至板卡基类 流程方法修改参数
---
src/Bro.M071.Process/M071Process.cs | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index 6b0702d..26c855d 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/src/Bro.M071.Process/M071Process.cs
@@ -378,6 +378,9 @@
var measurementUnitResultAndKeyUnitDataSet = GetMeasurementUnitResultAndKeyUnitData(pMeasure);
//MES杈撳嚭 todo
+ if (Config.IsEnableMESUpload)
+ {
+ }
//Excel鎶ヨ〃杈撳嚭 锛堝崟涓骇鍝佺殑excel瀵煎嚭锛�
ExportProductionExcel(measurementUnitResultAndKeyUnitDataSet);
@@ -460,7 +463,7 @@
measurementUnitResult.ProductionMeasurementRecordsId = productionMeasurementRecords.ID;
measurementUnitResult.MeasurementName = MeasurementUnitResult.Name;
measurementUnitResult.MeasurementType = MeasurementUnitResult.MeasureType;
- measurementUnitResult.MeasurementValue = "";
+ measurementUnitResult.MeasurementValue = MeasurementUnitResult.Spec.ActualValue.ToString();
measurementUnitResult.MeasurementResult = MeasurementUnitResult.Spec.MeasureResult.Value ? "OK" : "NG";
measurementUnitResults.Add(measurementUnitResult);
@@ -469,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.Any(u => u.Key == keyUnit.Key && u.MeasurementItem == keyValue.Key);
+ 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);
+ }
}
}
}
@@ -497,6 +503,9 @@
private async void ExportProductionExcel(ProductionMeasurementUnitResultAndKeyUnitDataSet measurementUnitResultAndKeyUnitDataSet)
{
+ if (!Config.IsCSVOutputEnabled)
+ return;
+
await Task.Run(() =>
{
ExcelExportSet excelExportDto = new ExcelExportSet();
@@ -521,7 +530,7 @@
excelExportDto.WorksheetDataTable[excelExportDto.Worksheets[1]] = ExcelExportHelper.ListToDataTable(measurementUnitResultAndKeyUnitDataSet.MeasurementUnitResultList, measurementUnitResultColumns); ;
byte[] filecontent = ExcelExportHelper.ExportExcel(excelExportDto, false);
- string dir = Path.Combine(Config.ImageSaveFolder, DateTime.Now.ToString("yyyyMMdd"));
+ string dir = Path.Combine(Config.LogPath, DateTime.Now.ToString("yyyyMMdd"));
if (!Directory.Exists(dir))
{
Directory.CreateDirectory(dir);
--
Gitblit v1.8.0