双伸位分配库位选取巷道，当不适合分配库位大于保留库位时，那么这个巷道可分配库位要大于不适合分配库位

肖超群
1 parent 4158fbdd
Showing 2 changed files with 22 additions and 1 deletions
ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/LocationAllocationServiceImpl.java
@@ -209,7 +209,12 @@ export default {
           title: '容器状态',
           align: "center",
           dataIndex: 'containerStatus_dictText',
-          scopedSlots: {customRender: 'containerStatus_dictText'}
+          scopedSlots: {customRender: 'containerStatus_dictText'},
+          filterMultiple: false,
+          filters: [
+            {text: '空闲', value: 'empty'},
+            {text: '锁定', value: 'lock'},
+          ]
         },
         {
           title: '库位编码',
@@ -125,6 +125,22 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
         List<Integer> removeRoadWays = new ArrayList<>();
         // 寻找可用巷道，空闲的空库位低于设定值，那么这个巷道就不能用来分配库位
         for (Integer roadWay : roadWays) {
+            LambdaQueryWrapper<Location> locationLambdaQueryWrapper1 = Wrappers.lambdaQuery();
+            locationLambdaQueryWrapper1.eq(Location::getZoneCode, zoneCode).eq(Location::getWarehouseCode, warehouseCode).eq(Location::getRoadWay, roadWay)
+                .eq(Location::getStatus, QuantityConstant.STATUS_LOCATION_LOCK).ge(Location::getHigh, high).eq(Location::getEnable, QuantityConstant.STATUS_ENABLE)
+                .in(Location::getLocationTypeCode, locationTypeCodeList);
+            List<Location> totalLocationList1 = locationService.list(locationLambdaQueryWrapper1);
+            int total = 0;
+            for (Location location : totalLocationList1) {
+                Location location1 = locationService.getInsideNear(location);
+                if (location1.getStatus().equals(QuantityConstant.STATUS_LOCATION_EMPTY) && StringUtils.isEmpty(location1.getContainerCode())) {
+                    total++;
+                }
+            }
+            if (total > reserveNumber) {
+                reserveNumber = total;
+            }
+
             LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
             locationLambdaQueryWrapper.eq(Location::getZoneCode, zoneCode).eq(Location::getWarehouseCode, warehouseCode).eq(Location::getRoadWay, roadWay)
                 .eq(Location::getStatus, QuantityConstant.STATUS_LOCATION_EMPTY).ge(Location::getHigh, high).eq(Location::getEnable, QuantityConstant.STATUS_ENABLE)