PC拣货任务集货位下发

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/warehouse/WarehouseApplicationService.java

@@ -223,8 +223,8 @@ public class WarehouseApplicationService {
      * @param warehouseId
      * @return WarehousePO
      */
-    public List<WarehouseLinkagePO> getWarehouseChildren(Long warehouseId){
+    public List<WarehouseLinkagePO> getWarehouseChildren(Long warehouseId, String storageLocationType){
-        return warehouseDomainService.getWarehouseChildren(warehouseId);
+        return warehouseDomainService.getWarehouseChildren(warehouseId, storageLocationType);
     }
 
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/po/StorageLocationLinkagePO.java

@@ -33,5 +33,11 @@ public class StorageLocationLinkagePO implements Serializable {
     @Excel(name = "库位名称")
     private String name;
 
+    @ApiModelProperty("库区种类编码")
+    private String storageLocationType;
+
+    @ApiModelProperty("库区种类名称")
+    private String storageLocationTypeName;
+
 
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/service/WarehouseDomainService.java

@@ -149,7 +149,7 @@ public class WarehouseDomainService {
      * @param warehouseId
      * @return WarehousePO
      */
-    public List<WarehouseLinkagePO> getWarehouseChildren(Long warehouseId){
+    public List<WarehouseLinkagePO> getWarehouseChildren(Long warehouseId, String storageLocationType){
         if (warehouseId == null){
             AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(SecurityUtils.getLoginUser().getUserid());
             if (associationWarehouseCacheDO == null){
@@ -184,10 +184,17 @@ public class WarehouseDomainService {
             List<StorageLocationPO> storageLocationPOS = storageLocationListMap.get(storageSectionPO.getStorageCode());
             if (!CollectionUtils.isEmpty(storageLocationPOS)){
                 storageLocationPOS.forEach(storageLocationPO -> {
+                    // 按 storageLocationType 过滤
+                    if (storageLocationType != null && !storageLocationType.isEmpty()
+                            && !storageLocationType.equals(storageLocationPO.getStorageLocationType())) {
+                        return;
+                    }
                     StorageLocationLinkagePO storageLocationLinkagePO = new StorageLocationLinkagePO();
                     storageLocationLinkagePO.setId(storageLocationPO.getStorageLocationId());
                     storageLocationLinkagePO.setCode(storageLocationPO.getStorageLocationCode());
                     storageLocationLinkagePO.setName(storageLocationPO.getStorageLocationName());
+                    storageLocationLinkagePO.setStorageLocationType(storageLocationPO.getStorageLocationType());
+                    storageLocationLinkagePO.setStorageLocationTypeName(storageLocationPO.getStorageLocationTypeName());
                     storageLocationLinkagePOList.add(storageLocationLinkagePO);
                 });
             }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/warehouse/WarehouseApi.java

@@ -115,9 +115,9 @@ public class WarehouseApi extends BaseController{
 
     @ApiOperation("获取仓库及下库区及库位")
     @GetMapping("/getWarehouseChildren")
-    public AjaxResult getWarehouseChildren(Long warehouseId)
+    public AjaxResult getWarehouseChildren(Long warehouseId, String storageLocationType)
     {
-        return AjaxResult.success(warehouseApplicationService.getWarehouseChildren(warehouseId));
+        return AjaxResult.success(warehouseApplicationService.getWarehouseChildren(warehouseId, storageLocationType));
     }