添加标签检测屏蔽

Common/Setting_Init.cs

@@ -65,7 +65,8 @@ namespace OnlineStore.Common
         [MyConfigComment("屏蔽取料后自动提升")]
         [MyConfigComment("屏蔽取料后自动提升")]
         public static MyConfig<bool> Device_Disable_AutoLifTingAfterTakeReel = false;
         public static MyConfig<bool> Device_Disable_AutoLifTingAfterTakeReel = false;
 
 
-
+        [MyConfigComment("屏蔽吸标检测")]
+        public static MyConfig<bool> Device_Disable_Label_Detect = false;
 
 
         [MyConfigComment("是否启用库位屏蔽")]
         [MyConfigComment("是否启用库位屏蔽")]
         public static MyConfig<bool> Device_DisableStorePosition = false;
         public static MyConfig<bool> Device_DisableStorePosition = false;

DeviceLibrary/theMachine/CameraPointTest.cs

@@ -85,6 +85,9 @@ namespace DeviceLibrary
                                     inArea[i].ngMsg[j] = ngmsglist[index];
                                     inArea[i].ngMsg[j] = ngmsglist[index];
                                     inArea[i].value[j] = -1;
                                     inArea[i].value[j] = -1;
                                 }
                                 }
+                                else {
+                                    inArea[i].ngMsg[j] = "";
+                                }
                                 index++;
                                 index++;
                             }
                             }
                         }
                         }
@@ -242,6 +245,9 @@ namespace DeviceLibrary
         /// <returns></returns>
         /// <returns></returns>
         public static bool TestHasLabelOnDock(bool checkstatus) {
         public static bool TestHasLabelOnDock(bool checkstatus) {
 
 
+            if (Setting_Init.Device_Disable_Label_Detect)
+                return true;
+
             var posname = checkstatus ? TestStorePointPort.接标台打印.ToString() : TestStorePointPort.接标台取标.ToString();
             var posname = checkstatus ? TestStorePointPort.接标台打印.ToString() : TestStorePointPort.接标台取标.ToString();
 
 
             var r = CameraPointTest.CameraData[posname].PointList;
             var r = CameraPointTest.CameraData[posname].PointList;

DeviceLibrary/theMachine/MainMachine_Store.cs

@@ -194,6 +194,13 @@ namespace DeviceLibrary
                             StoreMoveInfo.NextMoveStep(MoveStep.StoreIn08);
                             StoreMoveInfo.NextMoveStep(MoveStep.StoreIn08);
                             StoreMoveInfo.log($"收到完成贴标NG");
                             StoreMoveInfo.log($"收到完成贴标NG");
                         }
                         }
+                        else if (StoreMoveInfo.MoveParam.usedCount==1)
+                        {
+                            StoreMoveInfo.NextMoveStep(MoveStep.StoreIn08);
+                            StoreMoveInfo.log($"该物料已入过库");
+                            StoreMoveInfo.MoveParam.IsNg=true;
+                            StoreMoveInfo.MoveParam.NgMsg= "The material has been stocked, and is not allowed to stock again.";
+                        }
                         else
                         else
                         {
                         {
                             if (string.IsNullOrEmpty(LabelingMoveInfo.MoveParam.PosID))
                             if (string.IsNullOrEmpty(LabelingMoveInfo.MoveParam.PosID))
@@ -513,7 +520,7 @@ namespace DeviceLibrary
 
 
                         if (!issame)
                         if (!issame)
                         {
                         {
-                            StoreMoveInfo.log("读取到 RFID:" + ds);
+                            StoreMoveInfo.log("读取到的RFID与物料信息不符 读取到 RFID:" + ds);
                             Msg.add("rfid.nomatch", crc.GetString("Res0140","读取到的RFID与物料信息不符:") + ds, MsgLevel.alarm);
                             Msg.add("rfid.nomatch", crc.GetString("Res0140","读取到的RFID与物料信息不符:") + ds, MsgLevel.alarm);
                             RobotManage.UserPause(crc.GetString("Res0141","读取到的RFID与物料信息不符"));
                             RobotManage.UserPause(crc.GetString("Res0141","读取到的RFID与物料信息不符"));
                         }
                         }