增加数量验证。bug修改

RC1266-AutoCountMachine/source/AutoCountClient/App.config

@@ -52,6 +52,7 @@
     <add key ="ThresholdValue" value ="30"/>
     <add key ="ThresholdValue" value ="30"/>
     <add key ="CounParamConfig" value ="\XRAY\countParam.csv"/>
     <add key ="CounParamConfig" value ="\XRAY\countParam.csv"/>
     <add key ="DataPath" value ="\data\DB.db3"/>
     <add key ="DataPath" value ="\data\DB.db3"/>
+    <add key ="ResultMinCount" value ="100"/>
   </appSettings>
   </appSettings>
 
 
   <log4net>
   <log4net>

RC1266-AutoCountMachine/source/Common/Setting_Init.cs

@@ -87,5 +87,6 @@ namespace OnlineStore.Common
         public static string CounParamConfig = "CounParamConfig";
         public static string CounParamConfig = "CounParamConfig";
 
 
         public static string DataPath = "DataPath";
         public static string DataPath = "DataPath";
+        public static string ResultMinCount = "ResultMinCount";
     }
     }
 }
 }

RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip_Partial.cs

@@ -178,7 +178,8 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(StepEnum.OT08_Clamping_Work))
             else if (MoveInfo.IsStep(StepEnum.OT08_Clamping_Work))
             {
             {
                 MoveInfo.NextMoveStep(StepEnum.OT09_MoveZToP1);
                 MoveInfo.NextMoveStep(StepEnum.OT09_MoveZToP1);
-                WorkLog("取料：取料Z轴返回P1 ",0);
+                WorkLog("取料：取料Z轴返回P1 ，验证Out_TrayCheck消失", 0);
+                MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Out_TrayCheck, IO_VALUE.LOW));
                 MoveZAxis.AbsMove(MoveInfo, Config.MoveZ_P1, Config.MoveZ_P1Speed);
                 MoveZAxis.AbsMove(MoveInfo, Config.MoveZ_P1, Config.MoveZ_P1Speed);
 
 
             }
             }

RC1266-AutoCountMachine/source/DeviceLibrary/bean/X_RAY_Equip_Partial.cs

@@ -363,13 +363,30 @@ namespace OnlineStore.DeviceLibrary
                 WorkLog("点料：开始调用 carerayImage.GetLocalCountHuge ");
                 WorkLog("点料：开始调用 carerayImage.GetLocalCountHuge ");
                 n = carerayImage.GetLocalCountHuge(fileP, lastParam.Threshold, lastParam.WindowSize, out count, out Asa.API.EyemImage tpDstImg);
                 n = carerayImage.GetLocalCountHuge(fileP, lastParam.Threshold, lastParam.WindowSize, out count, out Asa.API.EyemImage tpDstImg);
             }
             }
-
-            WorkLog("点料：获取点料结果 【" + count + "】 " + lastParam.ToStr() + ",n =" + n + ",保存并上传结果");
-
+            bool isNg = false;
+            int ResultMinCount = ConfigAppSettings.GetIntValue(Setting_Init.ResultMinCount);
+            if (ResultMinCount <= 0)
+            {
+                ResultMinCount = 100;
+            }
+            string result = "保存并上传结果";
+            if (count < ResultMinCount)
+            {
+                result = "点料结果小于" + ResultMinCount + "，判断点料NG";
+                isNg = true;
+            }
+            WorkLog("点料：获取点料结果 【" + count + "】 " + lastParam.ToStr() + ",n =" + n + ", " + result);
             if (Work_ReelInfo.WareCount <= 0)
             if (Work_ReelInfo.WareCount <= 0)
             {
             {
                 MoveInfo.MoveParam.WareCount = count;
                 MoveInfo.MoveParam.WareCount = count;
                 Work_ReelInfo.WareCount = count;
                 Work_ReelInfo.WareCount = count;
+                if (isNg)
+                {
+                    MoveInfo.MoveParam.IsNgReel = true;
+                    Work_ReelInfo.IsNgReel = true;
+                    MoveInfo.MoveParam.NgMsg = "点料结果小于" + ResultMinCount;
+                    Work_ReelInfo.NgMsg = "点料结果小于" + ResultMinCount;
+                }
             }
             }
 
 
 
 
@@ -394,15 +411,15 @@ namespace OnlineStore.DeviceLibrary
                 LogUtil.error("读取结果图片【" + outF + "】出错：" + ex.ToString());
                 LogUtil.error("读取结果图片【" + outF + "】出错：" + ex.ToString());
             }
             }
             InXWork = false;
             InXWork = false;
-            Task.Factory.StartNew(delegate
-             {
-                 //  string msg = "暂不上传";
-                 string msg = SServerManager.Return_Material(Name, Work_ReelInfo.WareCode, Work_ReelInfo.WareCount);
-                 if (!String.IsNullOrEmpty(msg))
-                 {
-                     LogUtil.error(Name + "上传【" + Work_ReelInfo.ToStr() + "】点料结果失败：" + msg);
-                 }
-             });
+            if (!isNg)
+            {
+                //  string msg = "暂不上传";
+                string msg = SServerManager.Return_Material(Name, Work_ReelInfo.WareCode, Work_ReelInfo.WareCount);
+                if (!String.IsNullOrEmpty(msg))
+                {
+                    LogUtil.error(Name + "上传【" + Work_ReelInfo.ToStr() + "】点料结果失败：" + msg);
+                }
+            }
             MoveInfo.EndStepWait();
             MoveInfo.EndStepWait();
         }
         }