先更新库存再删除库位锁定

src/main/java/com/neotel/smfcore/core/device/handler/impl/ThirdBoxHandler.java

@@ -332,7 +332,6 @@ public class ThirdBoxHandler extends BaseDeviceHandler{
                 updatePosExecuteTime(task.getPosName(), executeTime);
                 updatePosExecuteTime(task.getPosName(), executeTime);
             }
             }
             log.info(task.getBarcode() + "入仓位[" + task.getPosName() + "]完成，执行时间[" + executeTime + "]秒");
             log.info(task.getBarcode() + "入仓位[" + task.getPosName() + "]完成，执行时间[" + executeTime + "]秒");
-            ReelLockPosUtil.removeReelLockPosInfo(task.getBarcode());
             DataLog cancelTask = taskService.findFinishedPutInTask(cid, task.getPosName(), task.getBarcode());
             DataLog cancelTask = taskService.findFinishedPutInTask(cid, task.getPosName(), task.getBarcode());
             if (cancelTask != null && cancelTask.isCancel()) {
             if (cancelTask != null && cancelTask.isCancel()) {
                 //将相同库位已经取消的任务从完成队列里删除
                 //将相同库位已经取消的任务从完成队列里删除
@@ -340,6 +339,7 @@ public class ThirdBoxHandler extends BaseDeviceHandler{
                 log.info("从已完成的任务列表中删除之前取消的任务:" + cancelTask.getPosName() + " ReelId:" + cancelTask.getBarcode());
                 log.info("从已完成的任务列表中删除之前取消的任务:" + cancelTask.getPosName() + " ReelId:" + cancelTask.getBarcode());
             }
             }
             updatePutInData(task);
             updatePutInData(task);
+            ReelLockPosUtil.removeReelLockPosInfo(task.getBarcode());
         } else {
         } else {
             //从已完成列表中找,如果还找不到就忽略
             //从已完成列表中找,如果还找不到就忽略
             task = taskService.findFinishedPutInTask(cid, posName, barcode);
             task = taskService.findFinishedPutInTask(cid, posName, barcode);