bugfix:库位分配同步问题修复

puff
1 parent a0a8a88d
Showing 1 changed file with 21 additions and 3 deletions
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java
@@ -222,13 +222,15 @@ public class WarecellAllocationServiceImpl implements WarecellAllocationService 
 //                return AjaxResult.error("物料不存在！！！");
 //            materialAreaCode = material.getMaterialAreaCode();
 //        }
+
         boolean passLimit = true;
         if (taskType == QuantityConstant.TASK_TYPE_WHOLERECEIPT || taskType == QuantityConstant.TASK_TYPE_EMPTYRECEIPT
                 || taskType == QuantityConstant.TASK_TYPE_MANY_EMPTYRECEIPT) {
             passLimit = false;
         }
  
-        locationCode = getNearestLocation("");
+        // TODO inputOrOutPutMaterialcode
+        locationCode = getNearestLocation(high,"",warehouseCode,"");
         if(StrUtil.isBlank(locationCode)){
             locationCode = locationAllocationService.allocation(allocationRule,
                     locationTypeCodeList, high, area, roadWays, warehouseCode, containerCode, materialAreaCode);
@@ -328,7 +330,17 @@ public class WarecellAllocationServiceImpl implements WarecellAllocationService 
  
     private final static String INVENTORY_RANKING_KEY = "INVENTORY_RANKING";
  
-    private String getNearestLocation(String inputOrOutPutMaterialcode){
+    /**
+     * 统计物料出入库的频率，将常用的物料优先分配离出入口近的库区A
+     * @param high 高度
+     * @param materialAreaCode
+     * @param warehouseCode
+     * @param inputOrOutPutMaterialcode
+     * @return
+     */
+    private String getNearestLocation(int high,String materialAreaCode,
+                                      String warehouseCode,
+                                      String inputOrOutPutMaterialcode){
         Map<String, InventoryRankVO> inventoryRankMap =
                 inventoryTransactionService.getMaterialDetailByKey(INVENTORY_RANKING_KEY);
         InventoryRankVO inputMaterialCode = inventoryRankMap.get(inputOrOutPutMaterialcode);
@@ -337,7 +349,13 @@ public class WarecellAllocationServiceImpl implements WarecellAllocationService 
             // 获取常用库区
             List<Location> locationList = locationService
                     .list(new LambdaQueryWrapper<Location>()
-                            .eq(Location::getZoneCode, "A"));
+                            .eq(Location::getZoneCode, "A")
+                            .eq(Location::getStatus, QuantityConstant.STATUS_LOCATION_EMPTY)
+                            .eq(Location::getHigh, high)
+                            .eq(StringUtils.isNotEmpty(materialAreaCode), Location::getMaterialAreaCode, materialAreaCode)
+                            .eq(Location::getWarehouseCode, warehouseCode)
+                            .orderByAsc(Location::getILayer).last(" limit 20"));
+
             if(CollectionUtil.isNotEmpty(locationList)){
                 LinkedList<Location> locationLinkedList = new LinkedList<>(locationList);
                 locationLinkedList.sort(Comparator.comparingInt(Location::getId));