From 7a7150c0aa67b5f20af44432d0c12c194e935739 Mon Sep 17 00:00:00 2001
From: luanhui <1029149336@qq.com>
Date: Fri, 17 Nov 2017 13:38:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E4=BA=86=E9=98=B2=E6=AD=A2=E7=82=B9?=
 =?UTF-8?q?=E7=BA=A7=E5=88=AB=E5=92=8C=E7=A7=B0=E9=87=8D=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=20=E5=8A=A0=E4=BA=86=E4=B8=AA=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeighAndGrading/GradeFrom.cs | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/WeighAndGrading/GradeFrom.cs b/WeighAndGrading/GradeFrom.cs
index cc71b78..fc1a0b8 100644
--- a/WeighAndGrading/GradeFrom.cs
+++ b/WeighAndGrading/GradeFrom.cs
@@ -998,7 +998,8 @@ namespace WeighAndGrading
           if (details.Count == 50)
             details.RemoveAt(49);
           details.Insert(0, entity);
-          LocalGradeAndWeightBL.Insert(entity);
+          //          LocalGradeAndWeightBL.Insert(entity); 改成调用方法 方便加锁
+          LocalGradeAndWeightBLInsert(entity);
           //          noWeightList.Enqueue(entity); // 添加的掉猪明细不加入到没有称重队列
           BindDetailGrid();
 
@@ -1024,6 +1025,16 @@ namespace WeighAndGrading
       }
     }
 
+    static object insertweightdetail=new object();
+    void LocalGradeAndWeightBLInsert(GradeAndWeight_Detail entity)
+    {
+      //为了防止点级别和称重同时进行
+      lock (insertweightdetail)
+      {
+        LocalGradeAndWeightBL.Insert(entity);
+      }
+    }
+
     void SetlblSucessVisibleFalse()
     {
       this.Invoke(new InvokeHandler(delegate
@@ -1080,7 +1091,10 @@ namespace WeighAndGrading
           if (details.Count == 50)
             details.RemoveAt(49);
           details.Insert(0, entity);
-          LocalGradeAndWeightBL.Insert(entity);
+
+          //LocalGradeAndWeightBL.Insert(entity); //改成调用方法 方便加锁
+          LocalGradeAndWeightBLInsert(entity);
+
           noLivestockList.Enqueue(entity);
           BindDetailGrid();