feat:自建库位全部设置到单伸位中

易文鹏
1 parent 6ca7305f
Showing 2 changed files with 2 additions and 45 deletions
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
src/main/java/com/huaheng/pc/config/location/controller/LocationController.java
@@ -373,9 +373,6 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
     //自建单据
     @Override
     public String isSelfCreated(String roadWay, int high, Integer frequencyLocation, boolean isFlammable) {
-        // 获取双伸位预留库位数
-        int reserveNumber = getReserveNumber();
-        // 移除掉可用库位数小于预留库位数的巷道
         LambdaQueryWrapper<Location> wrapper = Wrappers.lambdaQuery();
         wrapper.eq(Location::getRoadway, roadWay)
                 .eq(Location::getStatus, STATUS_LOCATION_EMPTY)
@@ -384,26 +381,11 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
                 .eq(Location::getContainerCode, "")
                 .last(" limit 20");
-        List<Location> totalLocationList = locationService.list(wrapper);
-        //双伸位预留库位数不够了就排除掉该巷道
-        if (totalLocationList.size() <= reserveNumber) {
-            return "可能是自建单据库位不够用了，请检查预留库位数";
-        }
+        List<Location> locationList = locationService.list(wrapper);
-        // 查找外侧的库位
-        LambdaQueryWrapper<Location> locationLambda = Wrappers.lambdaQuery();
-        locationLambda.eq(Location::getRoadway, roadWay)
-                .eq(Location::getStatus, STATUS_LOCATION_EMPTY)
-                .eq(Location::getHigh, high)
-                .eq(Location::getSelfCreated, SELFCREATED)
-                .eq(Location::getRowFlag, ROW_OUT)//外侧
-                .eq(Location::getContainerCode, "")
-                .last(" limit 20");
-        List<Location> locationList = locationService.list(locationLambda);
         List<Location> removeLocaationList = new ArrayList<>();
         if (locationList != null && !locationList.isEmpty()) {
             for (Location location1 : locationList) {
-                //库位内侧，有未完成的任务就去掉这个库位
                 if (taskHeaderService.getUncompleteTaskInNear(location1) > 0) {
                     removeLocaationList.add(location1);
                 }
@@ -413,31 +395,6 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
             locationList.removeAll(removeLocaationList);
         }
-        // 如果没有外侧库位可分配了，再查内侧的库位
-        if (locationList == null || locationList.isEmpty()) {
-            locationLambda = Wrappers.lambdaQuery();
-            locationLambda
-                    .eq(StringUtils.isNotEmpty(roadWay), Location::getRoadway, roadWay)
-                    .eq(Location::getStatus, STATUS_LOCATION_EMPTY)
-                    .eq(Location::getHigh, high)
-                    .eq(Location::getSelfCreated, SELFCREATED)
-                    .eq(Location::getRowFlag, ROW_IN)
-                    .eq(Location::getContainerCode, "")
-                    .last(" limit 20");
-            locationList = locationService.list(locationLambda);
-
-            removeLocaationList = new ArrayList<>();
-            if (locationList != null && !locationList.isEmpty()) {
-                for (Location location1 : locationList) {
-                    if (taskHeaderService.getUncompleteTaskInNear(location1) > 0) {
-                        removeLocaationList.add(location1);
-                    }
-                }
-            }
-            if (locationList != null) {
-                locationList.removeAll(removeLocaationList);
-            }
-        }
         if (locationList == null || locationList.isEmpty()) {
             return null;
         }
@@ -106,7 +106,7 @@ public class LocationController extends BaseController {
                 .eq(StringUtils.isNotNull(location.getSystemCreated()), Location::getStatus, location.getStatus())
                 .eq(StringUtils.isNotEmpty(location.getZoneCode()), Location::getZoneCode, location.getZoneCode())
                 .eq(StringUtils.isNotNull(location.getIRow()), Location::getIRow, location.getIRow())
-                .eq(StringUtils.isNotNull(location.getRoadway()), Location::getRoadway, location.getRoadway())
+                .eq(StringUtils.isNotBlank(location.getRoadway()), Location::getRoadway, location.getRoadway())
                 .eq(StringUtils.isNotNull(location.getIColumn()), Location::getIColumn, location.getIColumn())
                 .eq(StringUtils.isNotNull(location.getIGrid()), Location::getIGrid, location.getIGrid())
                 .eq(StringUtils.isNotNull(location.getILayer()), Location::getILayer, location.getILayer())