修改判定NG且纠正后的托盘一直在流水线转的问题

source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs

@@ -178,7 +178,22 @@ namespace OnlineStore.DeviceLibrary
                                     if (result)//有料盘
                                     {
                                         (int resCode, taskInfo task) = SServerManager.getTaskInfo(barcode);
-                                        if (resCode == 0)
+                                       
+                                        if(resCode==-1)
+                                        {
+                                            TrayDisableManager.AddDisableTray(trayNum);
+                                            LogUtil.info($"【屏蔽料盘二次判断】【-1】【需要禁用该托盘】【{tray.ToStr()}】");
+                                        }
+                                        else if (resCode==100)
+                                        {
+                                            tray.InoutPar.InStoreNg = true;
+                                            tray.InoutPar.PlateH = task.plateH;
+                                            tray.InoutPar.PlateW = task.plateW; 
+                                            TrayManager.UpdateTrayInfo(trayNum, true, tray.InOrOutStore, tray.InoutPar);
+                                             tray.InoutPar.Corrected = true;
+                                            LogUtil.info($"【屏蔽料盘二次判断】【100】【有尺寸信息，认为NG】【{tray.ToStr()}】");
+                                        }
+                                      else   if (resCode == 0)
                                         {
                                             //if (task != null)
                                             {
@@ -203,20 +218,6 @@ namespace OnlineStore.DeviceLibrary
                                                 LogUtil.info($"【屏蔽料盘二次判断】【初次有料，第二次有料,认为有料】【{tray.ToStr()}】");
                                             }
                                         }
-                                        else if  (task.plateH > 0)
-                                        {
-                                            tray.InoutPar.InStoreNg = true;
-                                            tray.InoutPar.PlateH = task.plateH;
-                                            tray.InoutPar.PlateW = task.plateW;
-                                            TrayManager.UpdateTrayInfo(trayNum, true, tray.InOrOutStore, tray.InoutPar);
-                                            tray.InoutPar.Corrected = true;
-                                            LogUtil.info($"【屏蔽料盘二次判断】【100】【有尺寸信息，认为NG】【{tray.ToStr()}】");
-                                        }
-                                        else
-                                        {
-                                            TrayDisableManager.AddDisableTray(trayNum);
-                                            LogUtil.info($"【屏蔽料盘二次判断】【-1】【需要禁用该托盘】【{tray.ToStr()}】");
-                                        }
 
 
                                     }
@@ -555,9 +556,12 @@ namespace OnlineStore.DeviceLibrary
                     SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
                     InOutParam param = CheckIsNeedOutStore(out outMsg);
                     TrayInfo tray = TrayManager.GetTrayInfo(currTrayNum);
-                    if (tray.InoutPar?.ManualJudgeNG ?? false)
+
+                    bool jNg = tray.InoutPar?.ManualJudgeNG ?? false;
+                    bool corr = tray.InoutPar?.Corrected ?? false;
+                    if (jNg && (!corr))
                     {
-                        LogInfo(SecondMoveInfo.MoveNum + "*************** 托盘【" + currTrayNum + "】被为标记判定NG,放盘通过");
+                        LogInfo(SecondMoveInfo.MoveNum + "*************** 托盘【" + currTrayNum + "】被为标记判定NG,放盘通过,["+jNg+"]["+corr+"]");
                         MO_14_TopDown(); 
                     }
                     else if (param != null)

source/DeviceLibrary/assemblymanager/SServerManager.cs

@@ -809,7 +809,7 @@ namespace OnlineStore.DeviceLibrary
                 string server = GetAddr(Addr_getTaskInfo, paramMap);
                 DateTime startTime = DateTime.Now;
                 string resultStr = HttpHelper.Post(server, "");
-                LogUtil.info($"getTaskInfo   {FormUtil.GetSpanStr(DateTime.Now - startTime)}  【"+barcode+"】【{server}】【{resultStr}】");
+                LogUtil.info($"getTaskInfo   {FormUtil.GetSpanStr(DateTime.Now - startTime)}  【{barcode}】【{server}】【{resultStr}】");
 
                 ReturnData3 data = JsonHelper.DeserializeJsonToObject<ReturnData3>(resultStr);