Merged PR 1475: Packstück Kontrolle

.vscode/launch.json

@@ -1,22 +1,15 @@
 {
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.11.0",
-  "configurations": [
-    {
-      "type": "chrome",
-      "request": "launch",
-      "name": "Launch Chrome",
-      "url": "https://192.168.2.112:4200",
-      "webRoot": "${workspaceFolder}",
-      "sourceMaps": true,
-      "sourceMapPathOverrides": {
-        "/./*": "${webRoot}/*",
-        "/src/*": "${webRoot}/*",
-        "/*": "*",
-        "/./~/*": "${webRoot}/node_modules/*"
-      }
-    }
-  ]
-}
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "ISA-App Chrome",
+            "url": "https://localhost:4200",
+            "webRoot": "${workspaceFolder}",
+        }
+    ]
+}

apps/domain/package-inspection/src/lib/package-inspection.service.ts

@@ -1,9 +1,11 @@
 import { Injectable } from '@angular/core';
 import {
   ListResponseArgsOfPackageDTO,
+  ListResponseArgsOfPackageDTO2,
   PackageArrivalStatusDTO,
   PackageDetailResponseDTO,
   PackageDTO,
+  PackageDTO2,
   QuerySettingsDTO,
   QueryTokenDTO,
   ResponseArgsOfPackageArrivalStatusDTO,
@@ -28,11 +30,11 @@ export class DomainPackageInspectionService {
     return this.getQuerySettingsResponse().pipe(map((response) => response.result));
   }
 
-  queryPackagesResponse(queryToken: QueryTokenDTO): Observable<ListResponseArgsOfPackageDTO> {
+  queryPackagesResponse(queryToken: QueryTokenDTO): Observable<ListResponseArgsOfPackageDTO2> {
     return this._wareneingang.WareneingangQueryPackages(queryToken);
   }
 
-  queryPackages(queryToken: QueryTokenDTO): Observable<PackageDTO[]> {
+  queryPackages(queryToken: QueryTokenDTO): Observable<PackageDTO2[]> {
     return this.queryPackagesResponse(queryToken).pipe(map((response) => response.result));
   }
 
@@ -44,7 +46,7 @@ export class DomainPackageInspectionService {
     return this.getPackageDetailsResponse(id).pipe(map((response) => response.result));
   }
 
-  changePackageStatusResponse(pkg: PackageDTO, modifier: string): Observable<ResponseArgsOfPackageArrivalStatusDTO> {
+  changePackageStatusResponse(pkg: PackageDTO2, modifier: string): Observable<ResponseArgsOfPackageArrivalStatusDTO> {
     return this._wareneingang.WareneingangChangePackageStatus({
       packageId: pkg.id,
       payload: {
@@ -64,7 +66,11 @@ export class DomainPackageInspectionService {
     });
   }
 
-  changePackageStatus(pkg: PackageDTO, modifier: string): Observable<PackageArrivalStatusDTO> {
+  changePackageStatus(pkg: PackageDTO2, modifier: string): Observable<PackageArrivalStatusDTO> {
     return this.changePackageStatusResponse(pkg, modifier).pipe(map((response) => response.result));
   }
+
+  test() {
+    return this._wareneingang.WareneingangChangePackageStatus;
+  }
 }

apps/isa-app/src/app/shell/shell.component.html

@@ -65,8 +65,8 @@
         <ui-icon icon="documents_refresh" size="24px"></ui-icon>
         Remission
       </a>
-      <a [routerLink]="['/filiale/package-inspection']" routerLinkActive="active">
-        <ui-icon icon="box_return" size="24px"></ui-icon>
+      <a [routerLink]="['/filiale/package-inspection']" routerLinkActive="active" (click)="fetchAndOpenPackages()">
+        <ui-svg-icon icon="clipboard-check-outline" [size]="24"></ui-svg-icon>
         Wareneingang
       </a>
     </ng-container>

apps/isa-app/src/app/shell/shell.component.spec.ts

@@ -23,6 +23,7 @@ import { MockComponent } from 'ng-mocks';
 import { of } from 'rxjs';
 import { first } from 'rxjs/operators';
 import { ShellComponent } from './shell.component';
+import { WrongDestinationModalService } from 'apps/page/package-inspection/src/lib/components/wrong-destination-modal/wrong-destination-modal.service';
 
 // DummyComponent Class
 @Component({
@@ -57,7 +58,7 @@ describe('ShellComponent', () => {
       MockComponent(ShellProcessTabComponent),
       MockComponent(UiIconComponent),
     ],
-    mocks: [BreadcrumbService, DomainAvailabilityService, AuthService, DomainDashboardService, Config],
+    mocks: [BreadcrumbService, DomainAvailabilityService, AuthService, DomainDashboardService, Config, WrongDestinationModalService],
   });
 
   beforeEach(() => {

apps/isa-app/src/app/shell/shell.component.ts

@@ -11,6 +11,7 @@ import { AuthService } from '@core/auth';
 import { DomainAvailabilityService } from '@domain/availability';
 import { ShellProcessTabComponent } from '@shell/process';
 import { Config } from '@core/config';
+import { WrongDestinationModalService } from 'apps/page/package-inspection/src/lib/components/wrong-destination-modal/wrong-destination-modal.service';
 
 @Component({
   selector: 'app-shell',
@@ -94,7 +95,8 @@ export class ShellComponent {
     private readonly _breadcrumbService: BreadcrumbService,
     private readonly _authService: AuthService,
     private readonly _availabilityService: DomainAvailabilityService,
-    private readonly _zone: NgZone
+    private readonly _zone: NgZone,
+    private readonly _wrongDestinationModalService: WrongDestinationModalService
   ) {}
 
   async setSection(section: 'customer' | 'branch') {
@@ -163,4 +165,6 @@ export class ShellComponent {
   }
 
   trackByIdFn: TrackByFunction<ApplicationProcess> = (_, process) => process.id;
+
+  fetchAndOpenPackages = () => this._wrongDestinationModalService.fetchAndOpen();
 }

apps/page/package-inspection/src/lib/components/package-details-list/package-details-list-item.component.html

@@ -3,12 +3,12 @@
 </div>
 
 <div class="flex flex-col grow">
-  <div class="flex flex-row h-14">
+  <div class="flex flex-row h-[84px]">
     <div class="grow">
-      <h4 class="package-details-list-item__contributors truncate">{{ item?.product?.contributors }}</h4>
-      <h3 class="package-details-list-item__name truncate">{{ item?.product?.name }}</h3>
+      <h4 class="package-details-list-item__contributors">{{ item?.product?.contributors }}</h4>
+      <h3 class="package-details-list-item__name">{{ item?.product?.name }}</h3>
     </div>
-    <div class="package-details-list-item__shelf-info text-right">{{ compartment }}</div>
+    <div class="package-details-list-item__shelf-info text-right shrink-0">{{ compartment }}</div>
   </div>
   <div class="package-details-list-item__product-details">
     <div class="package-details-list-item__product-details-1">

apps/page/package-inspection/src/lib/components/package-details-list/package-details-list-item.component.scss

@@ -1,5 +1,5 @@
 :host {
-  @apply flex flex-row h-44 bg-white rounded px-4 py-3;
+  @apply flex flex-row h-52 bg-white rounded px-4 py-3;
 }
 
 :host > * ~ * {
@@ -41,7 +41,7 @@
 }
 
 .package-details-list-item__name {
-  @apply font-bold leading-7;
+  @apply font-bold leading-7 h-14;
 }
 
 .package-details-list-item__format {

apps/page/package-inspection/src/lib/components/package-list/package-list-item.component.ts

@@ -1,5 +1,5 @@
 import { Component, ChangeDetectionStrategy, Input } from '@angular/core';
-import { PackageDTO } from '@swagger/wws';
+import { PackageDTO2 } from '@swagger/wws';
 
 @Component({
   selector: 'page-package-list-item',
@@ -9,7 +9,7 @@ import { PackageDTO } from '@swagger/wws';
 })
 export class PackageListItemComponent {
   @Input()
-  package: PackageDTO;
+  package: PackageDTO2;
 
   constructor() {}
 }

apps/page/package-inspection/src/lib/components/package-list/package-list.component.html

@@ -1,4 +1,4 @@
-<div class="bg-background-liste">
+<div class="bg-background-liste" *ngIf="showHeader">
   <div class="flex flex-row items-center justify-end h-14">
     <div class="package-count inline-flex flex-row items-center pr-5">{{ packages?.length ?? 0 }} Packstücke</div>
   </div>

apps/page/package-inspection/src/lib/components/package-list/package-list.component.ts

@@ -1,20 +1,26 @@
 import { Component, ChangeDetectionStrategy, Input } from '@angular/core';
-import { PackageDTO } from '@swagger/wws';
+import { PackageDTO2 } from '@swagger/wws';
 
 @Component({
   selector: 'page-package-list',
   templateUrl: 'package-list.component.html',
   styleUrls: ['package-list.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  host: {
+    class: 'page-package-list',
+  },
 })
 export class PackageListComponent {
   @Input()
-  packages: PackageDTO[] = [];
+  packages: PackageDTO2[] = [];
 
   @Input()
   fetching: boolean = false;
 
+  @Input()
+  showHeader: boolean = true;
+
   constructor() {}
 
-  trackByFn = (index: number, item: PackageDTO) => item.id;
+  trackByFn = (index: number, item: PackageDTO2) => item.id;
 }

apps/page/package-inspection/src/lib/components/wrong-destination-modal/wrong-destination-modal.component.css

@@ -0,0 +1,3 @@
+.page-package-list {
+  @apply bg-customer -mx-4 mt-10 border-t border-b-2 border-solid border-customer;
+}

apps/page/package-inspection/src/lib/components/wrong-destination-modal/wrong-destination-modal.component.html

@@ -0,0 +1,10 @@
+<h2 class="text-center font-bold text-xl mt-10">Sie haben {{ packageCount }} Irrläufer</h2>
+<p class="text-center text-xl mt-4">
+  Stellen Sie diese Packstücke für die anderen Filialen bereit. <br />
+  Der Spediteur holt Sie zum nächstmöglichsten Zeitpunkt ab.
+</p>
+<page-package-list [packages]="packages" [showHeader]="false"></page-package-list>
+<div class="text-center my-7">
+  <button class="isa-cta-button" (click)="close()">Später</button>
+  <button class="isa-cta-button isa-button-primary ml-6" (click)="done()">Erledigt</button>
+</div>

apps/page/package-inspection/src/lib/components/wrong-destination-modal/wrong-destination-modal.component.ts

@@ -0,0 +1,55 @@
+import { Component, ChangeDetectionStrategy } from '@angular/core';
+import { DomainPackageInspectionService } from '@domain/package-inspection';
+import { PackageArrivalStatusDTO, PackageDTO2 } from '@swagger/wws';
+import { UiModalRef } from '@ui/modal';
+import { PackageListModule } from '../package-list';
+import { WrongDestinationModalData } from './wrong-destination-modal.data';
+
+@Component({
+  selector: 'page-package-inspection-wrong-destination-modal',
+  templateUrl: 'wrong-destination-modal.component.html',
+  styleUrls: ['wrong-destination-modal.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [PackageListModule],
+})
+export class WrongDestinationModalComponent {
+  get packages(): PackageDTO2[] {
+    const packages = this._ref.data?.packages ?? [];
+
+    // return top 5 packages
+    return packages.slice(0, 5);
+  }
+
+  get packageCount(): number {
+    return this.packages.length;
+  }
+
+  constructor(
+    private _ref: UiModalRef<void, WrongDestinationModalData>,
+    private _packageInspectionService: DomainPackageInspectionService
+  ) {}
+
+  close(): void {
+    this._ref.close();
+  }
+
+  async done(): Promise<void> {
+    let promises: Promise<PackageArrivalStatusDTO>[] = [];
+    for (const pkg of this.packages) {
+      promises.push(this._packageInspectionService.changePackageStatus(pkg, '0').toPromise());
+    }
+
+    await Promise.all(promises);
+    this.close();
+  }
+
+  changeStatus(status: string): Promise<PackageArrivalStatusDTO[]> {
+    let promises: Promise<PackageArrivalStatusDTO>[] = [];
+    for (const pkg of this.packages) {
+      promises.push(this._packageInspectionService.changePackageStatus(pkg, status).toPromise());
+    }
+
+    return Promise.all(promises);
+  }
+}

apps/page/package-inspection/src/lib/components/wrong-destination-modal/wrong-destination-modal.data.ts

@@ -0,0 +1,5 @@
+import { PackageDTO2 } from '@swagger/wws';
+
+export interface WrongDestinationModalData {
+  packages: PackageDTO2[];
+}

apps/page/package-inspection/src/lib/components/wrong-destination-modal/wrong-destination-modal.service.ts

@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { DomainPackageInspectionService } from '@domain/package-inspection';
+import { PackageDTO2 } from '@swagger/wws';
+import { UiModalRef, UiModalService } from '@ui/modal';
+import { Observable } from 'rxjs';
+import { WrongDestinationModalComponent } from './wrong-destination-modal.component';
+import { WrongDestinationModalData } from './wrong-destination-modal.data';
+
+@Injectable({ providedIn: 'root' })
+export class WrongDestinationModalService {
+  constructor(private _packageInspectionService: DomainPackageInspectionService, private _modal: UiModalService) {}
+
+  fetchPackages(): Observable<PackageDTO2[]> {
+    return this._packageInspectionService.queryPackages({
+      filter: { status: '8' },
+    });
+  }
+
+  open(data: WrongDestinationModalData): UiModalRef<void, WrongDestinationModalData> {
+    return this._modal.open({
+      content: WrongDestinationModalComponent,
+      data,
+    });
+  }
+
+  async fetchAndOpen(): Promise<UiModalRef<void, WrongDestinationModalData> | undefined> {
+    const packages = await this.fetchPackages().toPromise();
+
+    if (!packages || packages.length === 0) {
+      return undefined;
+    }
+
+    return this.open({ packages });
+  }
+}

apps/page/package-inspection/src/lib/package-details/package-details.component.ts

@@ -51,7 +51,7 @@ export class PackageDetailsComponent {
       return;
     }
 
-    this.changePackageStatus(action.command);
+    this.changePackageStatus(action.value);
   }
 
   async onNextAction(action: NestedKeyValueDTOOfStringAndString) {
@@ -61,7 +61,7 @@ export class PackageDetailsComponent {
   async changePackageStatus(status: string): Promise<void> {
     try {
       const packageDetails = await this.packageDetails$.pipe(first()).toPromise();
-      const response = await this._packageInspectionService.changePackageStatus(packageDetails.package, 'NEXT').toPromise();
+      const response = await this._packageInspectionService.changePackageStatus(packageDetails.package, status).toPromise();
       console.log(response);
     } catch (error) {
       console.error(error);

apps/page/package-inspection/src/lib/package-inspection.component.spec.ts

@@ -2,7 +2,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { BreadcrumbService } from '@core/breadcrumb';
 import { Config } from '@core/config';
 import { Spectator, createComponentFactory } from '@ngneat/spectator';
-import { BreadcrumbComponent } from '@shared/breadcrumb';
+import { BreadcrumbComponent } from '@shared/components/breadcrumb';
 import { MockComponent } from 'ng-mocks';
 
 import { PackageInspectionComponent } from './package-inspection.component';

apps/page/package-inspection/src/lib/package-result/package-result.component.spec.ts

@@ -1,6 +1,6 @@
 import { DomainPackageInspectionService } from '@domain/package-inspection';
 import { createComponentFactory, Spectator } from '@ngneat/spectator';
-import { PackageDTO } from '@swagger/wws';
+import { PackageDTO2 } from '@swagger/wws';
 import { UISvgIconComponent } from '@ui/icon';
 import { MockComponent } from 'ng-mocks';
 import { PackageListComponent } from '../components/package-list';
@@ -27,7 +27,7 @@ xdescribe('PackageResultComponent', () => {
   });
 
   it('should set the input package of the PackageListComponent', () => {
-    const packages: PackageDTO[] = [{ id: '1' }, { id: '2' }];
+    const packages: PackageDTO2[] = [{ id: '1' }, { id: '2' }];
     spectator.component.store.setPackages(packages);
 
     spectator.detectChanges();

apps/page/package-inspection/src/lib/package-result/package-result.component.state.ts

@@ -1,4 +1,4 @@
-import { PackageDTO } from '@swagger/wws';
+import { PackageDTO2 } from '@swagger/wws';
 import { UiFilter } from '@ui/filter';
 
 export interface PackageResultComponentState {
@@ -7,7 +7,7 @@ export interface PackageResultComponentState {
   filter: UiFilter | undefined;
   pendingFilter: UiFilter | undefined;
   defaultFilter: UiFilter | undefined;
-  packages: PackageDTO[];
+  packages: PackageDTO2[];
 }
 
 export const INITIAL_RESULT_COMPONENT_STATE: PackageResultComponentState = {

apps/page/package-inspection/src/lib/package-result/package-result.component.store.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { DomainPackageInspectionService } from '@domain/package-inspection';
 import { ComponentStore, OnStoreInit, tapResponse } from '@ngrx/component-store';
-import { ListResponseArgsOfPackageDTO, PackageDTO, QuerySettingsDTO } from '@swagger/wws';
+import { ListResponseArgsOfPackageDTO2, PackageDTO2, QuerySettingsDTO } from '@swagger/wws';
 import { UiFilter } from '@ui/filter';
 import { UiModalService } from '@ui/modal';
 import { combineLatest, Subject } from 'rxjs';
@@ -26,7 +26,7 @@ export class PackageResultComponentStore extends ComponentStore<PackageResultCom
 
   packages$ = this.select((state) => state.packages);
 
-  private _onFetchPackagesResponse$ = new Subject<ListResponseArgsOfPackageDTO>();
+  private _onFetchPackagesResponse$ = new Subject<ListResponseArgsOfPackageDTO2>();
 
   onFetchPackagesResponse$ = this._onFetchPackagesResponse$.asObservable();
 
@@ -48,7 +48,7 @@ export class PackageResultComponentStore extends ComponentStore<PackageResultCom
 
   setDefaultFilter = this.updater((state, defaultFilter: UiFilter) => ({ ...state, defaultFilter }));
 
-  setPackages = this.updater((state, packages: PackageDTO[]) => ({ ...state, packages }));
+  setPackages = this.updater((state, packages: PackageDTO2[]) => ({ ...state, packages }));
 
   fetchSettings = this.effect(($) =>
     $.pipe(
@@ -81,7 +81,7 @@ export class PackageResultComponentStore extends ComponentStore<PackageResultCom
     this.setFilter(UiFilter.create(filter));
   };
 
-  onFetchPackagesResponse = (response: ListResponseArgsOfPackageDTO) => {
+  onFetchPackagesResponse = (response: ListResponseArgsOfPackageDTO2) => {
     this.setFetching(false);
     this.setPackages(response.result);
     this._onFetchPackagesResponse$.next(response);

apps/page/package-inspection/src/lib/package-result/package-result.component.ts

@@ -4,10 +4,11 @@ import { Breadcrumb, BreadcrumbService } from '@core/breadcrumb';
 import { Config } from '@core/config';
 import { provideComponentStore } from '@ngrx/component-store';
 import { ShellFilterOverlayComponent } from '@shell/filter-overlay';
-import { ListResponseArgsOfPackageDTO } from '@swagger/wws';
+import { ListResponseArgsOfPackageDTO2 } from '@swagger/wws';
 import { UiFilter, UiFilterComponent } from '@ui/filter';
-import { combineLatest, Observable, Subject, Subscription } from 'rxjs';
-import { filter, first, map, switchMap } from 'rxjs/operators';
+import moment from 'moment';
+import { combineLatest, Subject, Subscription } from 'rxjs';
+import { filter, first, map } from 'rxjs/operators';
 import { PackageResultComponentStore } from './package-result.component.store';
 
 @Component({
@@ -53,7 +54,7 @@ export class PackageResultComponent implements OnInit, OnDestroy {
 
     this.initFetchResponseSubscription();
 
-    this.removeBreadcrumbsBreadcrumb();
+    this.removeBreadcrumbs();
   }
 
   initFilterSubscription() {
@@ -98,10 +99,10 @@ export class PackageResultComponent implements OnInit, OnDestroy {
     this.hint$.next('');
     this.store.fetchPackages();
     this.patchLocation(filter);
-    this.createBreadcrumbIfNotExists(filter);
   }
 
-  onFetchPackagesResponse = (response: ListResponseArgsOfPackageDTO) => {
+  onFetchPackagesResponse = (response: ListResponseArgsOfPackageDTO2) => {
+    this.createBreadcrumbIfNotExists(this.store.filter);
     if (response.error) {
       console.error(response);
       return;
@@ -140,6 +141,23 @@ export class PackageResultComponent implements OnInit, OnDestroy {
       return name.join(' - ');
     }
 
+    const filterZeitraum = params['filter_zeitraum'];
+
+    if (filterZeitraum) {
+      const range = filterZeitraum.split('"-"').map((s) => s.replace('"', ''));
+      if (range[0] && range[1]) {
+        const start = moment(range[0]).format('DD.MM.YYYY');
+        const end = moment(range[1]).format('DD.MM.YYYY');
+        return `${start} - ${end}`;
+      } else if (filterZeitraum.endsWith('"-')) {
+        const dateString = filterZeitraum.replace('"-', '').replace('"', '');
+        return `Ab ${moment(dateString).format('DD.MM.YYYY')}`;
+      } else if (filterZeitraum.startsWith('-"')) {
+        const dateString = filterZeitraum.replace('-"', '').replace('"', '');
+        return `Bis ${moment(dateString).format('DD.MM.YYYY')}`;
+      }
+    }
+
     return 'Paket-Übersicht';
   }
 
@@ -156,7 +174,7 @@ export class PackageResultComponent implements OnInit, OnDestroy {
     await this._breadcrumb.addOrUpdateBreadcrumbIfNotExists(crumb);
   }
 
-  async removeBreadcrumbsBreadcrumb(): Promise<void> {
+  async removeBreadcrumbs(): Promise<void> {
     const detailsCrumbs = await this._breadcrumb.getBreadcrumbsByKeyAndTag$(this.breadcrumbKey, 'details').pipe(first()).toPromise();
     const filterCrumbs = await this._breadcrumb.getBreadcrumbsByKeyAndTag$(this.breadcrumbKey, 'filter').pipe(first()).toPromise();
     const crumbs = [...detailsCrumbs, ...filterCrumbs];

apps/shared/components/breadcrumb/src/lib/breadcrumb.component.html

@@ -1,4 +1,10 @@
-<button type="button" class="shared-breadcrumb__button-back" *ngIf="previousBreadcrumb$ | async; else placeholder">
+<button
+  type="button"
+  class="shared-breadcrumb__button-back"
+  *ngIf="previousBreadcrumb$ | async; else placeholder; let crumb"
+  [routerLink]="crumb.path"
+  [queryParams]="crumb.params"
+>
   <ui-svg-icon icon="arrow-left" [size]="18"></ui-svg-icon> Zurück
 </button>
 

apps/shared/components/breadcrumb/src/lib/breadcrumb.component.ts

@@ -3,7 +3,7 @@ import { Breadcrumb, BreadcrumbService } from '@core/breadcrumb';
 import { ComponentStore } from '@ngrx/component-store';
 import { isEqual } from 'lodash';
 import { combineLatest, Observable } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
+import { map, switchMap, tap } from 'rxjs/operators';
 import { BreadcrumbComponentState, DEFAULT_BREADCRUMB_COMPONENT_STATE } from './breadcrumb.component-state';
 
 @Component({

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

@@ -1,3 +1,38 @@
+export { ListResponseArgsOfPackageDTO } from './models/list-response-args-of-package-dto';
+export { ResponseArgsOfIEnumerableOfPackageDTO } from './models/response-args-of-ienumerable-of-package-dto';
+export { PackageDTO } from './models/package-dto';
+export { EntityDTOContainerOfUserDTO } from './models/entity-dtocontainer-of-user-dto';
+export { UserDTO } from './models/user-dto';
+export { Gender } from './models/gender';
+export { EntityDTOBaseOfUserDTOAndIUser } from './models/entity-dtobase-of-user-dtoand-iuser';
+export { EntityDTOBase } from './models/entity-dtobase';
+export { EntityDTO } from './models/entity-dto';
+export { EntityStatus } from './models/entity-status';
+export { TouchedBase } from './models/touched-base';
+export { EntityDTOReferenceContainer } from './models/entity-dtoreference-container';
+export { ExternalReferenceDTO } from './models/external-reference-dto';
+export { EntityDTOContainerOfLabelDTO } from './models/entity-dtocontainer-of-label-dto';
+export { LabelDTO } from './models/label-dto';
+export { EntityDTOBaseOfLabelDTOAndILabel } from './models/entity-dtobase-of-label-dtoand-ilabel';
+export { WeightOfAvoirdupois } from './models/weight-of-avoirdupois';
+export { Avoirdupois } from './models/avoirdupois';
+export { AddresseeDTO } from './models/addressee-dto';
+export { OrganisationDTO } from './models/organisation-dto';
+export { OrganisationNamesDTO } from './models/organisation-names-dto';
+export { PersonNamesDTO } from './models/person-names-dto';
+export { AddressDTO } from './models/address-dto';
+export { GeoLocation } from './models/geo-location';
+export { CommunicationDetailsDTO } from './models/communication-details-dto';
+export { EntityDTOBaseOfPackageDTOAndIPackage } from './models/entity-dtobase-of-package-dtoand-ipackage';
+export { ResponseArgs } from './models/response-args';
+export { DialogOfString } from './models/dialog-of-string';
+export { DialogSettings } from './models/dialog-settings';
+export { DialogContentType } from './models/dialog-content-type';
+export { KeyValueDTOOfStringAndString } from './models/key-value-dtoof-string-and-string';
+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 { ResponseArgsOfQuerySettingsDTO } from './models/response-args-of-query-settings-dto';
 export { QuerySettingsDTO } from './models/query-settings-dto';
 export { InputGroupDTO } from './models/input-group-dto';
@@ -6,29 +41,113 @@ export { InputType } from './models/input-type';
 export { InputOptionsDTO } from './models/input-options-dto';
 export { OptionDTO } from './models/option-dto';
 export { OrderByDTO } from './models/order-by-dto';
-export { ResponseArgs } from './models/response-args';
-export { DialogOfString } from './models/dialog-of-string';
-export { DialogSettings } from './models/dialog-settings';
-export { DialogContentType } from './models/dialog-content-type';
-export { KeyValueDTOOfStringAndString } from './models/key-value-dtoof-string-and-string';
-export { IPublicUserInfo } from './models/ipublic-user-info';
-export { ProblemDetails } from './models/problem-details';
-export { ListResponseArgsOfPackageDTO } from './models/list-response-args-of-package-dto';
-export { ResponseArgsOfIEnumerableOfPackageDTO } from './models/response-args-of-ienumerable-of-package-dto';
-export { PackageDTO } from './models/package-dto';
+export { ListResponseArgsOfProductListDTO } from './models/list-response-args-of-product-list-dto';
+export { ResponseArgsOfIEnumerableOfProductListDTO } from './models/response-args-of-ienumerable-of-product-list-dto';
+export { ProductListDTO } from './models/product-list-dto';
+export { EntityDTOContainerOfProductListDTO } from './models/entity-dtocontainer-of-product-list-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 { BranchType } from './models/branch-type';
+export { EntityDTOBaseOfBranchDTOAndIBranch } from './models/entity-dtobase-of-branch-dtoand-ibranch';
+export { EntityDTOBaseOfStockDTOAndIStock } from './models/entity-dtobase-of-stock-dtoand-istock';
+export { ProductListDTO2 } from './models/product-list-dto2';
+export { EntityDTOContainerOfProductListDTO2 } from './models/entity-dtocontainer-of-product-list-dto2';
+export { EntityDTOContainerOfCategoryDTO } from './models/entity-dtocontainer-of-category-dto';
+export { CategoryDTO } from './models/category-dto';
+export { EntityDTOContainerOfTenantDTO } from './models/entity-dtocontainer-of-tenant-dto';
+export { TenantDTO } from './models/tenant-dto';
+export { EntityDTOBaseOfTenantDTOAndITenant } from './models/entity-dtobase-of-tenant-dtoand-itenant';
+export { TaskDTO } from './models/task-dto';
+export { UserReference } from './models/user-reference';
+export { ImpedimentDTO } from './models/impediment-dto';
+export { QueryTokenDTO } from './models/query-token-dto';
+export { ListResponseArgsOfProductListItemDTO } from './models/list-response-args-of-product-list-item-dto';
+export { ResponseArgsOfIEnumerableOfProductListItemDTO } from './models/response-args-of-ienumerable-of-product-list-item-dto';
+export { ProductListItemDTO } from './models/product-list-item-dto';
+export { EntityDTOContainerOfProductListItemDTO } from './models/entity-dtocontainer-of-product-list-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';
+export { EntityDTOBaseOfStockCompartmentDTOAndIStockCompartment } from './models/entity-dtobase-of-stock-compartment-dtoand-istock-compartment';
+export { EntityDTOContainerOfStockItemDTO } from './models/entity-dtocontainer-of-stock-item-dto';
+export { StockItemDTO } from './models/stock-item-dto';
+export { EntityDTOContainerOfItemDTO } from './models/entity-dtocontainer-of-item-dto';
+export { ItemDTO } from './models/item-dto';
+export { ProductDTO } from './models/product-dto';
+export { QuantityUnitType } from './models/quantity-unit-type';
+export { EntityDTOBaseOfItemDTOAndIItem } from './models/entity-dtobase-of-item-dtoand-iitem';
+export { EntityDTOBaseOfStockItemDTOAndIStockItem } from './models/entity-dtobase-of-stock-item-dtoand-istock-item';
+export { ProductListItemDTO2 } from './models/product-list-item-dto2';
+export { EntityDTOContainerOfProductListItemDTO2 } from './models/entity-dtocontainer-of-product-list-item-dto2';
+export { ArticleDTO } from './models/article-dto';
+export { PriceDTO } from './models/price-dto';
+export { PriceValueDTO } from './models/price-value-dto';
+export { VATValueDTO } from './models/vatvalue-dto';
+export { VATType } from './models/vattype';
+export { QuantityValueDTO } from './models/quantity-value-dto';
+export { ResponseArgsOfIEnumerableOfStockInfoDTO } from './models/response-args-of-ienumerable-of-stock-info-dto';
+export { StockInfoDTO } from './models/stock-info-dto';
+export { StockStatus } from './models/stock-status';
+export { StocksRequestValues } from './models/stocks-request-values';
+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 { 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 { ResponseArgsOfIEnumerableOfStockEntryDTO } from './models/response-args-of-ienumerable-of-stock-entry-dto';
+export { StockEntryDTO } from './models/stock-entry-dto';
+export { EntityDTOContainerOfStockEntryDTO } from './models/entity-dtocontainer-of-stock-entry-dto';
+export { StockEntryType } from './models/stock-entry-type';
+export { EntityDTOContainerOfStockOrderItemDTO } from './models/entity-dtocontainer-of-stock-order-item-dto';
+export { StockOrderItemDTO } from './models/stock-order-item-dto';
+export { EntityDTOContainerOfStockOrderDTO } from './models/entity-dtocontainer-of-stock-order-dto';
+export { StockOrderDTO } from './models/stock-order-dto';
+export { EntityDTOContainerOfSupplierDTO } from './models/entity-dtocontainer-of-supplier-dto';
+export { SupplierDTO } from './models/supplier-dto';
+export { SupplierType } from './models/supplier-type';
+export { EntityDTOBaseOfSupplierDTOAndISupplier } from './models/entity-dtobase-of-supplier-dtoand-isupplier';
+export { EntityDTOBaseOfStockOrderDTOAndIStockOrder } from './models/entity-dtobase-of-stock-order-dtoand-istock-order';
+export { EntityDTOContainerOfSupplierStatusCodeDTO } from './models/entity-dtocontainer-of-supplier-status-code-dto';
+export { SupplierStatusCodeDTO } from './models/supplier-status-code-dto';
+export { AvailabilityType } from './models/availability-type';
+export { EntityDTOBaseOfSupplierStatusCodeDTOAndIStockStatusCode } from './models/entity-dtobase-of-supplier-status-code-dtoand-istock-status-code';
+export { EntityDTOContainerOfStockOrderItemStatusDTO } from './models/entity-dtocontainer-of-stock-order-item-status-dto';
+export { StockOrderItemStatusDTO } from './models/stock-order-item-status-dto';
+export { StockOrderItemProcessingStatus } from './models/stock-order-item-processing-status';
+export { EntityDTOBaseOfStockOrderItemStatusDTOAndIStockOrderItemStatus } from './models/entity-dtobase-of-stock-order-item-status-dtoand-istock-order-item-status';
+export { EntityDTOBaseOfStockOrderItemDTOAndIStockOrderItem } from './models/entity-dtobase-of-stock-order-item-dtoand-istock-order-item';
+export { EntityDTOContainerOfStockReservationItemDTO } from './models/entity-dtocontainer-of-stock-reservation-item-dto';
+export { StockReservationItemDTO } from './models/stock-reservation-item-dto';
+export { EntityDTOContainerOfStockReservationDTO } from './models/entity-dtocontainer-of-stock-reservation-dto';
+export { StockReservationDTO } from './models/stock-reservation-dto';
+export { EntityDTOBaseOfStockReservationDTOAndIStockReservation } from './models/entity-dtobase-of-stock-reservation-dtoand-istock-reservation';
+export { EntityDTOContainerOfStockReservationItemStatusDTO } from './models/entity-dtocontainer-of-stock-reservation-item-status-dto';
+export { StockReservationItemStatusDTO } from './models/stock-reservation-item-status-dto';
+export { StockReservationItemProcessingStatus } from './models/stock-reservation-item-processing-status';
+export { EntityDTOBaseOfStockReservationItemStatusDTOAndIStockReservationItemStatus } from './models/entity-dtobase-of-stock-reservation-item-status-dtoand-istock-reservation-item-status';
+export { EntityDTOBaseOfStockReservationItemDTOAndIStockReservationItem } from './models/entity-dtobase-of-stock-reservation-item-dtoand-istock-reservation-item';
+export { EntityDTOBaseOfStockEntryDTOAndIStockEntry } from './models/entity-dtobase-of-stock-entry-dtoand-istock-entry';
+export { ResponseArgsOfIEnumerableOfStockItemDTO } from './models/response-args-of-ienumerable-of-stock-item-dto';
+export { ResponseArgsOfIEnumerableOfStockOrderDTO } from './models/response-args-of-ienumerable-of-stock-order-dto';
+export { ResponseArgsOfIEnumerableOfStockReservationDTO } from './models/response-args-of-ienumerable-of-stock-reservation-dto';
+export { ListResponseArgsOfSupplierDTO } from './models/list-response-args-of-supplier-dto';
+export { ResponseArgsOfIEnumerableOfSupplierDTO } from './models/response-args-of-ienumerable-of-supplier-dto';
+export { ListResponseArgsOfPackageDTO2 } from './models/list-response-args-of-package-dto2';
+export { ResponseArgsOfIEnumerableOfPackageDTO2 } from './models/response-args-of-ienumerable-of-package-dto2';
+export { PackageDTO2 } from './models/package-dto2';
 export { PackageArrivalStatusDTO } from './models/package-arrival-status-dto';
 export { ArrivalStatus } from './models/arrival-status';
-export { QueryTokenDTO } from './models/query-token-dto';
 export { ResponseArgsOfPackageDetailResponseDTO } from './models/response-args-of-package-detail-response-dto';
 export { PackageDetailResponseDTO } from './models/package-detail-response-dto';
 export { NestedKeyValueDTOOfStringAndString } from './models/nested-key-value-dtoof-string-and-string';
 export { PackageItemDTO } from './models/package-item-dto';
-export { StockInfoDTO } from './models/stock-info-dto';
-export { StockStatus } from './models/stock-status';
+export { StockInfoDTO2 } from './models/stock-info-dto2';
+export { StockStatus2 } from './models/stock-status-2';
 export { PackageItemDTO2 } from './models/package-item-dto2';
-export { ProductDTO } from './models/product-dto';
-export { SizeOfString } from './models/size-of-string';
-export { WeightOfAvoirdupois } from './models/weight-of-avoirdupois';
-export { Avoirdupois } from './models/avoirdupois';
-export { TouchedBase } from './models/touched-base';
 export { ResponseArgsOfPackageArrivalStatusDTO } from './models/response-args-of-package-arrival-status-dto';

apps/swagger/wws/src/lib/models/address-dto.ts

@@ -0,0 +1,18 @@
+/* tslint:disable */
+import { TouchedBase } from './touched-base';
+import { GeoLocation } from './geo-location';
+export interface AddressDTO extends TouchedBase{
+  apartment?: string;
+  careOf?: string;
+  city?: string;
+  country?: string;
+  district?: string;
+  geoLocation?: GeoLocation;
+  info?: string;
+  po?: string;
+  region?: string;
+  state?: string;
+  street?: string;
+  streetNumber?: string;
+  zipCode?: string;
+}

apps/swagger/wws/src/lib/models/addressee-dto.ts

@@ -0,0 +1,13 @@
+/* tslint:disable */
+import { TouchedBase } from './touched-base';
+import { AddressDTO } from './address-dto';
+import { CommunicationDetailsDTO } from './communication-details-dto';
+import { OrganisationDTO } from './organisation-dto';
+import { PersonNamesDTO } from './person-names-dto';
+export interface AddresseeDTO extends TouchedBase{
+  address?: AddressDTO;
+  communicationDetails?: CommunicationDetailsDTO;
+  locale?: string;
+  organisation?: OrganisationDTO;
+  person?: PersonNamesDTO;
+}

apps/swagger/wws/src/lib/models/article-dto.ts

@@ -0,0 +1,9 @@
+/* tslint:disable */
+import { ProductDTO } from './product-dto';
+import { PriceDTO } from './price-dto';
+import { QuantityValueDTO } from './quantity-value-dto';
+export interface ArticleDTO extends ProductDTO{
+  price?: PriceDTO;
+  priceMaintained?: boolean;
+  quantity?: QuantityValueDTO;
+}

apps/swagger/wws/src/lib/models/availability-type.ts

@@ -0,0 +1,2 @@
+/* tslint:disable */
+export type AvailabilityType = 0 | 1 | 2 | 32 | 256 | 512 | 1024 | 2048 | 4096 | 8192 | 16384;

apps/swagger/wws/src/lib/models/branch-dto.ts

@@ -0,0 +1,20 @@
+/* tslint:disable */
+import { EntityDTOBaseOfBranchDTOAndIBranch } from './entity-dtobase-of-branch-dtoand-ibranch';
+import { AddressDTO } from './address-dto';
+import { BranchType } from './branch-type';
+import { EntityDTOContainerOfLabelDTO } from './entity-dtocontainer-of-label-dto';
+import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto';
+export interface BranchDTO extends EntityDTOBaseOfBranchDTOAndIBranch{
+  address?: AddressDTO;
+  branchNumber?: string;
+  branchType?: BranchType;
+  isDefault?: string;
+  isOnline?: boolean;
+  isOrderingEnabled?: boolean;
+  isShippingEnabled?: boolean;
+  key?: string;
+  label?: EntityDTOContainerOfLabelDTO;
+  name?: string;
+  parent?: EntityDTOContainerOfBranchDTO;
+  shortName?: string;
+}

apps/swagger/wws/src/lib/models/branch-type.ts

@@ -0,0 +1,2 @@
+/* tslint:disable */
+export type BranchType = 0 | 1 | 2 | 4 | 8 | 16;

apps/swagger/wws/src/lib/models/category-dto.ts

@@ -0,0 +1,14 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+import { EntityDTOContainerOfCategoryDTO } from './entity-dtocontainer-of-category-dto';
+import { EntityDTOContainerOfTenantDTO } from './entity-dtocontainer-of-tenant-dto';
+export interface CategoryDTO extends EntityDTOBase{
+  key?: string;
+  name?: string;
+  parent?: EntityDTOContainerOfCategoryDTO;
+  sort?: number;
+  start?: string;
+  stop?: string;
+  tenant?: EntityDTOContainerOfTenantDTO;
+  type?: string;
+}

apps/swagger/wws/src/lib/models/communication-details-dto.ts

@@ -0,0 +1,8 @@
+/* tslint:disable */
+import { TouchedBase } from './touched-base';
+export interface CommunicationDetailsDTO extends TouchedBase{
+  email?: string;
+  fax?: string;
+  mobile?: string;
+  phone?: string;
+}

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

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

apps/swagger/wws/src/lib/models/entity-dto.ts

@@ -0,0 +1,12 @@
+/* tslint:disable */
+import { TouchedBase } from './touched-base';
+import { EntityStatus } from './entity-status';
+export interface EntityDTO extends TouchedBase{
+  changed?: string;
+  created?: string;
+  id?: number;
+  pId?: string;
+  status?: EntityStatus;
+  uId?: string;
+  version?: number;
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-branch-dtoand-ibranch.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfBranchDTOAndIBranch extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-item-dtoand-iitem.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfItemDTOAndIItem extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-label-dtoand-ilabel.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfLabelDTOAndILabel extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-package-dtoand-ipackage.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfPackageDTOAndIPackage extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-stock-compartment-dtoand-istock-compartment.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfStockCompartmentDTOAndIStockCompartment extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-stock-dtoand-istock.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfStockDTOAndIStock extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-stock-entry-dtoand-istock-entry.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfStockEntryDTOAndIStockEntry extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-stock-item-dtoand-istock-item.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfStockItemDTOAndIStockItem extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-stock-order-dtoand-istock-order.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfStockOrderDTOAndIStockOrder extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-stock-order-item-dtoand-istock-order-item.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfStockOrderItemDTOAndIStockOrderItem extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-stock-order-item-status-dtoand-istock-order-item-status.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfStockOrderItemStatusDTOAndIStockOrderItemStatus extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-stock-reservation-dtoand-istock-reservation.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfStockReservationDTOAndIStockReservation extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-stock-reservation-item-dtoand-istock-reservation-item.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfStockReservationItemDTOAndIStockReservationItem extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-stock-reservation-item-status-dtoand-istock-reservation-item-status.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfStockReservationItemStatusDTOAndIStockReservationItemStatus extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-supplier-dtoand-isupplier.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfSupplierDTOAndISupplier extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-supplier-status-code-dtoand-istock-status-code.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfSupplierStatusCodeDTOAndIStockStatusCode extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-tenant-dtoand-itenant.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfTenantDTOAndITenant extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase-of-user-dtoand-iuser.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfUserDTOAndIUser extends EntityDTOBase{
+}

apps/swagger/wws/src/lib/models/entity-dtobase.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTO } from './entity-dto';
+export interface EntityDTOBase extends EntityDTO{
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-branch-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { BranchDTO } from './branch-dto';
+export interface EntityDTOContainerOfBranchDTO extends EntityDTOReferenceContainer{
+  data?: BranchDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-category-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { CategoryDTO } from './category-dto';
+export interface EntityDTOContainerOfCategoryDTO extends EntityDTOReferenceContainer{
+  data?: CategoryDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-item-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { ItemDTO } from './item-dto';
+export interface EntityDTOContainerOfItemDTO extends EntityDTOReferenceContainer{
+  data?: ItemDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-label-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { LabelDTO } from './label-dto';
+export interface EntityDTOContainerOfLabelDTO extends EntityDTOReferenceContainer{
+  data?: LabelDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-product-list-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { ProductListDTO } from './product-list-dto';
+export interface EntityDTOContainerOfProductListDTO extends EntityDTOReferenceContainer{
+  data?: ProductListDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-product-list-dto2.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { ProductListDTO2 } from './product-list-dto2';
+export interface EntityDTOContainerOfProductListDTO2 extends EntityDTOReferenceContainer{
+  data?: ProductListDTO2;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-product-list-item-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { ProductListItemDTO } from './product-list-item-dto';
+export interface EntityDTOContainerOfProductListItemDTO extends EntityDTOReferenceContainer{
+  data?: ProductListItemDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-product-list-item-dto2.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { ProductListItemDTO2 } from './product-list-item-dto2';
+export interface EntityDTOContainerOfProductListItemDTO2 extends EntityDTOReferenceContainer{
+  data?: ProductListItemDTO2;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-stock-compartment-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { StockCompartmentDTO } from './stock-compartment-dto';
+export interface EntityDTOContainerOfStockCompartmentDTO extends EntityDTOReferenceContainer{
+  data?: StockCompartmentDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-stock-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { StockDTO } from './stock-dto';
+export interface EntityDTOContainerOfStockDTO extends EntityDTOReferenceContainer{
+  data?: StockDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-stock-entry-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { StockEntryDTO } from './stock-entry-dto';
+export interface EntityDTOContainerOfStockEntryDTO extends EntityDTOReferenceContainer{
+  data?: StockEntryDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-stock-item-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { StockItemDTO } from './stock-item-dto';
+export interface EntityDTOContainerOfStockItemDTO extends EntityDTOReferenceContainer{
+  data?: StockItemDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-stock-order-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { StockOrderDTO } from './stock-order-dto';
+export interface EntityDTOContainerOfStockOrderDTO extends EntityDTOReferenceContainer{
+  data?: StockOrderDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-stock-order-item-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { StockOrderItemDTO } from './stock-order-item-dto';
+export interface EntityDTOContainerOfStockOrderItemDTO extends EntityDTOReferenceContainer{
+  data?: StockOrderItemDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-stock-order-item-status-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { StockOrderItemStatusDTO } from './stock-order-item-status-dto';
+export interface EntityDTOContainerOfStockOrderItemStatusDTO extends EntityDTOReferenceContainer{
+  data?: StockOrderItemStatusDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-stock-reservation-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { StockReservationDTO } from './stock-reservation-dto';
+export interface EntityDTOContainerOfStockReservationDTO extends EntityDTOReferenceContainer{
+  data?: StockReservationDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-stock-reservation-item-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { StockReservationItemDTO } from './stock-reservation-item-dto';
+export interface EntityDTOContainerOfStockReservationItemDTO extends EntityDTOReferenceContainer{
+  data?: StockReservationItemDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-stock-reservation-item-status-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { StockReservationItemStatusDTO } from './stock-reservation-item-status-dto';
+export interface EntityDTOContainerOfStockReservationItemStatusDTO extends EntityDTOReferenceContainer{
+  data?: StockReservationItemStatusDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-supplier-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { SupplierDTO } from './supplier-dto';
+export interface EntityDTOContainerOfSupplierDTO extends EntityDTOReferenceContainer{
+  data?: SupplierDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-supplier-status-code-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { SupplierStatusCodeDTO } from './supplier-status-code-dto';
+export interface EntityDTOContainerOfSupplierStatusCodeDTO extends EntityDTOReferenceContainer{
+  data?: SupplierStatusCodeDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-tenant-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { TenantDTO } from './tenant-dto';
+export interface EntityDTOContainerOfTenantDTO extends EntityDTOReferenceContainer{
+  data?: TenantDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtocontainer-of-user-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
+import { UserDTO } from './user-dto';
+export interface EntityDTOContainerOfUserDTO extends EntityDTOReferenceContainer{
+  data?: UserDTO;
+}

apps/swagger/wws/src/lib/models/entity-dtoreference-container.ts

@@ -0,0 +1,12 @@
+/* tslint:disable */
+import { TouchedBase } from './touched-base';
+import { ExternalReferenceDTO } from './external-reference-dto';
+export interface EntityDTOReferenceContainer extends TouchedBase{
+  displayLabel?: string;
+  enabled?: boolean;
+  externalReference?: ExternalReferenceDTO;
+  id?: number;
+  pId?: string;
+  selected?: boolean;
+  uId?: string;
+}

apps/swagger/wws/src/lib/models/entity-status.ts

@@ -0,0 +1,2 @@
+/* tslint:disable */
+export type EntityStatus = 0 | 1 | 2 | 4 | 8;

apps/swagger/wws/src/lib/models/external-reference-dto.ts

@@ -0,0 +1,13 @@
+/* tslint:disable */
+import { TouchedBase } from './touched-base';
+import { EntityStatus } from './entity-status';
+export interface ExternalReferenceDTO extends TouchedBase{
+  externalChanged?: string;
+  externalCreated?: string;
+  externalNumber?: string;
+  externalPK?: string;
+  externalRepository?: string;
+  externalStatus: EntityStatus;
+  externalVersion?: number;
+  publishToken?: string;
+}

apps/swagger/wws/src/lib/models/gender.ts

@@ -0,0 +1,2 @@
+/* tslint:disable */
+export type Gender = 0 | 1 | 2 | 4;

apps/swagger/wws/src/lib/models/geo-location.ts

@@ -0,0 +1,7 @@
+/* tslint:disable */
+import { TouchedBase } from './touched-base';
+export interface GeoLocation extends TouchedBase{
+  altitude?: number;
+  latitude?: number;
+  longitude?: number;
+}

apps/swagger/wws/src/lib/models/impediment-dto.ts

@@ -0,0 +1,7 @@
+/* tslint:disable */
+import { TouchedBase } from './touched-base';
+export interface ImpedimentDTO extends TouchedBase{
+  attempts?: number;
+  comment?: string;
+  lastAttempt?: string;
+}

apps/swagger/wws/src/lib/models/item-dto.ts

@@ -0,0 +1,16 @@
+/* tslint:disable */
+import { EntityDTOBaseOfItemDTOAndIItem } from './entity-dtobase-of-item-dtoand-iitem';
+import { EntityDTOContainerOfItemDTO } from './entity-dtocontainer-of-item-dto';
+import { ProductDTO } from './product-dto';
+import { QuantityUnitType } from './quantity-unit-type';
+import { EntityDTOContainerOfTenantDTO } from './entity-dtocontainer-of-tenant-dto';
+export interface ItemDTO extends EntityDTOBaseOfItemDTOAndIItem{
+  catalogItem?: number;
+  precedingItem?: EntityDTOContainerOfItemDTO;
+  precedingItemEAN?: string;
+  product?: ProductDTO;
+  quantityUnit?: string;
+  quantityUnitType?: QuantityUnitType;
+  secondaryEAN?: string;
+  tenant?: EntityDTOContainerOfTenantDTO;
+}

apps/swagger/wws/src/lib/models/label-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { EntityDTOBaseOfLabelDTOAndILabel } from './entity-dtobase-of-label-dtoand-ilabel';
+export interface LabelDTO extends EntityDTOBaseOfLabelDTOAndILabel{
+  key?: string;
+  name?: string;
+}

apps/swagger/wws/src/lib/models/list-response-args-of-package-dto2.ts

@@ -0,0 +1,8 @@
+/* tslint:disable */
+import { ResponseArgsOfIEnumerableOfPackageDTO2 } from './response-args-of-ienumerable-of-package-dto2';
+export interface ListResponseArgsOfPackageDTO2 extends ResponseArgsOfIEnumerableOfPackageDTO2{
+  completed?: boolean;
+  hits?: number;
+  skip?: number;
+  take?: number;
+}

apps/swagger/wws/src/lib/models/list-response-args-of-product-list-dto.ts

@@ -0,0 +1,8 @@
+/* tslint:disable */
+import { ResponseArgsOfIEnumerableOfProductListDTO } from './response-args-of-ienumerable-of-product-list-dto';
+export interface ListResponseArgsOfProductListDTO extends ResponseArgsOfIEnumerableOfProductListDTO{
+  completed?: boolean;
+  hits?: number;
+  skip?: number;
+  take?: number;
+}

apps/swagger/wws/src/lib/models/list-response-args-of-product-list-item-dto.ts

@@ -0,0 +1,8 @@
+/* tslint:disable */
+import { ResponseArgsOfIEnumerableOfProductListItemDTO } from './response-args-of-ienumerable-of-product-list-item-dto';
+export interface ListResponseArgsOfProductListItemDTO extends ResponseArgsOfIEnumerableOfProductListItemDTO{
+  completed?: boolean;
+  hits?: number;
+  skip?: number;
+  take?: number;
+}

apps/swagger/wws/src/lib/models/list-response-args-of-supplier-dto.ts

@@ -0,0 +1,8 @@
+/* tslint:disable */
+import { ResponseArgsOfIEnumerableOfSupplierDTO } from './response-args-of-ienumerable-of-supplier-dto';
+export interface ListResponseArgsOfSupplierDTO extends ResponseArgsOfIEnumerableOfSupplierDTO{
+  completed?: boolean;
+  hits?: number;
+  skip?: number;
+  take?: number;
+}

apps/swagger/wws/src/lib/models/organisation-dto.ts

@@ -0,0 +1,8 @@
+/* tslint:disable */
+import { OrganisationNamesDTO } from './organisation-names-dto';
+export interface OrganisationDTO extends OrganisationNamesDTO{
+  costUnit?: string;
+  gln?: string;
+  sector?: string;
+  vatId?: string;
+}

apps/swagger/wws/src/lib/models/organisation-names-dto.ts

@@ -0,0 +1,8 @@
+/* tslint:disable */
+import { TouchedBase } from './touched-base';
+export interface OrganisationNamesDTO extends TouchedBase{
+  department?: string;
+  legalForm?: string;
+  name?: string;
+  nameSuffix?: string;
+}

apps/swagger/wws/src/lib/models/package-detail-response-dto.ts

@@ -1,7 +1,7 @@
 /* tslint:disable */
 import { NestedKeyValueDTOOfStringAndString } from './nested-key-value-dtoof-string-and-string';
 import { PackageItemDTO } from './package-item-dto';
-import { PackageDTO } from './package-dto';
+import { PackageDTO2 } from './package-dto2';
 
 /**
  * PackageDetailResponseDTO
@@ -21,5 +21,5 @@ export interface PackageDetailResponseDTO {
   /**
    * Package
    */
-  package?: PackageDTO;
+  package?: PackageDTO2;
 }

apps/swagger/wws/src/lib/models/package-dto.ts

@@ -1,9 +1,20 @@
 /* tslint:disable */
-import { PackageArrivalStatusDTO } from './package-arrival-status-dto';
-export interface PackageDTO extends PackageArrivalStatusDTO{
-  app?: string;
-  items?: number;
-  itemsOrdered?: number;
-  valueOfGoods?: number;
-  weight?: number;
+import { EntityDTOBaseOfPackageDTOAndIPackage } from './entity-dtobase-of-package-dtoand-ipackage';
+import { AddresseeDTO } from './addressee-dto';
+import { EntityDTOContainerOfLabelDTO } from './entity-dtocontainer-of-label-dto';
+import { EntityDTOContainerOfUserDTO } from './entity-dtocontainer-of-user-dto';
+import { WeightOfAvoirdupois } from './weight-of-avoirdupois';
+export interface PackageDTO extends EntityDTOBaseOfPackageDTOAndIPackage{
+  addressee?: AddresseeDTO;
+  label?: EntityDTOContainerOfLabelDTO;
+  numberOfPackages?: number;
+  packageNumber?: string;
+  packageType?: string;
+  packedAt?: string;
+  packedBy?: EntityDTOContainerOfUserDTO;
+  returnTo?: AddresseeDTO;
+  sender?: AddresseeDTO;
+  shippingProvider?: string;
+  trackingCode?: string;
+  weight?: WeightOfAvoirdupois;
 }

apps/swagger/wws/src/lib/models/package-dto2.ts

@@ -0,0 +1,9 @@
+/* tslint:disable */
+import { PackageArrivalStatusDTO } from './package-arrival-status-dto';
+export interface PackageDTO2 extends PackageArrivalStatusDTO{
+  app?: string;
+  items?: number;
+  itemsOrdered?: number;
+  valueOfGoods?: number;
+  weight?: number;
+}

apps/swagger/wws/src/lib/models/package-item-dto.ts

@@ -1,10 +1,10 @@
 /* tslint:disable */
 import { PackageItemDTO2 } from './package-item-dto2';
-import { StockInfoDTO } from './stock-info-dto';
+import { StockInfoDTO2 } from './stock-info-dto2';
 export interface PackageItemDTO extends PackageItemDTO2{
 
   /**
    * Stock infos
    */
-  stockInfos?: Array<StockInfoDTO>;
+  stockInfos?: Array<StockInfoDTO2>;
 }

apps/swagger/wws/src/lib/models/person-names-dto.ts

@@ -0,0 +1,9 @@
+/* tslint:disable */
+import { TouchedBase } from './touched-base';
+import { Gender } from './gender';
+export interface PersonNamesDTO extends TouchedBase{
+  firstName: string;
+  gender?: Gender;
+  lastName: string;
+  title: string;
+}

apps/swagger/wws/src/lib/models/price-dto.ts

@@ -0,0 +1,8 @@
+/* tslint:disable */
+import { TouchedBase } from './touched-base';
+import { PriceValueDTO } from './price-value-dto';
+import { VATValueDTO } from './vatvalue-dto';
+export interface PriceDTO extends TouchedBase{
+  value?: PriceValueDTO;
+  vat?: VATValueDTO;
+}

apps/swagger/wws/src/lib/models/price-value-dto.ts

@@ -0,0 +1,7 @@
+/* tslint:disable */
+import { TouchedBase } from './touched-base';
+export interface PriceValueDTO extends TouchedBase{
+  currency?: string;
+  currencySymbol?: string;
+  value?: number;
+}

apps/swagger/wws/src/lib/models/product-list-dto.ts

@@ -0,0 +1,8 @@
+/* tslint:disable */
+import { ProductListDTO2 } from './product-list-dto2';
+import { EntityDTOContainerOfProductListDTO } from './entity-dtocontainer-of-product-list-dto';
+import { EntityDTOContainerOfStockDTO } from './entity-dtocontainer-of-stock-dto';
+export interface ProductListDTO extends ProductListDTO2{
+  parent?: EntityDTOContainerOfProductListDTO;
+  stock?: EntityDTOContainerOfStockDTO;
+}

apps/swagger/wws/src/lib/models/product-list-dto2.ts

@@ -0,0 +1,21 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+import { EntityDTOContainerOfCategoryDTO } from './entity-dtocontainer-of-category-dto';
+import { EntityDTOContainerOfProductListDTO2 } from './entity-dtocontainer-of-product-list-dto2';
+import { TaskDTO } from './task-dto';
+export interface ProductListDTO2 extends EntityDTOBase{
+  area?: string;
+  category?: EntityDTOContainerOfCategoryDTO;
+  categoryDetails?: string;
+  command?: string;
+  commandData?: string;
+  description?: string;
+  name?: string;
+  organizationalUnit?: string;
+  parent?: EntityDTOContainerOfProductListDTO2;
+  source?: string;
+  sourceDetail?: string;
+  start?: string;
+  stop?: string;
+  task?: TaskDTO;
+}

apps/swagger/wws/src/lib/models/product-list-item-dto.ts

@@ -0,0 +1,15 @@
+/* tslint:disable */
+import { ProductListItemDTO2 } from './product-list-item-dto2';
+import { EntityDTOContainerOfStockCompartmentDTO } from './entity-dtocontainer-of-stock-compartment-dto';
+import { EntityDTOContainerOfProductListItemDTO } from './entity-dtocontainer-of-product-list-item-dto';
+import { EntityDTOContainerOfProductListDTO } from './entity-dtocontainer-of-product-list-dto';
+import { EntityDTOContainerOfStockDTO } from './entity-dtocontainer-of-stock-dto';
+import { EntityDTOContainerOfStockItemDTO } from './entity-dtocontainer-of-stock-item-dto';
+export interface ProductListItemDTO extends ProductListItemDTO2{
+  compartment?: EntityDTOContainerOfStockCompartmentDTO;
+  compartmentDetails?: string;
+  parent?: EntityDTOContainerOfProductListItemDTO;
+  productList?: EntityDTOContainerOfProductListDTO;
+  stock?: EntityDTOContainerOfStockDTO;
+  stockItem?: EntityDTOContainerOfStockItemDTO;
+}