From f8daf0716d97838529b73af5ae57130b8cfcc62a Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期五, 10 七月 2020 13:44:00 +0800
Subject: [PATCH] 已存在 不重复添加原始数据

---
 src/Bro.M071.Process/M071Process.cs |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index 7f239ef..badeebd 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/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);
+                            }
                         }
                     }
                 }

--
Gitblit v1.8.0