扫码检查是否是CB开头

DeviceLibrary/theMachine/InOutDevice_IN.cs

@@ -3,6 +3,7 @@ using OnlineStore.Common;
 using OnlineStore.LoadCSVLibrary;
 using OnlineStore.LoadCSVLibrary;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
@@ -129,9 +130,17 @@ namespace DeviceLibrary
                         }
                         }
                         else
                         else
                         {
                         {
-                            MoveInfo.NextMoveStep(MoveStep.In05);
-                            Lift.LiftDown(MoveInfo);
-                            MoveInfo.log($"放下入料阻挡");
+                            var codes = x.Select((a) => a.CodeStr);
+                            if (codes.Any(s => !string.IsNullOrEmpty(s) && s.ToUpper().StartsWith("CB")))
+                            {
+                                MoveInfo.NextMoveStep(MoveStep.In05);
+                                Lift.LiftDown(MoveInfo);
+                                MoveInfo.log($"放下入料阻挡");
+                            }
+                            else
+                            {
+                                Msg.add($"扫到的料箱条码无CB开头，请确认:{string.Join(",", codes)}", MsgLevel.critical);
+                            }
                         }
                         }
 
 
                     }
                     }
@@ -228,7 +237,8 @@ namespace DeviceLibrary
                     else if (MoveInfo.IsTimeOut(15))
                     else if (MoveInfo.IsTimeOut(15))
                     {
                     {
                         isScanErrorTimes++;
                         isScanErrorTimes++;
-                        if (isScanErrorTimes < 3) {
+                        if (isScanErrorTimes < 3)
+                        {
                             MoveInfo.NextMoveStep(MoveStep.In03);
                             MoveInfo.NextMoveStep(MoveStep.In03);
                         }
                         }
                         else
                         else
@@ -281,7 +291,7 @@ namespace DeviceLibrary
                     MoveInfo.NextMoveStep(MoveStep.InNG3);
                     MoveInfo.NextMoveStep(MoveStep.InNG3);
                     Line.LineStop("work");
                     Line.LineStop("work");
                     MoveInfo.log($"料箱抵达出口");
                     MoveInfo.log($"料箱抵达出口");
-                    if (isScanErrorTimes>2)
+                    if (isScanErrorTimes > 2)
                         Msg.add("入库周转箱扫码失败,请确认料箱方向后重试", MsgLevel.critical);
                         Msg.add("入库周转箱扫码失败,请确认料箱方向后重试", MsgLevel.critical);
                     else
                     else
                         Msg.add("入库周转箱超重，已退出，请处理", MsgLevel.critical);
                         Msg.add("入库周转箱超重，已退出，请处理", MsgLevel.critical);