diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java index fb6ecd08..099758df 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java @@ -717,7 +717,7 @@ public class AppTaskController extends BaseController AppLocation appLocation = appLocationService.selectAppLocationByLocationId(locId); if (appLocation.getwDepth() == 2) { //判断01是否有货 - String locationId = locId.substring(0, locId.length() - 1) + "01"; + String locationId = locId.substring(0, locId.length() - 1) + "1"; List appTasks = getAppTaskByVehicleId(null, locationId); if (!CollectionUtils.isEmpty(appTasks)) { logger.error(locationId + "有任务执行,请稍后再试"); @@ -765,7 +765,7 @@ public class AppTaskController extends BaseController //如果在浅货位,需要判断深货位是否有货 String tempLocationId = tBaseStorageAreaLocation.getLocationId(); if (tBaseStorageAreaLocation.getwDepth() == 1) { - String locationY = tempLocationId.substring(0, tempLocationId.length() - 1) + "02"; + String locationY = tempLocationId.substring(0, tempLocationId.length() - 1) + "2"; AppStock tMiStock5 = new AppStock(); tMiStock5.setLocationId(locationY); List tMiStocks5 = appStockService.selectAppStockList(tMiStock5); @@ -783,7 +783,7 @@ public class AppTaskController extends BaseController break; } else { //判断该库位如果是在深库位,需要判断浅库位是否有货 - String locationY = tempLocationId.substring(0, tempLocationId.length() - 1) + "01"; + String locationY = tempLocationId.substring(0, tempLocationId.length() - 1) + "1"; // AppStock tMiStock5 = new AppStock(); tMiStock5.setLocationId(locationY); @@ -819,6 +819,7 @@ public class AppTaskController extends BaseController appTask.setTaskStatus(AppConstants.LOCATION_STATUS_ENABLE); appTask.setUpdateTime(new Date()); appTask.setCreateTime(new Date()); + appTask.setTaskPriority(1); LoginUser loginUser = SecurityUtils.getLoginUser(); appTask.setCreateBy(loginUser == null ? "移库任务" : loginUser.getUsername()); diff --git a/ruoyi-system/src/main/resources/mapper/app/AppTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppTaskMapper.xml index 9362e5f1..5fb48aa7 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppTaskMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppTaskMapper.xml @@ -215,7 +215,7 @@ update app_task