移库验证修改

src/main/java/com/neotel/smfcore/custom/luxsan_sp/util/SpBoxUtil.java

@@ -306,9 +306,15 @@ public class SpBoxUtil {
 
 
         //清空原来的库位，新库位中增加信息
-        if (targetPos.getBarcode() != null || targetPos.isUsed()) {
-            log.info("moveBoxPos ， 参数：箱子号=" + barcode.getBarcode() + ", 目标库位号=" + targetPos.getPosName() + ",目标库位不为空");
-            throw new Exception("目标库位不为空");
+        if (targetPos.getBarcode() != null  ) {
+            log.info("moveBoxPos ， 参数：箱子号=" + barcode.getBarcode() + ", 目标库位号=" + targetPos.getPosName() + ",目标库位不为空:"+targetPos.getBarcode().getBarcode());
+            throw new Exception("目标库位不为空:"+targetPos.getBarcode().getBarcode());
+        }
+
+        //清空原来的库位，新库位中增加信息
+        if ( targetPos.isUsed()) {
+            log.info("moveBoxPos ， 参数：箱子号=" + barcode.getBarcode() + ", 目标库位号=" + targetPos.getPosName() + ",目标库位已使用");
+            throw new Exception("目标库位已使用");
         }
 
         if (ReelLockPosUtil.posIsLock(targetPos.getPosName())) {