Merge branch 'master' of http://106.15.194.121:8083/lina/SO908-XLRStore

source/DeviceLibrary/storeBean/inputBean/BatchMoveBean.cs

@@ -149,6 +149,7 @@ namespace OnlineStore.DeviceLibrary
                         WorkLog("复位前重置料串状态");
                         WorkLog("复位前重置料串状态");
                         UpdateShelf();
                         UpdateShelf();
                     }
                     }
+                    preCodeList = new List<string>();
                     WarnMsg = "";
                     WarnMsg = "";
                     alarmType = AlarmType.None;
                     alarmType = AlarmType.None;
                     MoveInfo.NewMove(MoveType.Reset,new InOutParam());
                     MoveInfo.NewMove(MoveType.Reset,new InOutParam());

source/DeviceLibrary/storeBean/inputBean/BatchMoveBean_Partial.cs

@@ -332,15 +332,14 @@ namespace OnlineStore.DeviceLibrary
                         Robot.IOMove(IO_Type.CameraLed, IO_VALUE.LOW);
                         Robot.IOMove(IO_Type.CameraLed, IO_VALUE.LOW);
 
 
                         //TODO 需要判断是否和上次的条码重复，重复的条码不可用
                         //TODO 需要判断是否和上次的条码重复，重复的条码不可用
-
                         bool isCanUse = true;
                         bool isCanUse = true;
                         //判断是否可用
                         //判断是否可用
                         foreach (string nC in LastCodeList)
                         foreach (string nC in LastCodeList)
                         {
                         {
                             foreach (string n in preCodeList)
                             foreach (string n in preCodeList)
                             {
                             {
-                                if(CodeManager.HasRightCode(nC))
-                                //if (nC.Length > 15 && nC.Equals(n))
+                                //if(CodeManager.HasRightCode(nC))
+                                if (nC.Length > 15 && nC.Equals(n))
                                 {
                                 {
                                     LogUtil.error(Name + "扫码结果【" + nC + "】与上个条码【" + n + "】重复，扫码结果不可用");
                                     LogUtil.error(Name + "扫码结果【" + nC + "】与上个条码【" + n + "】重复，扫码结果不可用");
                                     isCanUse = false;
                                     isCanUse = false;