转库问题提交

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -1037,18 +1037,27 @@ public class DeviceController {
         String targetPosName = paramMap.get("targetPosName"); //目标库位
         String targetPosName = paramMap.get("targetPosName"); //目标库位
         log.info("需要移动的库位为:" + needMovePosName + ",目标库位为:" + targetPosName);
         log.info("需要移动的库位为:" + needMovePosName + ",目标库位为:" + targetPosName);
 
 
-        //判断有没有物料
-        StoragePos needMovePos = storagePosManager.getByPosName(needMovePosName);
-        Barcode barcode = needMovePos.getBarcode();
-        if (barcode == null) {
-            return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{needMovePosName, "barcode"});
-        }
-
         //判断目标库位是否存在
         //判断目标库位是否存在
         StoragePos targetPos = storagePosManager.getByPosName(targetPosName);
         StoragePos targetPos = storagePosManager.getByPosName(targetPosName);
         if (targetPos == null) {
         if (targetPos == null) {
             return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"posName", targetPosName});
             return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"posName", targetPosName});
         }
         }
+        Barcode targetBarcode = targetPos.getBarcode();
+
+        //判断有没有物料
+        StoragePos needMovePos = storagePosManager.getByPosName(needMovePosName);
+        Barcode barcode = needMovePos.getBarcode();
+
+        //如果目标库位不为空,当前库位为空,直接返回ok
+        if (barcode == null ) {
+            if (targetBarcode == null) {
+                return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{needMovePosName, "barcode"});
+            } else {
+                return ResultBean.newOkResult("");
+            }
+        }
+
+
 
 
         //把外侧相同的任务给改成内侧的
         //把外侧相同的任务给改成内侧的
         List<DataLog> allTasks = taskService.getAllTasks();
         List<DataLog> allTasks = taskService.getAllTasks();