PC拣货任务集货位下发
This commit is contained in:
+6
@@ -33,5 +33,11 @@ public class StorageLocationLinkagePO implements Serializable {
|
||||
@Excel(name = "库位名称")
|
||||
private String name;
|
||||
|
||||
@ApiModelProperty("库区种类编码")
|
||||
private String storageLocationType;
|
||||
|
||||
@ApiModelProperty("库区种类名称")
|
||||
private String storageLocationTypeName;
|
||||
|
||||
|
||||
}
|
||||
|
||||
+8
-1
@@ -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);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user