绑定时,如果在库位中 提示报错

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/LineController.java

@@ -370,6 +370,12 @@ public class LineController {
             return ResultBean.newErrorResult(-1, "smfcore.error.barcode.invalid", "条码无效");
             return ResultBean.newErrorResult(-1, "smfcore.error.barcode.invalid", "条码无效");
         }
         }
 
 
+        //判断库位是否为空
+        StoragePos oldPos = storagePosManager.getByBarcode(barcode.getBarcode());
+        if (oldPos != null){
+            return ResultBean.newErrorResult(-1,"",barcode.getBarcode()+"已经存在库位:"+oldPos.getPosName());
+        }
+
         Barcode oldBarcode = barcodeManager.findOne(new Query(Criteria.where("palletId").is(cartonId)));
         Barcode oldBarcode = barcodeManager.findOne(new Query(Criteria.where("palletId").is(cartonId)));
         if (oldBarcode == null){
         if (oldBarcode == null){
             oldBarcode = barcodeManager.findOne(new Query(Criteria.where("scanCartonId").is(cartonId)));
             oldBarcode = barcodeManager.findOne(new Query(Criteria.where("scanCartonId").is(cartonId)));
@@ -400,6 +406,12 @@ public class LineController {
             return ResultBean.newErrorResult(-1, "smfcore.error.barcode.invalid", "条码无效");
             return ResultBean.newErrorResult(-1, "smfcore.error.barcode.invalid", "条码无效");
         }
         }
 
 
+        //判断库位是否为空
+        StoragePos oldPos = storagePosManager.getByBarcode(barcode.getBarcode());
+        if (oldPos != null){
+            return ResultBean.newErrorResult(-1,"",barcode.getBarcode()+"已经存在库位:"+oldPos.getPosName());
+        }
+
         //判断料箱有没有正在执行中的任务
         //判断料箱有没有正在执行中的任务
         for (DataLog dataLog : taskService.getAllTasks()) {
         for (DataLog dataLog : taskService.getAllTasks()) {
             if (dataLog.getBarcode().equals(barcode.getBarcode()) && !dataLog.isFinished() && !dataLog.isCancel()){
             if (dataLog.getBarcode().equals(barcode.getBarcode()) && !dataLog.isFinished() && !dataLog.isCancel()){