优化分配移库位置

游杰
1 parent 85b2a624
Showing 6 changed files with 77 additions and 13 deletions
src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java
src/main/java/com/huaheng/pc/config/location/service/LocationService.java
src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
@@ -133,7 +133,7 @@ public class TaskAssignServiceImpl implements TaskAssignService {
                     if(taskHeader2 != null) {
                         preTaskNo = taskHeader2.getId();
                     } else {
-                        Location destinationLocation = locationService.getEmptyInsideLocation(insideLocation);
+                        Location destinationLocation = locationService.getEmptyLocation(insideLocation);
                         if (destinationLocation == null) {
                             return AjaxResult.error("移库没有剩余库位");
                         }
@@ -167,8 +167,8 @@ public class TaskAssignServiceImpl implements TaskAssignService {
         .lt(TaskHeader::getStatus, 100)
         .in(TaskHeader::getTaskType, 200, 400 , 900)
         .ge(TaskHeader::getStatus, 10);
-        TaskHeader taskHeader2 = taskHeaderService.getOne(lambdaWrapper);
-        if(taskHeader2 != null) {
+        List<TaskHeader> taskHeader2 = taskHeaderService.list(lambdaWrapper);
+        if(taskHeader2 != null && taskHeader2.size() > 0) {
             return AjaxResult.error("执行任务出库时，相应的旁边库位有分拣出库或者补充入库任务，请先执行完旁边库位任务");
         }
  
@@ -258,7 +258,7 @@ public class WarecellAllocationServiceImpl implements WarecellAllocationService 
             if(rowFlag == 1) {
                 Location insideLocation = locationService.getInsideNear(location);
                 if(StringUtils.isNotEmpty(insideLocation.getContainerCode())) {
-                    Location destinationLocation = locationService.getEmptyInsideLocation(insideLocation);
+                    Location destinationLocation = locationService.getEmptyLocation(insideLocation);
                     AjaxResult ajaxResult = transferTaskService.createTransferTask(insideLocation.getCode(), destinationLocation.getCode());
                     preTaskNo = (Integer) ajaxResult.getData();
                     if(ajaxResult.hasErr()) {
@@ -87,4 +87,7 @@ public interface LocationService extends IService&lt;Location&gt;{
  
     Location getEmptyInsideLocation(Location location);
  
+    Location getEmptyOutSideLocation(Location location);
+
+    Location getEmptyLocation(Location location);
 }
@@ -17,10 +17,7 @@ import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
  
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.config.location.domain.Location;
@@ -375,6 +372,54 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
         return locaiton2;
     }
  
+    private boolean getOutSideCanMove(Location location) {
+        Location locaiton2 = getInsideNear(location);
+        if(!locaiton2.getStatus().equals("empty")) {
+           return false;
+        }
+        if(!locaiton2.getContainerCode().equals("")) {
+            return false;
+        }
+        return  true;
+    }
+
+    @Override
+    public Location getEmptyOutSideLocation(Location location) {
+        LambdaQueryWrapper<Location> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(Location::getWarehouseCode, location.getWarehouseCode());
+        queryWrapper.eq(Location::getZoneCode, "L");
+        queryWrapper.eq(Location::getRoadway, location.getRoadway());
+        queryWrapper.eq(Location::getRowFlag, 1);
+        queryWrapper.eq(Location::getContainerCode, "");
+        queryWrapper.eq(Location::getStatus, "empty");
+        queryWrapper.eq(Location::getLocationType, location.getLocationType());
+        List<Location> locationList = list(queryWrapper);
+        List<Location> removeLocaationList = new ArrayList<>();
+        for(Location location1 : locationList) {
+            if (taskHeaderService.getUncompleteTaskInNear(location1) > 0) {
+                removeLocaationList.add(location1);
+            } else if(!getOutSideCanMove(location1)) {
+                removeLocaationList.add(location1);
+            }
+        }
+        int column = location.getIColumn();
+        locationList.removeAll(removeLocaationList);
+        Collections.sort(locationList, new Comparator<Location>(){
+          @Override
+          public int compare(Location o1, Location o2) {
+                   int dvalue1 = Math.abs(o1.getIColumn() - column);
+                   int dvalue2 = Math.abs(o2.getIColumn() - column);
+                   return dvalue1 - dvalue2;
+              }
+;        });
+        if(locationList == null || locationList.size() <= 0) {
+            return null;
+        }
+        Location location1 = locationList.get(0);
+        return location1;
+    }
+
+
     @Override
     public Location getEmptyInsideLocation(Location location) {
         LambdaQueryWrapper<Location> queryWrapper = Wrappers.lambdaQuery();
@@ -390,17 +435,32 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
         for(Location location1 : locationList) {
             if (taskHeaderService.getUncompleteTaskInNear(location1) > 0) {
                 removeLocaationList.add(location1);
-            } else {
-                break;
             }
         }
+        int column = location.getIColumn();
         locationList.removeAll(removeLocaationList);
+        Collections.sort(locationList, new Comparator<Location>(){
+            @Override
+            public int compare(Location o1, Location o2) {
+                int dvalue1 = Math.abs(o1.getIColumn() - column);
+                int dvalue2 = Math.abs(o2.getIColumn() - column);
+                return dvalue1 - dvalue2;
+            }
+         });
         if(locationList == null || locationList.size() <= 0) {
             return null;
         }
+
         Location location1 = locationList.get(0);
         return location1;
     }
  
-
+    @Override
+    public Location getEmptyLocation(Location location) {
+        Location location1 = getEmptyOutSideLocation(location);
+        if (location1 == null) {
+            location1 = getEmptyInsideLocation(location);
+        }
+        return location1;
+    }
 }
@@ -190,7 +190,7 @@ public class ReceivingService {
         if(rowFlag == 1) {
             Location insideLocation = locationService.getInsideNear(location);
             if(StringUtils.isNotEmpty(insideLocation.getContainerCode())) {
-                Location destinationLocation = locationService.getEmptyInsideLocation(insideLocation);
+                Location destinationLocation = locationService.getEmptyLocation(insideLocation);
                 AjaxResult ajaxResult = transferTaskService.createTransferTask(insideLocation.getCode(), destinationLocation.getCode());
                 preTaskNo = (Integer) ajaxResult.getData();
                 if(ajaxResult.hasErr()) {
@@ -125,7 +125,8 @@ public class ReceiptTaskService {
             String locationCode = receiptContainerHeader.getToLocation();
             if(StringUtils.isNotEmpty(locationCode)) {
                 Location desLocation = locationService.findLocationByCode(locationCode);
-                if(desLocation.getWarehouseCode().equals(ShiroUtils.getWarehouseCode())) {
+                String loginWarehouse = ShiroUtils.getWarehouseCode();
+                if(!desLocation.getWarehouseCode().equals(loginWarehouse)) {
                     return AjaxResult.error("库位对应仓库不对");
                 }
                 if (taskHeaderService.getUncompleteTaskInNear(desLocation) > 0) {