1.获取库位bug修改

2.入库完成,先更改库位信息,再解除绑定

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

@@ -509,7 +509,6 @@ public class BaseDeviceHandler implements IDeviceHandler {
                 updatePosExecuteTime(posName,executeTime);
                 updatePosExecuteTime(posName,executeTime);
             }
             }
             log.info(task.getBarcode() + "入仓位[" + task.getPosName() + "]完成，执行时间["+executeTime+"]秒");
             log.info(task.getBarcode() + "入仓位[" + task.getPosName() + "]完成，执行时间["+executeTime+"]秒");
-            ReelLockPosUtil.removeReelLockPosInfo(task.getBarcode());
             DataLog cancelTask = taskService.findFinishedTask(cid, posName);
             DataLog cancelTask = taskService.findFinishedTask(cid, posName);
             if (cancelTask != null && cancelTask.isCancel()) {
             if (cancelTask != null && cancelTask.isCancel()) {
                 //将相同库位已经取消的任务从完成队列里删除
                 //将相同库位已经取消的任务从完成队列里删除
@@ -517,6 +516,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
                 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.findFinishedTask(cid, posName);
             task = taskService.findFinishedTask(cid, posName);

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -618,8 +618,8 @@ public class TaskService {
                     pos = null;
                     pos = null;
                 }
                 }
                 else if (pos.getW() != barcode.getPlateSize() || pos.getH() != barcode.getHeight()) {
                 else if (pos.getW() != barcode.getPlateSize() || pos.getH() != barcode.getHeight()) {
-                    pos = null;
                     log.info("条码[" + barcode.getBarcode() + "]尺寸已改变,无法放入已锁定库位[" + pos.getPosName() + "],重新查找库位");
                     log.info("条码[" + barcode.getBarcode() + "]尺寸已改变,无法放入已锁定库位[" + pos.getPosName() + "],重新查找库位");
+                    pos = null;
                 } else {
                 } else {
                     Barcode posBarcode = pos.getBarcode();
                     Barcode posBarcode = pos.getBarcode();
                     if (posBarcode == null) {
                     if (posBarcode == null) {