Merged PR 841: #2114 Reservieren in eine andere Filiale

#2114 Reservieren in eine andere Filiale

Related work items: #2114

apps/domain/availability/src/lib/availability.service.ts

@@ -3,10 +3,10 @@ import { ItemDTO } from '@swagger/cat';
 import { AvailabilityDTO, BranchDTO, OLAAvailabilityDTO, StoreCheckoutService, SupplierDTO } from '@swagger/checkout';
 import { Observable } from 'rxjs';
 import { AvailabilityService as SwaggerAvailabilityService } from '@swagger/availability';
-import { map, shareReplay, switchMap, withLatestFrom, mergeMap, toArray } from 'rxjs/operators';
+import { map, shareReplay, switchMap, withLatestFrom, mergeMap } from 'rxjs/operators';
 import { isArray, memorize } from '@utils/common';
 import { OrderService } from '@swagger/oms';
-import { RemiService, ResponseArgsOfIEnumerableOfStockInfoDTO, StockDTO, StockInfoDTO, StockService } from '@swagger/remi';
+import { ResponseArgsOfIEnumerableOfStockInfoDTO, StockDTO, StockInfoDTO, StockService } from '@swagger/remi';
 import { ItemData } from './defs/item-data.model';
 import { PriceDTO } from '@swagger/availability';
 import { AvailabilityByBranchDTO } from './defs/availability-by-branch-dto.model';
@@ -17,7 +17,6 @@ export class DomainAvailabilityService {
     private swaggerAvailabilityService: SwaggerAvailabilityService,
     private storeCheckoutService: StoreCheckoutService,
     private orderService: OrderService,
-    private remi: RemiService,
     private _stock: StockService
   ) {}
 
@@ -39,7 +38,7 @@ export class DomainAvailabilityService {
 
   @memorize()
   getCurrentStock(): Observable<StockDTO> {
-    return this.remi.RemiCurrentStock().pipe(
+    return this._stock.StockCurrentStock().pipe(
       map((response) => response.result),
       shareReplay()
     );
@@ -47,7 +46,7 @@ export class DomainAvailabilityService {
 
   @memorize()
   getCurrentBranch(): Observable<BranchDTO> {
-    return this.remi.RemiCurrentBranch().pipe(
+    return this._stock.StockCurrentBranch().pipe(
       map((response) => response.result),
       shareReplay()
     );
@@ -70,6 +69,7 @@ export class DomainAvailabilityService {
       map(([result, supplier]) => {
         const availabilities: AvailabilityByBranchDTO[] = result.map((stockInfo) => {
           return {
+            availableQuantity: stockInfo.availableQuantity,
             availabilityType: quantity <= stockInfo.inStock ? 1024 : 1, // 1024 (=Available)
             inStock: stockInfo.inStock,
             ssc: quantity <= stockInfo.inStock ? '999' : '',

apps/domain/availability/src/lib/defs/availability-by-branch-dto.model.ts

@@ -1,6 +1,7 @@
 import { AvailabilityDTO } from '@swagger/checkout';
 
 export interface AvailabilityByBranchDTO extends AvailabilityDTO {
+  availableQuantity?: number;
   stockId?: number;
   branchId: number;
 }

apps/isa/remission/src/lib/services/rest-remission.service.ts

@@ -54,6 +54,7 @@ import {
   ReturnDTO,
   ResponseArgsOfValueTupleOfReceiptItemDTOAndReturnItemDTO,
   ResponseArgsOfValueTupleOfReceiptItemDTOAndReturnSuggestionDTO,
+  StockService,
 } from '@swagger/remi';
 import { ItemDTO, SearchService } from '@swagger/cat';
 import { PrintService, InventoryPrintService, PrintRequestOfString } from '@swagger/print';
@@ -77,7 +78,7 @@ export class RestRemissionService extends RemissionService {
     }>
   >();
 
-  stock$ = this.remiService.RemiCurrentStock().pipe(
+  stock$ = this.stockService.StockCurrentStock().pipe(
     map((response) => response.result),
     shareReplay()
   );
@@ -88,6 +89,7 @@ export class RestRemissionService extends RemissionService {
     private uidGenerator: UidGeneratorService,
     private processStore: ProcessStoreService,
     private remiService: RemiService,
+    private stockService: StockService,
     private supplierAPI: SupplierService,
     private returnApi: ReturnService,
     private restFilterService: RestFilterService,

apps/modal/availabilities/src/lib/availabilities.component.html

@@ -39,13 +39,20 @@
           {{ branch.address.city }}
         </span>
       </div>
-      <ui-spinner [show]="stockFetching$ | async">
-        <span class="branch-stock">
-          <ui-icon icon="home" size="22px"></ui-icon>
 
-          {{ branch.id | inStock: (inStock$ | async) }}
-        </span>
-      </ui-spinner>
+      <div class="branch-actions">
+        <button *ngIf="(branch.id | stockInfo: (inStock$ | async))?.availableQuantity > 0" class="cta-reserve" (click)="reserve(branch)">
+          Reservieren
+        </button>
+
+        <ui-spinner [show]="stockFetching$ | async">
+          <span class="branch-stock">
+            <ui-icon icon="home" size="22px"></ui-icon>
+
+            <span>{{ branch.id | inStock: (inStock$ | async) }}x</span>
+          </span>
+        </ui-spinner>
+      </div>
     </div>
     <hr />
   </ng-container>

apps/modal/availabilities/src/lib/availabilities.component.scss

@@ -51,7 +51,8 @@ hr {
   min-height: 600px;
 
   .branch {
-    @apply flex flex-row justify-between px-2 py-6;
+    @apply flex flex-row justify-between px-2 pt-6;
+    padding-bottom: 19px;
 
     .branch-info {
       .branch-name {
@@ -62,9 +63,22 @@ hr {
       }
     }
 
+    .branch-actions {
+      @apply flex flex-row items-center;
+
+      .cta-reserve {
+        @apply absolute bg-transparent text-brand text-base font-bold border-none px-1 -mr-1;
+        right: 85px;
+      }
+    }
+
     .branch-stock {
       @apply flex flex-row items-center font-bold;
 
+      span {
+        padding-top: 5px;
+      }
+
       ui-icon {
         @apply text-ucla-blue mr-1;
       }

apps/modal/availabilities/src/lib/availabilities.component.ts

@@ -19,6 +19,7 @@ export class ModalAvailabilitiesComponent {
   branchesFetching$ = new BehaviorSubject(false);
   stockFetching$ = new BehaviorSubject(true);
   item = this.modalRef.data.item;
+  itemId = this.modalRef.data.itemId || this.modalRef.data.item.id;
   userbranch$ = this.domainAvailabilityService.getCurrentBranch();
   branches$ = this.domainAvailabilityService.getBranches();
 
@@ -48,7 +49,7 @@ export class ModalAvailabilitiesComponent {
     switchMap((branches) =>
       this.domainAvailabilityService.getTakeAwayAvailabilityByBranches({
         branchIds: branches.map((branch) => branch.id),
-        itemId: this.item.id,
+        itemId: this.itemId,
         price: this.item?.catalogAvailability?.price,
         quantity: 1,
       })
@@ -57,12 +58,19 @@ export class ModalAvailabilitiesComponent {
     shareReplay()
   );
 
-  constructor(private modalRef: UiModalRef<void, { item: ItemDTO }>, private domainAvailabilityService: DomainAvailabilityService) {}
+  constructor(
+    private modalRef: UiModalRef<BranchDTO, { item: ItemDTO; itemId: number }>,
+    private domainAvailabilityService: DomainAvailabilityService
+  ) {}
 
   filter(query: string) {
     this.search$.next(query);
   }
 
+  reserve(branch: BranchDTO) {
+    this.modalRef.close(branch);
+  }
+
   close() {
     this.modalRef.close();
   }

apps/modal/availabilities/src/lib/availabilities.module.ts

@@ -6,9 +6,10 @@ import { UiSearchboxModule } from '@ui/searchbox';
 import { UiSpinnerModule } from 'apps/ui/spinner/src/lib/ui-spinner.module';
 import { ModalAvailabilitiesComponent } from './availabilities.component';
 import { InStockPipe } from './in-stock.pipe';
+import { StockInfoPipe } from './stock-info.pipe';
 
 @NgModule({
-  declarations: [ModalAvailabilitiesComponent, InStockPipe],
+  declarations: [ModalAvailabilitiesComponent, StockInfoPipe, InStockPipe],
   imports: [CommonModule, FormsModule, UiSearchboxModule, UiIconModule, UiSpinnerModule],
   exports: [ModalAvailabilitiesComponent],
 })

apps/modal/availabilities/src/lib/in-stock.pipe.ts

@@ -6,6 +6,7 @@ import { AvailabilityByBranchDTO } from 'apps/domain/availability/src/lib/defs/a
 })
 export class InStockPipe implements PipeTransform {
   transform(branchId: number, inStock: AvailabilityByBranchDTO[]): number {
-    return inStock?.find((info) => info.branchId === branchId)?.inStock || 0;
+    const stock = inStock?.find((info) => info.branchId === branchId)?.inStock || 0;
+    return stock > 0 ? stock : 0;
   }
 }

apps/modal/availabilities/src/lib/stock-info.pipe.ts

@@ -0,0 +1,11 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { AvailabilityByBranchDTO } from 'apps/domain/availability/src/lib/defs/availability-by-branch-dto.model';
+
+@Pipe({
+  name: 'stockInfo',
+})
+export class StockInfoPipe implements PipeTransform {
+  transform(branchId: number, inStock: AvailabilityByBranchDTO[]): AvailabilityByBranchDTO {
+    return inStock?.find((info) => info.branchId === branchId);
+  }
+}

apps/page/catalog/src/lib/article-details/article-details.component.ts

@@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router';
 import { ApplicationService } from '@core/application';
 import { DomainPrinterService } from '@domain/printer';
 import { PrintModalComponent, PrintModalData } from '@modal/printer';
-import { AvailabilityDTO } from '@swagger/checkout';
+import { AvailabilityDTO, BranchDTO } from '@swagger/checkout';
 import { UiModalService } from '@ui/modal';
 import { ModalReviewsComponent } from '@modal/reviews';
 import { PurchasingOptionsModalComponent, PurchasingOptionsModalData } from 'apps/page/checkout/src/lib/modals/purchasing-options-modal';
@@ -137,12 +137,20 @@ export class ArticleDetailsComponent implements OnInit, OnDestroy {
 
   async showAvailabilities() {
     const item = await this.store.item$.pipe(first()).toPromise();
-    this.uiModal.open({
+    const modal = this.uiModal.open<BranchDTO>({
       content: ModalAvailabilitiesComponent,
       data: {
         item,
       },
     });
+
+    this.subscriptions.add(
+      modal.afterClosed$.subscribe((result) => {
+        if (result?.data) {
+          this.showPurchasingModal(result.data);
+        }
+      })
+    );
   }
 
   async showImages() {
@@ -171,7 +179,7 @@ export class ArticleDetailsComponent implements OnInit, OnDestroy {
     });
   }
 
-  async showPurchasingModal() {
+  async showPurchasingModal(selectedBranch?: BranchDTO) {
     let availableOptions: PurchasingOptions[] = [];
     const availabilities: { [key: string]: AvailabilityDTO } = {};
 
@@ -211,13 +219,14 @@ export class ArticleDetailsComponent implements OnInit, OnDestroy {
       availableOptions = availableOptions.filter((option) => !(option === 'dig-delivery' || option === 'b2b-delivery'));
     }
 
-    const branch = await this.store.branch$.pipe(first()).toPromise();
+    const branch = selectedBranch || (await this.store.branch$.pipe(first()).toPromise());
     this.uiModal.open({
       content: PurchasingOptionsModalComponent,
       data: {
         availableOptions,
+        option: selectedBranch ? 'take-away' : undefined,
         item: await this.store.item$.pipe(first()).toPromise(),
-        branchNo: branch?.branchNumber,
+        branchId: branch?.id,
         processId: this.applicationService.activatedProcessId,
         availabilities,
       } as PurchasingOptionsModalData,

apps/page/checkout/src/lib/checkout-review/checkout-review.component.html

@@ -99,12 +99,20 @@
         </ng-container>
         <hr />
         <ng-container *ngFor="let item of group.items; let lastItem = last; let i = index">
-          <ng-container *ngIf="item.features?.orderType === 'Abholung'">
+          <ng-container *ngIf="item.features?.orderType === 'Abholung' || item.features?.orderType === 'Rücklage'">
             <ng-container *ngIf="item?.destination?.data?.targetBranch?.data; let targetBranch">
               <ng-container *ngIf="i === 0 || targetBranch.id !== group.items[i - 1].destination?.data?.targetBranch?.data.id">
                 <div class="row">
                   <span class="branch-label">Filiale</span>
                   <span class="branch-name">{{ targetBranch?.name }} | {{ targetBranch | branchAddress }}</span>
+                  <ng-container *ngIf="item.features?.orderType === 'Rücklage'">
+                    <div class="grow"></div>
+                    <div>
+                      <button (click)="changeBranch(item)" class="cta-edit">
+                        Ändern
+                      </button>
+                    </div>
+                  </ng-container>
                 </div>
                 <hr />
               </ng-container>

apps/page/checkout/src/lib/checkout-review/checkout-review.component.ts

@@ -1,9 +1,9 @@
-import { Component, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core';
+import { Component, ChangeDetectionStrategy, ChangeDetectorRef, OnDestroy } from '@angular/core';
 import { Router } from '@angular/router';
 import { ApplicationService } from '@core/application';
 import { DomainAvailabilityService } from '@domain/availability';
 import { DomainCheckoutService } from '@domain/checkout';
-import { AvailabilityDTO, DestinationDTO, ShoppingCartItemDTO } from '@swagger/checkout';
+import { AvailabilityDTO, BranchDTO, DestinationDTO, ShoppingCartItemDTO } from '@swagger/checkout';
 import { UiMessageModalComponent, UiModalService } from '@ui/modal';
 import { PrintModalData, PrintModalComponent } from '@modal/printer';
 import { first, map, shareReplay, switchMap, takeUntil } from 'rxjs/operators';
@@ -15,6 +15,7 @@ import { DomainCatalogService } from '@domain/catalog';
 import { BreadcrumbService } from '@core/breadcrumb';
 import { DomainPrinterService } from '@domain/printer';
 import { HttpErrorResponse } from '@angular/common/http';
+import { ModalAvailabilitiesComponent } from '@modal/availabilities';
 
 @Component({
   selector: 'page-checkout-review',
@@ -22,8 +23,9 @@ import { HttpErrorResponse } from '@angular/common/http';
   styleUrls: ['checkout-review.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class CheckoutReviewComponent {
+export class CheckoutReviewComponent implements OnDestroy {
   private _orderCompleted = new Subject<void>();
+  private _onDestroy$ = new Subject<void>();
 
   shoppingCart$ = this.applicationService.activatedProcessId$.pipe(
     takeUntil(this._orderCompleted),
@@ -143,6 +145,11 @@ export class CheckoutReviewComponent {
       });
   }
 
+  ngOnDestroy(): void {
+    this._onDestroy$.next();
+    this._onDestroy$.complete();
+  }
+
   async changeItem(shoppingCartItem: ShoppingCartItemDTO) {
     this.showChangeButtonSpinnerItemId = shoppingCartItem.id;
 
@@ -258,29 +265,6 @@ export class CheckoutReviewComponent {
       }
     }
 
-    let option: PurchasingOptions;
-
-    switch (shoppingCartItem.features.orderType) {
-      case 'Rücklage':
-        option = 'take-away';
-        break;
-      case 'Abholung':
-        option = 'take-away';
-        break;
-      case 'Versand':
-        option = 'delivery';
-        break;
-      case 'DIG-Versand':
-        option = 'dig-delivery';
-        break;
-      case 'B2B-Versand':
-        option = 'b2b-delivery';
-        break;
-      case 'Download':
-        option = 'download';
-        break;
-    }
-
     this.showChangeButtonSpinnerItemId = undefined;
     this.cdr.markForCheck();
 
@@ -300,9 +284,8 @@ export class CheckoutReviewComponent {
           },
         },
         shoppingCartItem,
-        branchNo: branch.branchNumber,
+        branchId: branch?.id,
         processId: this.applicationService.activatedProcessId,
-        option,
         availabilities,
       } as PurchasingOptionsModalData,
     });
@@ -440,6 +423,34 @@ export class CheckoutReviewComponent {
     this.router.navigate(['/customer', `${customerId}`]);
   }
 
+  changeBranch(item) {
+    const modal = this.uiModal.open<BranchDTO>({
+      content: ModalAvailabilitiesComponent,
+      data: {
+        item,
+        itemId: +item.product.catalogProductNumber,
+      },
+    });
+    modal.afterClosed$.pipe(takeUntil(this._onDestroy$)).subscribe(async (result) => {
+      if (result?.data) {
+        await this.domainCheckoutService
+          .updateItemInShoppingCart({
+            processId: this.applicationService.activatedProcessId,
+            shoppingCartItemId: item.id,
+            update: {
+              destination: {
+                data: {
+                  target: 1,
+                  targetBranch: { id: result.data.id },
+                },
+              },
+            },
+          })
+          .toPromise();
+      }
+    });
+  }
+
   async navigateToCustomerSearch(processId: number) {
     try {
       const response = await this.customerFeatures$

apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.component.html

@@ -22,13 +22,19 @@
   </button>
 
   <div class="option-product-summary" *ngIf="item$ | async; let item">
-    <h5 class="option-name" *ngIf="option$ | async; let option">
-      <ng-container *ngIf="option | purchaseOptionIcon; let icon">
-        <ui-icon [size]="icon === 'truck_b2b' ? '40px' : '23px'" [icon]="icon"></ui-icon>
-      </ng-container>
+    <div class="header-row">
+      <h5 class="option-name" *ngIf="option$ | async; let option">
+        <ng-container *ngIf="option | purchaseOptionIcon; let icon">
+          <ui-icon [size]="icon === 'truck_b2b' ? '40px' : '23px'" [icon]="icon"></ui-icon>
+        </ng-container>
 
-      {{ option | purchaseOptionName }}
-    </h5>
+        {{ option | purchaseOptionName }}
+      </h5>
+      <span>
+        in der Filiale:
+        <span class="option-branch">{{ (branch$ | async)?.name }}</span>
+      </span>
+    </div>
     <hr />
     <div class="product-row">
       <img class="thumbnail" [src]="(item?.imageId !== undefined ? item?.imageId : item?.product?.ean) | productImage: 80:100:true" />

apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.component.scss

@@ -27,13 +27,17 @@
 }
 
 .option-name {
-  @apply flex flex-row items-center font-bold text-card-sub mb-0 mt-1;
+  @apply flex flex-row items-center font-bold text-card-sub mb-2 mt-1;
 
   ui-icon {
     @apply mr-2 text-ucla-blue;
   }
 }
 
+.option-branch {
+  @apply font-bold;
+}
+
 .product-row {
   @apply flex flex-row items-center;
 }

apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.component.ts

@@ -132,17 +132,16 @@ export class PurchasingOptionsModalComponent {
     private domainCatalogService: DomainCatalogService,
     private breadcrumb: BreadcrumbService
   ) {
-    this.purchasingOptionsModalStore.setOption(this.modalRef.data.option);
     this.purchasingOptionsModalStore.setShoppingCartItem(this.modalRef.data.shoppingCartItem);
     this.purchasingOptionsModalStore.setAvailableOptions(this.modalRef.data.availableOptions);
     this.purchasingOptionsModalStore.setItem(this.modalRef.data.item);
     this.purchasingOptionsModalStore.setProcessId(this.modalRef.data.processId || this.application.activatedProcessId);
     this.purchasingOptionsModalStore.setAvailabilities(this.modalRef.data.availabilities || {});
     this.purchasingOptionsModalStore.setQuantity(this.modalRef?.data?.shoppingCartItem?.quantity || 1);
+    this.purchasingOptionsModalStore.setOption(this.modalRef.data.option);
 
     if (this.modalRef.data.availableOptions?.some((option) => option === 'pick-up' || option === 'take-away')) {
-      this.purchasingOptionsModalStore.loadBranches();
-      this.purchasingOptionsModalStore.setBranchNo(this.modalRef?.data?.branchNo);
+      this.purchasingOptionsModalStore.loadBranches(this.modalRef?.data?.branchId);
     }
   }
 

apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.data.ts

@@ -9,5 +9,5 @@ export interface PurchasingOptionsModalData {
   option?: PurchasingOptions;
   shoppingCartItem?: ShoppingCartItemDTO;
   availabilities?: { [key: string]: AvailabilityDTO };
-  branchNo?: string;
+  branchId?: number;
 }

apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.store.ts

@@ -62,9 +62,6 @@ export class PurchasingOptionsModalStore extends ComponentStore<PurchasingOption
   readonly selectHasOption = this.select((s) => !!s.option);
 
   readonly selectBranch = this.select((s) => {
-    if (s.option === 'take-away') {
-      return s.defaultBranch;
-    }
     return s.branch || s.defaultBranch;
   });
 
@@ -227,13 +224,13 @@ export class PurchasingOptionsModalStore extends ComponentStore<PurchasingOption
     };
   });
 
-  readonly setBranchNo = this.updater((state, branchNo: string) => {
-    const branch = state.availableBranches.find((branch) => branch.branchNumber === branchNo);
+  readonly setBranchId = this.updater((state, branchId: number) => {
+    const branch = state.availableBranches.find((branch) => branch.id === branchId);
 
     this.loadAvailability();
     return {
       ...state,
-      branchNo,
+      branchId,
       branch,
     };
   });
@@ -350,12 +347,15 @@ export class PurchasingOptionsModalStore extends ComponentStore<PurchasingOption
     }
   });
 
-  loadBranches = this.effect(($) =>
-    $.pipe(
-      switchMap((_) =>
+  loadBranches = this.effect((branchId$: Observable<number>) =>
+    branchId$.pipe(
+      switchMap((branchId) =>
         this.checkoutService.getBranches().pipe(
           tapResponse(
-            (branches: BranchDTO[]) => this.setAvailableBranches(branches),
+            (branches: BranchDTO[]) => {
+              this.setAvailableBranches(branches);
+              this.setBranchId(branchId);
+            },
             () => this.setAvailableBranches([])
           )
         )

apps/swagger/remi/src/lib/models.ts

@@ -29,9 +29,11 @@ export { IPublicUserInfo } from './models/ipublic-user-info';
 export { ProblemDetails } from './models/problem-details';
 export { ResponseArgsOfPackageDTO } from './models/response-args-of-package-dto';
 export { ResponseArgsOfNullableBoolean } from './models/response-args-of-nullable-boolean';
-export { ResponseArgsOfStockDTO } from './models/response-args-of-stock-dto';
-export { StockDTO } from './models/stock-dto';
+export { ListResponseArgsOfReturnItemDTO } from './models/list-response-args-of-return-item-dto';
+export { ResponseArgsOfIEnumerableOfReturnItemDTO } from './models/response-args-of-ienumerable-of-return-item-dto';
+export { ReturnItemDTO } from './models/return-item-dto';
 export { EntityDTOContainerOfStockDTO } from './models/entity-dtocontainer-of-stock-dto';
+export { StockDTO } from './models/stock-dto';
 export { EntityDTOContainerOfBranchDTO } from './models/entity-dtocontainer-of-branch-dto';
 export { BranchDTO } from './models/branch-dto';
 export { Address } from './models/address';
@@ -39,10 +41,6 @@ export { BranchType } from './models/branch-type';
 export { ReadOnlyEntityDTOOfBranchDTOAndIReadOnlyBranch } from './models/read-only-entity-dtoof-branch-dtoand-iread-only-branch';
 export { EntityDTOOfStockDTOAndIStock } from './models/entity-dtoof-stock-dtoand-istock';
 export { ReadOnlyEntityDTOOfStockDTOAndIStock } from './models/read-only-entity-dtoof-stock-dtoand-istock';
-export { ResponseArgsOfBranchDTO } from './models/response-args-of-branch-dto';
-export { ListResponseArgsOfReturnItemDTO } from './models/list-response-args-of-return-item-dto';
-export { ResponseArgsOfIEnumerableOfReturnItemDTO } from './models/response-args-of-ienumerable-of-return-item-dto';
-export { ReturnItemDTO } from './models/return-item-dto';
 export { EntityDTOContainerOfStockCompartmentDTO } from './models/entity-dtocontainer-of-stock-compartment-dto';
 export { StockCompartmentDTO } from './models/stock-compartment-dto';
 export { SizeOfString } from './models/size-of-string';
@@ -175,6 +173,12 @@ export { StockInfoDTO } from './models/stock-info-dto';
 export { StockRequestValues } from './models/stock-request-values';
 export { ResponseArgsOfIEnumerableOfReturnInfoDTO } from './models/response-args-of-ienumerable-of-return-info-dto';
 export { ReturnInfoDTO } from './models/return-info-dto';
+export { ResponseArgsOfDBHBranchExtensionDTO } from './models/response-args-of-dbhbranch-extension-dto';
+export { DBHBranchExtensionDTO } from './models/dbhbranch-extension-dto';
+export { BranchDTO2 } from './models/branch-dto2';
+export { QuadrupelDTO } from './models/quadrupel-dto';
+export { ResponseArgsOfBranchDTO } from './models/response-args-of-branch-dto';
+export { ResponseArgsOfStockDTO } from './models/response-args-of-stock-dto';
 export { ResponseArgsOfIEnumerableOfStockDTO } from './models/response-args-of-ienumerable-of-stock-dto';
 export { ResponseArgsOfIEnumerableOfSupplierDTO } from './models/response-args-of-ienumerable-of-supplier-dto';
 export { ResponseArgsOfIEnumerableOfStockEntryDTO } from './models/response-args-of-ienumerable-of-stock-entry-dto';

apps/swagger/remi/src/lib/models/branch-dto2.ts

@@ -0,0 +1,33 @@
+/* tslint:disable */
+export interface BranchDTO2 {
+
+  /**
+   * Filial-/Abteilungsnnummer
+   */
+  branchNumber?: string;
+
+  /**
+   * Label, welche die Fialiale/Abteilung angehört
+   */
+  id?: number;
+
+  /**
+   * Eindeutiger Schlüssel/Kürzel (bezogen auf das Label)
+   */
+  key?: string;
+
+  /**
+   * Name der Filiale/Abteilung
+   */
+  name?: string;
+
+  /**
+   * Übergeordnete Filiale/Abteilung
+   */
+  parent?: number;
+
+  /**
+   * Kurzname
+   */
+  shortName?: string;
+}

apps/swagger/remi/src/lib/models/dbhbranch-extension-dto.ts

@@ -0,0 +1,15 @@
+/* tslint:disable */
+import { BranchDTO2 } from './branch-dto2';
+import { QuadrupelDTO } from './quadrupel-dto';
+
+/**
+ * Zusatzdaten Filiale
+ */
+export interface DBHBranchExtensionDTO {
+  branch?: BranchDTO2;
+  labeKey?: string;
+  quadrupel?: QuadrupelDTO;
+  start?: string;
+  stop?: string;
+  tenantKey?: string;
+}

apps/swagger/remi/src/lib/models/quadrupel-dto.ts

@@ -0,0 +1,11 @@
+/* tslint:disable */
+
+/**
+ * Quadrupel
+ */
+export interface QuadrupelDTO {
+  firmennummer?: string;
+  geschaeftsnr: number;
+  mandantnr: number;
+  vertriebsnr: number;
+}

apps/swagger/remi/src/lib/models/response-args-of-dbhbranch-extension-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { ResponseArgs } from './response-args';
+import { DBHBranchExtensionDTO } from './dbhbranch-extension-dto';
+export interface ResponseArgsOfDBHBranchExtensionDTO extends ResponseArgs{
+  result?: DBHBranchExtensionDTO;
+}

apps/swagger/remi/src/lib/models/stock-info-dto.ts

@@ -5,6 +5,11 @@
  */
 export interface StockInfoDTO {
 
+  /**
+   * Verfügbare Menge
+   */
+  availableQuantity?: number;
+
   /**
    * Filiale PK
    */

apps/swagger/remi/src/lib/services/package.service.ts

@@ -142,7 +142,7 @@ class PackageService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'PUT',
-      this.rootUrl + `/inventory/package/${encodeURIComponent(String(params.packageId))}`,
+      this.rootUrl + `/inventory/package/${encodeURIComponent(params.packageId)}`,
       __body,
       {
         headers: __headers,
@@ -190,7 +190,7 @@ class PackageService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'PATCH',
-      this.rootUrl + `/inventory/package/${encodeURIComponent(String(params.packageId))}`,
+      this.rootUrl + `/inventory/package/${encodeURIComponent(params.packageId)}`,
       __body,
       {
         headers: __headers,
@@ -235,7 +235,7 @@ class PackageService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'DELETE',
-      this.rootUrl + `/inventory/package/${encodeURIComponent(String(params.packageId))}`,
+      this.rootUrl + `/inventory/package/${encodeURIComponent(params.packageId)}`,
       __body,
       {
         headers: __headers,

apps/swagger/remi/src/lib/services/remi.service.ts

@@ -7,8 +7,6 @@ import { StrictHttpResponse as __StrictHttpResponse } from '../strict-http-respo
 import { Observable as __Observable } from 'rxjs';
 import { map as __map, filter as __filter } from 'rxjs/operators';
 
-import { ResponseArgsOfStockDTO } from '../models/response-args-of-stock-dto';
-import { ResponseArgsOfBranchDTO } from '../models/response-args-of-branch-dto';
 import { ListResponseArgsOfReturnItemDTO } from '../models/list-response-args-of-return-item-dto';
 import { RemiQueryTokenDTO } from '../models/remi-query-token-dto';
 import { BatchResponseArgsOfReturnItemDTOAndReturnItemDTO } from '../models/batch-response-args-of-return-item-dtoand-return-item-dto';
@@ -25,8 +23,6 @@ import { CapacityRequest } from '../models/capacity-request';
   providedIn: 'root',
 })
 class RemiService extends __BaseService {
-  static readonly RemiCurrentStockPath = '/inventory/stock/current';
-  static readonly RemiCurrentBranchPath = '/inventory/stock/current/branch';
   static readonly RemiPflichtremissionsartikelPath = '/remi/pflichtremission';
   static readonly RemiCreateReturnItemPath = '/inventory/pflichtremission/item';
   static readonly RemiDeleteNullgutschriftenPath = '/remi/stock/{stockId}/nullgutschriften';
@@ -45,78 +41,6 @@ class RemiService extends __BaseService {
     super(config, http);
   }
 
-  /**
-   * Zugeordnetes Lager
-   * @param locale Lokalisierung
-   */
-  RemiCurrentStockResponse(locale?: null | string): __Observable<__StrictHttpResponse<ResponseArgsOfStockDTO>> {
-    let __params = this.newParams();
-    let __headers = new HttpHeaders();
-    let __body: any = null;
-    if (locale != null) __params = __params.set('locale', locale.toString());
-    let req = new HttpRequest<any>(
-      'GET',
-      this.rootUrl + `/inventory/stock/current`,
-      __body,
-      {
-        headers: __headers,
-        params: __params,
-        responseType: 'json'
-      });
-
-    return this.http.request<any>(req).pipe(
-      __filter(_r => _r instanceof HttpResponse),
-      __map((_r) => {
-        return _r as __StrictHttpResponse<ResponseArgsOfStockDTO>;
-      })
-    );
-  }
-  /**
-   * Zugeordnetes Lager
-   * @param locale Lokalisierung
-   */
-  RemiCurrentStock(locale?: null | string): __Observable<ResponseArgsOfStockDTO> {
-    return this.RemiCurrentStockResponse(locale).pipe(
-      __map(_r => _r.body as ResponseArgsOfStockDTO)
-    );
-  }
-
-  /**
-   * Dem aktuellen Lager zugeortnete Filiale
-   * @param locale Lokalisierung
-   */
-  RemiCurrentBranchResponse(locale?: null | string): __Observable<__StrictHttpResponse<ResponseArgsOfBranchDTO>> {
-    let __params = this.newParams();
-    let __headers = new HttpHeaders();
-    let __body: any = null;
-    if (locale != null) __params = __params.set('locale', locale.toString());
-    let req = new HttpRequest<any>(
-      'GET',
-      this.rootUrl + `/inventory/stock/current/branch`,
-      __body,
-      {
-        headers: __headers,
-        params: __params,
-        responseType: 'json'
-      });
-
-    return this.http.request<any>(req).pipe(
-      __filter(_r => _r instanceof HttpResponse),
-      __map((_r) => {
-        return _r as __StrictHttpResponse<ResponseArgsOfBranchDTO>;
-      })
-    );
-  }
-  /**
-   * Dem aktuellen Lager zugeortnete Filiale
-   * @param locale Lokalisierung
-   */
-  RemiCurrentBranch(locale?: null | string): __Observable<ResponseArgsOfBranchDTO> {
-    return this.RemiCurrentBranchResponse(locale).pipe(
-      __map(_r => _r.body as ResponseArgsOfBranchDTO)
-    );
-  }
-
   /**
    * Listet alle offenen Remittenden
    * @param params The `RemiService.RemiPflichtremissionsartikelParams` containing the following parameters:
@@ -226,7 +150,7 @@ class RemiService extends __BaseService {
     if (params.department != null) __params = __params.set('department', params.department.toString());
     let req = new HttpRequest<any>(
       'DELETE',
-      this.rootUrl + `/remi/stock/${encodeURIComponent(String(params.stockId))}/nullgutschriften`,
+      this.rootUrl + `/remi/stock/${encodeURIComponent(params.stockId)}/nullgutschriften`,
       __body,
       {
         headers: __headers,
@@ -366,7 +290,7 @@ class RemiService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'GET',
-      this.rootUrl + `/remi/stock/${encodeURIComponent(String(params.stockId))}/filter`,
+      this.rootUrl + `/remi/stock/${encodeURIComponent(params.stockId)}/filter`,
       __body,
       {
         headers: __headers,
@@ -416,7 +340,7 @@ class RemiService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'GET',
-      this.rootUrl + `/remi/stock/${encodeURIComponent(String(params.stockId))}/pflichtremission/filter`,
+      this.rootUrl + `/remi/stock/${encodeURIComponent(params.stockId)}/pflichtremission/filter`,
       __body,
       {
         headers: __headers,
@@ -466,7 +390,7 @@ class RemiService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'GET',
-      this.rootUrl + `/remi/stock/${encodeURIComponent(String(params.stockId))}/ueberlauf/filter`,
+      this.rootUrl + `/remi/stock/${encodeURIComponent(params.stockId)}/ueberlauf/filter`,
       __body,
       {
         headers: __headers,
@@ -513,7 +437,7 @@ class RemiService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'GET',
-      this.rootUrl + `/remi/stock/${encodeURIComponent(String(params.stockId))}/productgroup`,
+      this.rootUrl + `/remi/stock/${encodeURIComponent(params.stockId)}/productgroup`,
       __body,
       {
         headers: __headers,
@@ -561,7 +485,7 @@ class RemiService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'POST',
-      this.rootUrl + `/remi/stock/${encodeURIComponent(String(params.stockId))}/ueberlauf/required-capacity`,
+      this.rootUrl + `/remi/stock/${encodeURIComponent(params.stockId)}/ueberlauf/required-capacity`,
       __body,
       {
         headers: __headers,

apps/swagger/remi/src/lib/services/return.service.ts

@@ -139,7 +139,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'POST',
-      this.rootUrl + `/inventory/return/${encodeURIComponent(String(params.returnId))}/receipt`,
+      this.rootUrl + `/inventory/return/${encodeURIComponent(params.returnId)}/receipt`,
       __body,
       {
         headers: __headers,
@@ -187,7 +187,7 @@ class ReturnService extends __BaseService {
     if (params.eagerLoading != null) __params = __params.set('eagerLoading', params.eagerLoading.toString());
     let req = new HttpRequest<any>(
       'GET',
-      this.rootUrl + `/inventory/return/${encodeURIComponent(String(params.returnId))}/receipt`,
+      this.rootUrl + `/inventory/return/${encodeURIComponent(params.returnId)}/receipt`,
       __body,
       {
         headers: __headers,
@@ -238,7 +238,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'PATCH',
-      this.rootUrl + `/inventory/return/${encodeURIComponent(String(params.returnId))}/receipt/${encodeURIComponent(String(params.receiptId))}/finalize`,
+      this.rootUrl + `/inventory/return/${encodeURIComponent(params.returnId)}/receipt/${encodeURIComponent(params.receiptId)}/finalize`,
       __body,
       {
         headers: __headers,
@@ -285,7 +285,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'PATCH',
-      this.rootUrl + `/inventory/return/${encodeURIComponent(String(params.returnId))}/finalize`,
+      this.rootUrl + `/inventory/return/${encodeURIComponent(params.returnId)}/finalize`,
       __body,
       {
         headers: __headers,
@@ -329,7 +329,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'POST',
-      this.rootUrl + `/remi/return/${encodeURIComponent(String(params.returnId))}/transfer-to-bookhit`,
+      this.rootUrl + `/remi/return/${encodeURIComponent(params.returnId)}/transfer-to-bookhit`,
       __body,
       {
         headers: __headers,
@@ -379,7 +379,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'POST',
-      this.rootUrl + `/inventory/return/${encodeURIComponent(String(params.returnId))}/receipt/${encodeURIComponent(String(params.receiptId))}/addreturnitem`,
+      this.rootUrl + `/inventory/return/${encodeURIComponent(params.returnId)}/receipt/${encodeURIComponent(params.receiptId)}/addreturnitem`,
       __body,
       {
         headers: __headers,
@@ -432,7 +432,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'POST',
-      this.rootUrl + `/inventory/return/${encodeURIComponent(String(params.returnId))}/receipt/${encodeURIComponent(String(params.receiptId))}/addreturnsuggestion`,
+      this.rootUrl + `/inventory/return/${encodeURIComponent(params.returnId)}/receipt/${encodeURIComponent(params.receiptId)}/addreturnsuggestion`,
       __body,
       {
         headers: __headers,
@@ -485,7 +485,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'DELETE',
-      this.rootUrl + `/inventory/return/${encodeURIComponent(String(params.returnId))}/receipt/${encodeURIComponent(String(params.receiptId))}/items/${encodeURIComponent(String(params.receiptItemId))}`,
+      this.rootUrl + `/inventory/return/${encodeURIComponent(params.returnId)}/receipt/${encodeURIComponent(params.receiptId)}/items/${encodeURIComponent(params.receiptItemId)}`,
       __body,
       {
         headers: __headers,
@@ -535,7 +535,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'DELETE',
-      this.rootUrl + `/inventory/return/${encodeURIComponent(String(params.returnId))}/receipt/${encodeURIComponent(String(params.receiptId))}/cancel`,
+      this.rootUrl + `/inventory/return/${encodeURIComponent(params.returnId)}/receipt/${encodeURIComponent(params.receiptId)}/cancel`,
       __body,
       {
         headers: __headers,
@@ -580,7 +580,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'GET',
-      this.rootUrl + `/inventory/stock/${encodeURIComponent(String(params.stockId))}/return/reasons`,
+      this.rootUrl + `/inventory/stock/${encodeURIComponent(params.stockId)}/return/reasons`,
       __body,
       {
         headers: __headers,
@@ -669,7 +669,7 @@ class ReturnService extends __BaseService {
     if (params.eagerLoading != null) __params = __params.set('eagerLoading', params.eagerLoading.toString());
     let req = new HttpRequest<any>(
       'GET',
-      this.rootUrl + `/inventory/return/${encodeURIComponent(String(params.returnId))}`,
+      this.rootUrl + `/inventory/return/${encodeURIComponent(params.returnId)}`,
       __body,
       {
         headers: __headers,
@@ -714,7 +714,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'DELETE',
-      this.rootUrl + `/inventory/return/${encodeURIComponent(String(params.returnId))}/cancel`,
+      this.rootUrl + `/inventory/return/${encodeURIComponent(params.returnId)}/cancel`,
       __body,
       {
         headers: __headers,
@@ -757,7 +757,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'PATCH',
-      this.rootUrl + `/inventory/returngroup/${encodeURIComponent(String(params.returnGroup))}/finalize`,
+      this.rootUrl + `/inventory/returngroup/${encodeURIComponent(params.returnGroup)}/finalize`,
       __body,
       {
         headers: __headers,
@@ -803,7 +803,7 @@ class ReturnService extends __BaseService {
     if (params.eagerLoading != null) __params = __params.set('eagerLoading', params.eagerLoading.toString());
     let req = new HttpRequest<any>(
       'GET',
-      this.rootUrl + `/inventory/return/item/${encodeURIComponent(String(params.itemId))}`,
+      this.rootUrl + `/inventory/return/item/${encodeURIComponent(params.itemId)}`,
       __body,
       {
         headers: __headers,
@@ -848,7 +848,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'DELETE',
-      this.rootUrl + `/inventory/return/item/${encodeURIComponent(String(params.itemId))}`,
+      this.rootUrl + `/inventory/return/item/${encodeURIComponent(params.itemId)}`,
       __body,
       {
         headers: __headers,
@@ -894,7 +894,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'PATCH',
-      this.rootUrl + `/inventory/return/item/${encodeURIComponent(String(params.itemId))}/impediment`,
+      this.rootUrl + `/inventory/return/item/${encodeURIComponent(params.itemId)}/impediment`,
       __body,
       {
         headers: __headers,
@@ -985,7 +985,7 @@ class ReturnService extends __BaseService {
     if (params.eagerLoading != null) __params = __params.set('eagerLoading', params.eagerLoading.toString());
     let req = new HttpRequest<any>(
       'GET',
-      this.rootUrl + `/inventory/return/suggestion/${encodeURIComponent(String(params.itemId))}`,
+      this.rootUrl + `/inventory/return/suggestion/${encodeURIComponent(params.itemId)}`,
       __body,
       {
         headers: __headers,
@@ -1033,7 +1033,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'PATCH',
-      this.rootUrl + `/inventory/return/suggestion/${encodeURIComponent(String(params.itemId))}/impediment`,
+      this.rootUrl + `/inventory/return/suggestion/${encodeURIComponent(params.itemId)}/impediment`,
       __body,
       {
         headers: __headers,
@@ -1081,7 +1081,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'POST',
-      this.rootUrl + `/inventory/stock/${encodeURIComponent(String(params.stockId))}/return/item`,
+      this.rootUrl + `/inventory/stock/${encodeURIComponent(params.stockId)}/return/item`,
       __body,
       {
         headers: __headers,
@@ -1129,7 +1129,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'POST',
-      this.rootUrl + `/inventory/stock/${encodeURIComponent(String(params.stockId))}/return/suggestion`,
+      this.rootUrl + `/inventory/stock/${encodeURIComponent(params.stockId)}/return/suggestion`,
       __body,
       {
         headers: __headers,
@@ -1177,7 +1177,7 @@ class ReturnService extends __BaseService {
     if (params.department != null) __params = __params.set('department', params.department.toString());
     let req = new HttpRequest<any>(
       'DELETE',
-      this.rootUrl + `/inventory/stock/${encodeURIComponent(String(params.stockId))}/return/suggestion`,
+      this.rootUrl + `/inventory/stock/${encodeURIComponent(params.stockId)}/return/suggestion`,
       __body,
       {
         headers: __headers,
@@ -1222,7 +1222,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'DELETE',
-      this.rootUrl + `/inventory/return/suggestion/${encodeURIComponent(String(params.suggestionId))}`,
+      this.rootUrl + `/inventory/return/suggestion/${encodeURIComponent(params.suggestionId)}`,
       __body,
       {
         headers: __headers,
@@ -1265,7 +1265,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'GET',
-      this.rootUrl + `/inventory/stock/${encodeURIComponent(String(params.stockId))}/return/uncompleted`,
+      this.rootUrl + `/inventory/stock/${encodeURIComponent(params.stockId)}/return/uncompleted`,
       __body,
       {
         headers: __headers,
@@ -1311,7 +1311,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'POST',
-      this.rootUrl + `/inventory/stock/${encodeURIComponent(String(params.stockId))}/return`,
+      this.rootUrl + `/inventory/stock/${encodeURIComponent(params.stockId)}/return`,
       __body,
       {
         headers: __headers,
@@ -1362,7 +1362,7 @@ class ReturnService extends __BaseService {
     if (params.eagerLoading != null) __params = __params.set('eagerLoading', params.eagerLoading.toString());
     let req = new HttpRequest<any>(
       'GET',
-      this.rootUrl + `/inventory/return/${encodeURIComponent(String(params.returnId))}/receipt/${encodeURIComponent(String(params.receiptId))}`,
+      this.rootUrl + `/inventory/return/${encodeURIComponent(params.returnId)}/receipt/${encodeURIComponent(params.receiptId)}`,
       __body,
       {
         headers: __headers,
@@ -1415,7 +1415,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'POST',
-      this.rootUrl + `/inventory/return/${encodeURIComponent(String(params.returnId))}/receipt/${encodeURIComponent(String(params.receiptId))}/item`,
+      this.rootUrl + `/inventory/return/${encodeURIComponent(params.returnId)}/receipt/${encodeURIComponent(params.receiptId)}/item`,
       __body,
       {
         headers: __headers,
@@ -1471,7 +1471,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'PUT',
-      this.rootUrl + `/inventory/return/${encodeURIComponent(String(params.returnId))}/receipt/${encodeURIComponent(String(params.receiptId))}/item/${encodeURIComponent(String(params.receiptItemId))}`,
+      this.rootUrl + `/inventory/return/${encodeURIComponent(params.returnId)}/receipt/${encodeURIComponent(params.receiptId)}/item/${encodeURIComponent(params.receiptItemId)}`,
       __body,
       {
         headers: __headers,
@@ -1529,7 +1529,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'PATCH',
-      this.rootUrl + `/inventory/return/${encodeURIComponent(String(params.returnId))}/receipt/${encodeURIComponent(String(params.receiptId))}/item/${encodeURIComponent(String(params.receiptItemId))}`,
+      this.rootUrl + `/inventory/return/${encodeURIComponent(params.returnId)}/receipt/${encodeURIComponent(params.receiptId)}/item/${encodeURIComponent(params.receiptItemId)}`,
       __body,
       {
         headers: __headers,
@@ -1584,7 +1584,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'DELETE',
-      this.rootUrl + `/inventory/return/${encodeURIComponent(String(params.returnId))}/receipt/${encodeURIComponent(String(params.receiptId))}/item/${encodeURIComponent(String(params.receiptItemId))}`,
+      this.rootUrl + `/inventory/return/${encodeURIComponent(params.returnId)}/receipt/${encodeURIComponent(params.receiptId)}/item/${encodeURIComponent(params.receiptItemId)}`,
       __body,
       {
         headers: __headers,
@@ -1634,7 +1634,7 @@ class ReturnService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'GET',
-      this.rootUrl + `/inventory/stock/${encodeURIComponent(String(params.stockId))}/receipt/${encodeURIComponent(String(params.receiptType))}/uncompleted`,
+      this.rootUrl + `/inventory/stock/${encodeURIComponent(params.stockId)}/receipt/${encodeURIComponent(params.receiptType)}/uncompleted`,
       __body,
       {
         headers: __headers,

apps/swagger/remi/src/lib/services/stock.service.ts

@@ -10,6 +10,9 @@ import { map as __map, filter as __filter } from 'rxjs/operators';
 import { ResponseArgsOfIEnumerableOfStockInfoDTO } from '../models/response-args-of-ienumerable-of-stock-info-dto';
 import { StockRequestValues } from '../models/stock-request-values';
 import { ResponseArgsOfIEnumerableOfReturnInfoDTO } from '../models/response-args-of-ienumerable-of-return-info-dto';
+import { ResponseArgsOfDBHBranchExtensionDTO } from '../models/response-args-of-dbhbranch-extension-dto';
+import { ResponseArgsOfBranchDTO } from '../models/response-args-of-branch-dto';
+import { ResponseArgsOfStockDTO } from '../models/response-args-of-stock-dto';
 import { ResponseArgsOfIEnumerableOfStockDTO } from '../models/response-args-of-ienumerable-of-stock-dto';
 import { ResponseArgsOfIEnumerableOfSupplierDTO } from '../models/response-args-of-ienumerable-of-supplier-dto';
 import { ResponseArgsOfIEnumerableOfStockEntryDTO } from '../models/response-args-of-ienumerable-of-stock-entry-dto';
@@ -22,8 +25,11 @@ import { ResponseArgsOfIEnumerableOfStockReservationDTO } from '../models/respon
 class StockService extends __BaseService {
   static readonly StockInStockPath = '/remi/stock/{stockId}/instock';
   static readonly StockStockRequestPath = '/remi/stock/instock';
-  static readonly StockCheckItemsForReturnPath = '/remi/stock/{stockId}/checkitemsforreturn';
+  static readonly StockCheckItemsForReturnPath = '/remi/branch/{branchNumber}/checkitemsforreturn';
   static readonly StockInStockByEANPath = '/remi/stock/{stockId}/instockbyean';
+  static readonly StockGetCurrentBranchExtensionPath = '/remi/stock/current/branchExtension';
+  static readonly StockCurrentBranchPath = '/inventory/stock/current/branch';
+  static readonly StockCurrentStockPath = '/inventory/stock/current';
   static readonly StockGetStocksByBranchPath = '/inventory/branch/{branchId}/stock';
   static readonly StockGetStocksPath = '/inventory/stock';
   static readonly StockGetSuppliersPath = '/inventory/supplier';
@@ -58,7 +64,7 @@ class StockService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'POST',
-      this.rootUrl + `/remi/stock/${encodeURIComponent(String(params.stockId))}/instock`,
+      this.rootUrl + `/remi/stock/${encodeURIComponent(params.stockId)}/instock`,
       __body,
       {
         headers: __headers,
@@ -138,22 +144,22 @@ class StockService extends __BaseService {
    * Lagerbestandsabfrage
    * @param params The `StockService.StockCheckItemsForReturnParams` containing the following parameters:
    *
-   * - `stockId`: Lager PK
-   *
    * - `eans`: EANs
    *
+   * - `branchNumber`: Filial-Nr
+   *
    * - `locale`: Lokalisierung (optional)
    */
   StockCheckItemsForReturnResponse(params: StockService.StockCheckItemsForReturnParams): __Observable<__StrictHttpResponse<ResponseArgsOfIEnumerableOfReturnInfoDTO>> {
     let __params = this.newParams();
     let __headers = new HttpHeaders();
     let __body: any = null;
-
     __body = params.eans;
+
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'POST',
-      this.rootUrl + `/remi/stock/${encodeURIComponent(String(params.stockId))}/checkitemsforreturn`,
+      this.rootUrl + `/remi/branch/${encodeURIComponent(params.branchNumber)}/checkitemsforreturn`,
       __body,
       {
         headers: __headers,
@@ -172,10 +178,10 @@ class StockService extends __BaseService {
    * Lagerbestandsabfrage
    * @param params The `StockService.StockCheckItemsForReturnParams` containing the following parameters:
    *
-   * - `stockId`: Lager PK
-   *
    * - `eans`: EANs
    *
+   * - `branchNumber`: Filial-Nr
+   *
    * - `locale`: Lokalisierung (optional)
    */
   StockCheckItemsForReturn(params: StockService.StockCheckItemsForReturnParams): __Observable<ResponseArgsOfIEnumerableOfReturnInfoDTO> {
@@ -203,7 +209,7 @@ class StockService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'POST',
-      this.rootUrl + `/remi/stock/${encodeURIComponent(String(params.stockId))}/instockbyean`,
+      this.rootUrl + `/remi/stock/${encodeURIComponent(params.stockId)}/instockbyean`,
       __body,
       {
         headers: __headers,
@@ -234,6 +240,114 @@ class StockService extends __BaseService {
     );
   }
 
+  /**
+   * BranchExtension
+   * @param locale Lokalisierung
+   */
+  StockGetCurrentBranchExtensionResponse(locale?: null | string): __Observable<__StrictHttpResponse<ResponseArgsOfDBHBranchExtensionDTO>> {
+    let __params = this.newParams();
+    let __headers = new HttpHeaders();
+    let __body: any = null;
+    if (locale != null) __params = __params.set('locale', locale.toString());
+    let req = new HttpRequest<any>(
+      'GET',
+      this.rootUrl + `/remi/stock/current/branchExtension`,
+      __body,
+      {
+        headers: __headers,
+        params: __params,
+        responseType: 'json'
+      });
+
+    return this.http.request<any>(req).pipe(
+      __filter(_r => _r instanceof HttpResponse),
+      __map((_r) => {
+        return _r as __StrictHttpResponse<ResponseArgsOfDBHBranchExtensionDTO>;
+      })
+    );
+  }
+  /**
+   * BranchExtension
+   * @param locale Lokalisierung
+   */
+  StockGetCurrentBranchExtension(locale?: null | string): __Observable<ResponseArgsOfDBHBranchExtensionDTO> {
+    return this.StockGetCurrentBranchExtensionResponse(locale).pipe(
+      __map(_r => _r.body as ResponseArgsOfDBHBranchExtensionDTO)
+    );
+  }
+
+  /**
+   * Dem aktuellen Lager zugeortnete Filiale
+   * @param locale Lokalisierung
+   */
+  StockCurrentBranchResponse(locale?: null | string): __Observable<__StrictHttpResponse<ResponseArgsOfBranchDTO>> {
+    let __params = this.newParams();
+    let __headers = new HttpHeaders();
+    let __body: any = null;
+    if (locale != null) __params = __params.set('locale', locale.toString());
+    let req = new HttpRequest<any>(
+      'GET',
+      this.rootUrl + `/inventory/stock/current/branch`,
+      __body,
+      {
+        headers: __headers,
+        params: __params,
+        responseType: 'json'
+      });
+
+    return this.http.request<any>(req).pipe(
+      __filter(_r => _r instanceof HttpResponse),
+      __map((_r) => {
+        return _r as __StrictHttpResponse<ResponseArgsOfBranchDTO>;
+      })
+    );
+  }
+  /**
+   * Dem aktuellen Lager zugeortnete Filiale
+   * @param locale Lokalisierung
+   */
+  StockCurrentBranch(locale?: null | string): __Observable<ResponseArgsOfBranchDTO> {
+    return this.StockCurrentBranchResponse(locale).pipe(
+      __map(_r => _r.body as ResponseArgsOfBranchDTO)
+    );
+  }
+
+  /**
+   * Zugeordnetes Lager
+   * @param locale Lokalisierung
+   */
+  StockCurrentStockResponse(locale?: null | string): __Observable<__StrictHttpResponse<ResponseArgsOfStockDTO>> {
+    let __params = this.newParams();
+    let __headers = new HttpHeaders();
+    let __body: any = null;
+    if (locale != null) __params = __params.set('locale', locale.toString());
+    let req = new HttpRequest<any>(
+      'GET',
+      this.rootUrl + `/inventory/stock/current`,
+      __body,
+      {
+        headers: __headers,
+        params: __params,
+        responseType: 'json'
+      });
+
+    return this.http.request<any>(req).pipe(
+      __filter(_r => _r instanceof HttpResponse),
+      __map((_r) => {
+        return _r as __StrictHttpResponse<ResponseArgsOfStockDTO>;
+      })
+    );
+  }
+  /**
+   * Zugeordnetes Lager
+   * @param locale Lokalisierung
+   */
+  StockCurrentStock(locale?: null | string): __Observable<ResponseArgsOfStockDTO> {
+    return this.StockCurrentStockResponse(locale).pipe(
+      __map(_r => _r.body as ResponseArgsOfStockDTO)
+    );
+  }
+
   /**
    * @param params The `StockService.StockGetStocksByBranchParams` containing the following parameters:
    *
@@ -249,7 +363,7 @@ class StockService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'GET',
-      this.rootUrl + `/inventory/branch/${encodeURIComponent(String(params.branchId))}/stock`,
+      this.rootUrl + `/inventory/branch/${encodeURIComponent(params.branchId)}/stock`,
       __body,
       {
         headers: __headers,
@@ -337,7 +451,7 @@ class StockService extends __BaseService {
 
     let req = new HttpRequest<any>(
       'GET',
-      this.rootUrl + `/inventory/stock/stockitem/${encodeURIComponent(String(stockItemId))}`,
+      this.rootUrl + `/inventory/stock/stockitem/${encodeURIComponent(stockItemId)}`,
       __body,
       {
         headers: __headers,
@@ -410,7 +524,7 @@ class StockService extends __BaseService {
     if (params.itemId != null) __params = __params.set('itemId', params.itemId.toString());
     let req = new HttpRequest<any>(
       'GET',
-      this.rootUrl + `/inventory/stock/${encodeURIComponent(String(params.stockId))}/order`,
+      this.rootUrl + `/inventory/stock/${encodeURIComponent(params.stockId)}/order`,
       __body,
       {
         headers: __headers,
@@ -453,7 +567,7 @@ class StockService extends __BaseService {
     if (params.itemId != null) __params = __params.set('itemId', params.itemId.toString());
     let req = new HttpRequest<any>(
       'GET',
-      this.rootUrl + `/inventory/stock/${encodeURIComponent(String(params.stockId))}/reservation`,
+      this.rootUrl + `/inventory/stock/${encodeURIComponent(params.stockId)}/reservation`,
       __body,
       {
         headers: __headers,
@@ -526,16 +640,16 @@ module StockService {
    */
   export interface StockCheckItemsForReturnParams {
 
-    /**
-     * Lager PK
-     */
-    stockId: number;
-
     /**
      * EANs
      */
     eans: Array<string>;
 
+    /**
+     * Filial-Nr
+     */
+    branchNumber: null | string;
+
     /**
      * Lokalisierung (optional)
      */

apps/swagger/remi/src/lib/services/supplier.service.ts

@@ -42,7 +42,7 @@ class SupplierService extends __BaseService {
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'GET',
-      this.rootUrl + `/inventory/stock/${encodeURIComponent(String(params.stockId))}/supplier`,
+      this.rootUrl + `/inventory/stock/${encodeURIComponent(params.stockId)}/supplier`,
       __body,
       {
         headers: __headers,