#4712 Removed isShippingEnabled check from availabilities modal

Merge Develop to Release 3.0

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

@@ -35,7 +35,11 @@
       </div>
 
       <div class="branch-actions">
-        <button *ngIf="(branch.id | stockInfo: (inStock$ | async))?.availableQuantity > 0" class="cta-reserve" (click)="reserve(branch)">
+        <button
+          *ngIf="(branch.id | stockInfo: (inStock$ | async))?.availableQuantity > 0 && branch?.isShippingEnabled"
+          class="cta-reserve"
+          (click)="reserve(branch)"
+        >
           Reservieren
         </button>
 

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

@@ -37,7 +37,7 @@ export class ModalAvailabilitiesComponent {
           (branch) =>
             branch &&
             branch?.isOnline &&
-            branch?.isShippingEnabled &&
+            // branch?.isShippingEnabled && ------ Rausgenommen aufgrund des Tickets #4712
             branch?.isOrderingEnabled &&
             branch?.id !== userbranch?.id &&
             branch?.branchType === 1

apps/page/customer/src/lib/components/form-blocks/deviating-address/deviating-address-form-block.component.html

@@ -38,7 +38,6 @@
       (onInit)="addAddressGroup($event)"
       (onDestroy)="removeAddressGroup()"
       [data]="data?.address"
-      [tabIndexStart]="nameFormBlock?.tabIndexEnd + 1"
       [requiredMarks]="addressRequiredMarks"
       [validatorFns]="addressValidatorFns"
       [readonly]="readonly"

apps/page/customer/src/lib/create-customer/abstract-create-customer.ts

@@ -378,7 +378,7 @@ export abstract class AbstractCreateCustomer implements OnInit, OnDestroy {
         } catch (error) {
           this.form.enable();
           setTimeout(() => {
-            this.addressFormBlock.setAddressValidationError(error.error.invalidProperties);
+            this.deviatingDeliveryAddressFormBlock.setAddressValidationError(error.error.invalidProperties);
           }, 10);
 
           return;

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

@@ -5,3 +5,7 @@
 .action-wrapper {
   @apply grid grid-flow-col gap-4 justify-center my-6 fixed bottom-24 inset-x-0;
 }
+
+.annotation-layout {
+  @apply col-span-2;
+}

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

@@ -3,33 +3,7 @@
 </div>
 <ng-container *ngIf="packageDetails$ | async; else loader; let packageDetails" (sharedOnInit)="calculateListHeight()">
   <div class="bg-background-liste">
-    <div #handlungsAnweisung [ngSwitch]="packageDetails.package.arrivalStatus | arrivalStatus">
-      <div class="bg-white" *ngSwitchCase="'Falsche Filiale'">
-        <p class="text-center text-xl py-10">
-          Stellen Sie dieses Packstück für die andere Filiale bereit. <br />
-          Der Spediteur holt es zum nächstmöglichen Zeitpunkt ab.
-        </p>
-      </div>
-      <div class="bg-white" *ngSwitchCase="'Offen'">
-        <p class="text-center text-xl py-10" *ngIf="!(childActions$ | async)">
-          Können Sie sich erinnern, dass Sie dieses Packstück <br />
-          ausgepackt haben?
-        </p>
-        <p class="text-center text-xl py-10" *ngIf="!!(childActions$ | async)">
-          Prüfen Sie bitte stichprobenartig den Filialbestand des <br />
-          dargestellten Artikels. Ist der angezeigte Filialbestand <br />
-          korrekt?
-        </p>
-      </div>
-      <div class="bg-white" *ngSwitchCase="'Fehlt'">
-        <p class="text-center text-xl py-10">
-          Prüfen Sie bitte stichprobenartig den Filialbestand <br />
-          des dargestellten Artikels. Ist der angezeigte Filialbestand <br />
-          korrekt?
-        </p>
-      </div>
-      <div class="pt-3" *ngSwitchDefault></div>
-    </div>
+    <div class="bg-white text-center text-xl py-10" [innerText]="packageDetails?.package?.features?.['description'] ?? ''"></div>
 
     <div class="bg-white rounded-t shadow-card grid grid-flow-row p-4 gap-2">
       <div class="grid grid-cols-6">
@@ -38,7 +12,7 @@
           <span *ngIf="packageDetails.package.packageNumber && packageDetails.package.deliveryNoteNumber"> | </span>
           {{ packageDetails.package.deliveryNoteNumber }}
         </div>
-        <div class="col-span-3">
+        <div class="col-span-3" [class.annotation-layout]="packageDetails?.package?.features?.['annotation']">
           <ng-container *ngIf="packageDetails.package.arrivalStatus !== 8; else irrlauferTmplt">
             Filialstopp
             <span class="font-bold ml-2">
@@ -52,7 +26,7 @@
             </span>
           </ng-template>
         </div>
-        <div class="text-right">
+        <div class="text-right" *ngIf="!packageDetails?.package?.features?.['annotation']; else annotationTmpl">
           <ng-container *ngIf="(packageDetails.package.arrivalStatus | arrivalStatus) === 'Fehlt'">
             <button
               class="isa-icon-button mr-2"
@@ -82,6 +56,11 @@
             {{ packageDetails.package.arrivalStatus | arrivalStatus }}
           </div>
         </div>
+        <ng-template #annotationTmpl>
+          <div class="text-right text-[#5A728A] col-span-2">
+            {{ packageDetails?.package?.features?.['annotation'] }}
+          </div>
+        </ng-template>
       </div>
       <div class="grid grid-cols-6">
         <div class="col-span-2">

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

@@ -148,7 +148,7 @@ export class PackageDetailsComponent {
 
   @HostListener('window:resize')
   calculateListHeight() {
-    const handlungsAnweisungHeight = this.handlungsAnweisung?.nativeElement.offsetHeight;
+    const handlungsAnweisungHeight = this.handlungsAnweisung?.nativeElement?.offsetHeight ?? 0;
     const windowHeight = window.innerHeight;
     this.detailsListHeight = windowHeight - handlungsAnweisungHeight - 516;
     this._cdr.markForCheck();

apps/page/pickup-shelf/src/lib/pickup-shelf-base.component.ts

@@ -116,38 +116,8 @@ export abstract class PickupShelfBaseComponent implements OnInit {
     return queryParams;
   }
 
-  regsiterFetchListResponseHandler() {
-    this.listStore.fetchListResponse$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(async ({ processId, queryParams, response }) => {
-      /**
-       * Wenn die Suche erfolgreich war, wird der Benutzer auf die Liste oder Detailseite des gefundenen Artikels weitergeleitet.
-       */
-      const filterQueryParams = this.listStore.filter.getQueryParams();
-
-      // Only Update QueryParams if the user is already on the details, edit or history page
-      // const view: string = this.activatedRoute.snapshot.data.view;
-      // if (['filter', 'details', 'edit', 'history'].includes(view)) {
-      //   await this.router.navigate([], { queryParams: { ...queryParams, ...filterQueryParams }, skipLocationChange: true });
-      //   return;
-      // }
-
-      if (response.hits === 1 || this._hasSameOrderNumber(response)) {
-        const detailsPath = await this.getPathForDetail(response.result[0]).pipe(take(1)).toPromise();
-        await this.router.navigate(detailsPath.path, { queryParams: { ...queryParams, ...filterQueryParams, ...detailsPath.queryParams } });
-      } else if (response.hits > 1) {
-        const listPath = await this.getPathFoListBreadcrumb({ processId, queryParams });
-        await this.router.navigate(listPath.path, { queryParams: { ...queryParams, ...filterQueryParams, ...listPath.queryParams } });
-      } else {
-        await this.router.navigate([], { queryParams: { ...queryParams, ...filterQueryParams } });
-      }
-    });
-  }
-
-  // Fix Ticket #4684 Navigate on Details if items contain same OrderNumber
-  private _hasSameOrderNumber(response: ListResponseArgsOfDBHOrderItemListItemDTO) {
-    if (response.hits === 0) return false;
-    const orderNumbers = new Set(response.result.map((item) => item.orderNumber));
-    return orderNumbers.size === 1;
-  }
+  // Fix Ticket #4688 Navigation behaves different based on section PickUpShelfOut and PickUpShelfIn
+  abstract regsiterFetchListResponseHandler(): void | Promise<void>;
 
   /**
    * Sucht die Breadcrumb anhand des Tags.

apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.ts

@@ -115,9 +115,15 @@ export class PickupShelfInDetailsComponent extends PickupShelfDetailsBaseCompone
         if (!!selectedItem && this.store.selectPreviousSelectedOrderItemSubsetId !== orderItemSubsetId) {
           this.store.setPreviousSelectedOrderItemSubsetId(orderItemSubsetId); // Wichtig das die ID im Store vorhanden bleibt um z.B. für die Filter eine zurücknavigation zu ermöglichen
           this.store.selectOrderItem(selectedItem, true); // Wird automatisch unselected wenn die Details Seite verlassen wird
-          this.store.fetchCoverOrderItems();
         }
       });
+
+    // Fix #4696 - Always Fetch Cover Order Items
+    this._activatedRoute.params.pipe(distinctUntilChanged(isEqual), takeUntilDestroyed(this.destroyRef)).subscribe((_) => {
+      if (!this.store.coverOrderItems || this.store.coverOrderItems.length === 0) {
+        this.store.fetchCoverOrderItems();
+      }
+    });
   }
 
   ngAfterViewInit() {

apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in.component.ts

@@ -16,6 +16,7 @@ import { map, take } from 'rxjs/operators';
 import { ApplicationService } from '@core/application';
 import { FilterAutocompleteProvider } from '@shared/components/filter';
 import { PickUpShelfInAutocompleteProvider } from './providers/pickup-shelf-in-autocomplete.provider';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
   selector: 'page-pickup-shelf-in',
@@ -96,6 +97,10 @@ export class PickupShelfInComponent extends PickupShelfBaseComponent {
 
     const order = await this.detailsStore.order$.pipe(take(1)).toPromise();
 
+    if (!order) {
+      return;
+    }
+
     if (order?.orderNumber) {
       return order?.orderNumber;
     }
@@ -110,6 +115,12 @@ export class PickupShelfInComponent extends PickupShelfBaseComponent {
     const orderItemSubsetId = this.detailsStore.orderItemSubsetId;
     const compartmentInfo = this.detailsStore.compartmentInfo;
 
+    // Ticket #4692 - Wenn keine Order vorhanden ist, dann soll Breadcrumb nicht erstellt werden
+    // Dies kann z.B. passieren bei Datenbankproblemen wenn das Fetchen der Order sehr lange braucht
+    if (!order) {
+      return;
+    }
+
     return this._pickupShelfInNavigationService.detailRoute({
       item: {
         orderId: order?.id,
@@ -205,4 +216,23 @@ export class PickupShelfInComponent extends PickupShelfBaseComponent {
   async getNameForHistoryBreadcrumb(data: GetNameForBreadcrumbData): Promise<string> {
     return 'Historie';
   }
+
+  async regsiterFetchListResponseHandler() {
+    this.listStore.fetchListResponse$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(async ({ processId, queryParams, response }) => {
+      /**
+       * Wenn die Suche erfolgreich war, wird der Benutzer auf die Liste oder Detailseite des gefundenen Artikels weitergeleitet.
+       */
+      const filterQueryParams = this.listStore.filter.getQueryParams();
+
+      if (response.hits === 1) {
+        const detailsPath = await this.getPathForDetail(response.result[0]).pipe(take(1)).toPromise();
+        await this.router.navigate(detailsPath.path, { queryParams: { ...queryParams, ...filterQueryParams, ...detailsPath.queryParams } });
+      } else if (response.hits > 1) {
+        const listPath = await this.getPathFoListBreadcrumb({ processId, queryParams });
+        await this.router.navigate(listPath.path, { queryParams: { ...queryParams, ...filterQueryParams, ...listPath.queryParams } });
+      } else {
+        await this.router.navigate([], { queryParams: { ...queryParams, ...filterQueryParams } });
+      }
+    });
+  }
 }

apps/page/pickup-shelf/src/lib/pickup-shelf-out/pickup-shelf-out.component.ts

@@ -7,7 +7,7 @@ import { PickupShelfIOService, PickupShelfOutService } from '@domain/pickup-shel
 import { GetNameForBreadcrumbData, GetPathForBreadcrumbData, PickupShelfBaseComponent } from '../pickup-shelf-base.component';
 import { NavigationRoute, PickUpShelfOutNavigationService } from '@shared/services';
 import { AsyncPipe } from '@angular/common';
-import { DBHOrderItemListItemDTO } from '@swagger/oms';
+import { DBHOrderItemListItemDTO, ListResponseArgsOfDBHOrderItemListItemDTO } from '@swagger/oms';
 import { Observable, of } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { provideActionHandlers } from '@core/command';
@@ -15,6 +15,7 @@ import { ActionHandlerServices } from '@domain/oms';
 import { ActionHandlerService } from '../services/action-handler.service';
 import { FilterAutocompleteProvider } from '@shared/components/filter';
 import { PickUpShelfOutAutocompleteProvider } from './providers/pickup-shelf-out-autocomplete.provider';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
   selector: 'page-pickup-shelf-out',
@@ -203,4 +204,30 @@ export class PickupShelfOutComponent extends PickupShelfBaseComponent {
   async getNameForHistoryBreadcrumb(data: GetNameForBreadcrumbData): Promise<string> {
     return 'Historie';
   }
+
+  async regsiterFetchListResponseHandler() {
+    this.listStore.fetchListResponse$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(async ({ processId, queryParams, response }) => {
+      /**
+       * Wenn die Suche erfolgreich war, wird der Benutzer auf die Liste oder Detailseite des gefundenen Artikels weitergeleitet.
+       */
+      const filterQueryParams = this.listStore.filter.getQueryParams();
+
+      if (response.hits === 1 || this._hasSameOrderNumber(response)) {
+        const detailsPath = await this.getPathForDetail(response.result[0]).pipe(take(1)).toPromise();
+        await this.router.navigate(detailsPath.path, { queryParams: { ...queryParams, ...filterQueryParams, ...detailsPath.queryParams } });
+      } else if (response.hits > 1) {
+        const listPath = await this.getPathFoListBreadcrumb({ processId, queryParams });
+        await this.router.navigate(listPath.path, { queryParams: { ...queryParams, ...filterQueryParams, ...listPath.queryParams } });
+      } else {
+        await this.router.navigate([], { queryParams: { ...queryParams, ...filterQueryParams } });
+      }
+    });
+  }
+
+  // Fix Ticket #4684 Navigate on Details if items contain same OrderNumber
+  private _hasSameOrderNumber(response: ListResponseArgsOfDBHOrderItemListItemDTO) {
+    if (response.hits === 0) return false;
+    const orderNumbers = new Set(response.result.map((item) => item.orderNumber));
+    return orderNumbers.size === 1;
+  }
 }

apps/page/pickup-shelf/src/lib/shared/pickup-shelf-history/pickup-shelf-history.component.html

@@ -4,7 +4,7 @@
       *ngIf="historyItem$ | async; let item"
       class="self-end"
       type="button"
-      (click)="store.processId !== 7000 ? navigateToShelfOutDetailsPage(item) : navigateToShelfInDetailsPage(item)"
+      (click)="listStore.processId !== 7000 ? navigateToShelfOutDetailsPage(item) : navigateToShelfInDetailsPage(item)"
     >
       <shared-icon icon="close" [size]="26"></shared-icon>
     </button>

apps/page/pickup-shelf/src/lib/shared/pickup-shelf-history/pickup-shelf-history.component.ts

@@ -1,5 +1,5 @@
 import { AsyncPipe, NgIf } from '@angular/common';
-import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { DomainOmsService } from '@domain/oms';
 import { PickupShelfIOService } from '@domain/pickup-shelf';
@@ -9,8 +9,8 @@ import { PickUpShelfOutNavigationService, PickupShelfInNavigationService } from
 import { DBHOrderItemListItemDTO } from '@swagger/oms';
 import { Observable, combineLatest } from 'rxjs';
 import { map, shareReplay, switchMap, take } from 'rxjs/operators';
-import { PickupShelfStore } from '../../store';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
+import { PickupShelfDetailsBaseComponent } from '../../pickup-shelf-details-base.component';
 
 @Component({
   selector: 'page-pickup-shelf-history',
@@ -21,9 +21,7 @@ import { coerceBooleanProperty } from '@angular/cdk/coercion';
   host: { class: 'page-pickup-shelf-history' },
   imports: [AsyncPipe, NgIf, SharedHistoryListModule, IconModule],
 })
-export class PickUpShelfHistoryComponent {
-  store = inject(PickupShelfStore);
-
+export class PickUpShelfHistoryComponent extends PickupShelfDetailsBaseComponent {
   compartmentCode$: Observable<string> = this._activatedRoute.params.pipe(
     map((params) => decodeURIComponent(params?.compartmentCode ?? '') || undefined)
   );
@@ -62,12 +60,14 @@ export class PickUpShelfHistoryComponent {
     private _shelfInNavigation: PickupShelfInNavigationService,
     private _omsService: DomainOmsService,
     private _pickupShelfIOService: PickupShelfIOService
-  ) {}
+  ) {
+    super();
+  }
 
   async navigateToShelfOutDetailsPage(item: DBHOrderItemListItemDTO) {
     await this._router.navigate(
       this._shelfOutNavigation.detailRoute({
-        processId: this.store.processId,
+        processId: this.listStore.processId,
         item: {
           compartmentCode: item.compartmentCode,
           orderId: item.orderId,

apps/shared/components/package-inspection/package-list/src/lib/package-list-item.component.css

@@ -2,3 +2,7 @@
   @apply flex flex-row justify-between items-center bg-white rounded mt-px-2 px-4 font-bold;
   height: 53px;
 }
+
+:host.has-annotation {
+  @apply text-[#5A728A];
+}

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

@@ -13,9 +13,13 @@
 <div class="w-32 page-package-list-item__items-count">{{ package?.items ?? '-' }} <span class="font-normal">Exemplare</span></div>
 <div class="text-right grow">
   <div
+    *ngIf="!hasAnnotation; else annotationTmpl"
     class="rounded inline-block px-4 text-white page-package-list-item__arrival-status whitespace-nowrap"
     [class]="package?.arrivalStatus | arrivalStatusColorClass"
   >
     {{ package?.arrivalStatus | arrivalStatus }}
   </div>
+  <ng-template #annotationTmpl>
+    {{ annotation }}
+  </ng-template>
 </div>

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

@@ -1,4 +1,4 @@
-import { Component, ChangeDetectionStrategy, Input } from '@angular/core';
+import { Component, ChangeDetectionStrategy, Input, OnChanges, SimpleChanges, HostBinding } from '@angular/core';
 import { PackageDTO2 } from '@swagger/wws';
 
 @Component({
@@ -7,9 +7,19 @@ import { PackageDTO2 } from '@swagger/wws';
   styleUrls: ['package-list-item.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class PackageListItemComponent {
+export class PackageListItemComponent implements OnChanges {
   @Input()
   package: PackageDTO2;
 
-  constructor() {}
+  annotation: string | undefined;
+
+  @HostBinding('class.has-annotation')
+  hasAnnotation = false;
+
+  ngOnChanges(changes: SimpleChanges) {
+    if (changes.package) {
+      this.annotation = this.package?.features?.['annotation'] ?? undefined;
+      this.hasAnnotation = !!this.annotation;
+    }
+  }
 }

apps/shared/shell/src/lib/side-menu/side-menu.component.ts

@@ -230,11 +230,36 @@ export class ShellSideMenuComponent {
           return fallback;
         }
 
+        // #4692 Return Fallback if Values contain undefined or null values, regardless if path is from type string or array
+        if (typeof lastCrumb?.path === 'string') {
+          if (lastCrumb?.path?.includes('undefined') || lastCrumb?.path?.includes('null')) {
+            return fallback;
+          }
+        } else {
+          let valuesToCheck = [];
+
+          for (const value of lastCrumb?.path) {
+            if (value?.outlets && value?.outlets?.primary && value?.outlets?.side) {
+              valuesToCheck.push(...Object.values(value?.outlets?.primary), ...Object.values(value?.outlets?.side));
+            } else {
+              valuesToCheck.push(value);
+            }
+          }
+
+          if (this.checkIfArrayContainsUndefinedOrNull(valuesToCheck)) {
+            return fallback;
+          }
+        }
+
         return { path: lastCrumb.path, queryParams: lastCrumb.params };
       })
     );
   }
 
+  checkIfArrayContainsUndefinedOrNull(array: any[]) {
+    return array?.includes(undefined) || array?.includes('undefined') || array?.includes(null) || array?.includes('null');
+  }
+
   getLastActivatedCustomerProcessId$() {
     return this._app.getProcesses$('customer').pipe(
       map((processes) => {

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

@@ -30,7 +30,6 @@ 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';
@@ -85,11 +84,11 @@ export { VATValueDTO } from './models/vatvalue-dto';
 export { VATType } from './models/vattype';
 export { QuantityValueDTO } from './models/quantity-value-dto';
 export { QueryTokenDTO } from './models/query-token-dto';
+export { ResponseArgsOfProductListDTO } from './models/response-args-of-product-list-dto';
 export { ResponseArgsOfString } from './models/response-args-of-string';
 export { DocumentPayloadOfIEnumerableOfProductListItemDTO } from './models/document-payload-of-ienumerable-of-product-list-item-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 { ResponseArgsOfProductListDTO } from './models/response-args-of-product-list-dto';
 export { ResponseArgsOfProductListItemDTO } from './models/response-args-of-product-list-item-dto';
 export { BatchResponseArgsOfProductListItemDTOAndString } from './models/batch-response-args-of-product-list-item-dtoand-string';
 export { KeyValuePairOfStringAndProductListItemDTO } from './models/key-value-pair-of-string-and-product-list-item-dto';

apps/swagger/wws/src/lib/models/ipublic-user-info.ts

@@ -1,7 +0,0 @@
-/* tslint:disable */
-export interface IPublicUserInfo {
-  alias?: string;
-  displayName?: string;
-  isAuthenticated: boolean;
-  username?: string;
-}

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

@@ -4,6 +4,7 @@ export interface PackageDTO2 extends PackageArrivalStatusDTO{
   app?: string;
   complainedEmail?: string;
   creditRequestedEmail?: string;
+  features?: {[key: string]: string};
   items?: number;
   itemsOrdered?: number;
   missing?: string;

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

@@ -10,6 +10,7 @@ export interface ProductListDTO2 extends EntityDTOBase{
   command?: string;
   commandData?: string;
   description?: string;
+  key?: string;
   name?: string;
   organizationalUnit?: string;
   parent?: EntityDTOContainerOfProductListDTO2;

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

@@ -12,6 +12,7 @@ export interface ProductListItemDTO2 extends EntityDTOBase{
   command?: string;
   commandData?: string;
   description?: string;
+  key?: string;
   name?: string;
   organizationalUnit?: string;
   parent?: EntityDTOContainerOfProductListItemDTO2;

apps/swagger/wws/src/lib/models/response-args.ts

@@ -1,11 +1,9 @@
 /* tslint:disable */
 import { DialogOfString } from './dialog-of-string';
-import { IPublicUserInfo } from './ipublic-user-info';
 export interface ResponseArgs {
   dialog?: DialogOfString;
   error: boolean;
   invalidProperties?: {[key: string]: string};
   message?: string;
   requestId?: number;
-  userInfo?: IPublicUserInfo;
 }

apps/swagger/wws/src/lib/services/product-list.service.ts

@@ -10,13 +10,13 @@ import { map as __map, filter as __filter } from 'rxjs/operators';
 import { ResponseArgsOfQuerySettingsDTO } from '../models/response-args-of-query-settings-dto';
 import { ListResponseArgsOfProductListItemDTO } from '../models/list-response-args-of-product-list-item-dto';
 import { QueryTokenDTO } from '../models/query-token-dto';
+import { ResponseArgsOfProductListDTO } from '../models/response-args-of-product-list-dto';
+import { ProductListDTO } from '../models/product-list-dto';
+import { ProductListItemDTO } from '../models/product-list-item-dto';
 import { ResponseArgsOfString } from '../models/response-args-of-string';
 import { DocumentPayloadOfIEnumerableOfProductListItemDTO } from '../models/document-payload-of-ienumerable-of-product-list-item-dto';
 import { ListResponseArgsOfProductListDTO } from '../models/list-response-args-of-product-list-dto';
-import { ResponseArgsOfProductListDTO } from '../models/response-args-of-product-list-dto';
-import { ProductListDTO } from '../models/product-list-dto';
 import { ResponseArgsOfProductListItemDTO } from '../models/response-args-of-product-list-item-dto';
-import { ProductListItemDTO } from '../models/product-list-item-dto';
 import { BatchResponseArgsOfProductListItemDTOAndString } from '../models/batch-response-args-of-product-list-item-dtoand-string';
 @Injectable({
   providedIn: 'root',
@@ -24,6 +24,9 @@ import { BatchResponseArgsOfProductListItemDTOAndString } from '../models/batch-
 class ProductListService extends __BaseService {
   static readonly ProductListQueryProductListItemsSettingsPath = '/inventory/productlist/items/s/settings';
   static readonly ProductListQueryProductListItemPath = '/inventory/productlist/items/s';
+  static readonly ProductListGetProductListPath = '/inventory/productlist/key/{key}';
+  static readonly ProductListCreateOrUpdateProductlistPath = '/inventory/productlist/{key}';
+  static readonly ProductListAddOrUpdateProductListItemsPath = '/inventory/productlist/{key}/items';
   static readonly ProductListProductListItemPdfAsBase64Path = '/inventory/productlist/items/pdf/base64';
   static readonly ProductListQueryProductListPath = '/inventory/productlist/s';
   static readonly ProductListCreateProductListPath = '/inventory/productlist';
@@ -109,6 +112,132 @@ class ProductListService extends __BaseService {
     );
   }
 
+  /**
+   * Productliste by key
+   * @param key undefined
+   */
+  ProductListGetProductListResponse(key: string): __Observable<__StrictHttpResponse<ResponseArgsOfProductListDTO>> {
+    let __params = this.newParams();
+    let __headers = new HttpHeaders();
+    let __body: any = null;
+
+    let req = new HttpRequest<any>(
+      'GET',
+      this.rootUrl + `/inventory/productlist/key/${encodeURIComponent(String(key))}`,
+      __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<ResponseArgsOfProductListDTO>;
+      })
+    );
+  }
+  /**
+   * Productliste by key
+   * @param key undefined
+   */
+  ProductListGetProductList(key: string): __Observable<ResponseArgsOfProductListDTO> {
+    return this.ProductListGetProductListResponse(key).pipe(
+      __map(_r => _r.body as ResponseArgsOfProductListDTO)
+    );
+  }
+
+  /**
+   * Create or Update Productlist
+   * @param params The `ProductListService.ProductListCreateOrUpdateProductlistParams` containing the following parameters:
+   *
+   * - `payload`:
+   *
+   * - `key`:
+   */
+  ProductListCreateOrUpdateProductlistResponse(params: ProductListService.ProductListCreateOrUpdateProductlistParams): __Observable<__StrictHttpResponse<ResponseArgsOfProductListDTO>> {
+    let __params = this.newParams();
+    let __headers = new HttpHeaders();
+    let __body: any = null;
+    __body = params.payload;
+
+    let req = new HttpRequest<any>(
+      'POST',
+      this.rootUrl + `/inventory/productlist/${encodeURIComponent(String(params.key))}`,
+      __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<ResponseArgsOfProductListDTO>;
+      })
+    );
+  }
+  /**
+   * Create or Update Productlist
+   * @param params The `ProductListService.ProductListCreateOrUpdateProductlistParams` containing the following parameters:
+   *
+   * - `payload`:
+   *
+   * - `key`:
+   */
+  ProductListCreateOrUpdateProductlist(params: ProductListService.ProductListCreateOrUpdateProductlistParams): __Observable<ResponseArgsOfProductListDTO> {
+    return this.ProductListCreateOrUpdateProductlistResponse(params).pipe(
+      __map(_r => _r.body as ResponseArgsOfProductListDTO)
+    );
+  }
+
+  /**
+   * Add Or Update List Items
+   * @param params The `ProductListService.ProductListAddOrUpdateProductListItemsParams` containing the following parameters:
+   *
+   * - `payload`:
+   *
+   * - `key`:
+   */
+  ProductListAddOrUpdateProductListItemsResponse(params: ProductListService.ProductListAddOrUpdateProductListItemsParams): __Observable<__StrictHttpResponse<ListResponseArgsOfProductListItemDTO>> {
+    let __params = this.newParams();
+    let __headers = new HttpHeaders();
+    let __body: any = null;
+    __body = params.payload;
+
+    let req = new HttpRequest<any>(
+      'POST',
+      this.rootUrl + `/inventory/productlist/${encodeURIComponent(String(params.key))}/items`,
+      __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<ListResponseArgsOfProductListItemDTO>;
+      })
+    );
+  }
+  /**
+   * Add Or Update List Items
+   * @param params The `ProductListService.ProductListAddOrUpdateProductListItemsParams` containing the following parameters:
+   *
+   * - `payload`:
+   *
+   * - `key`:
+   */
+  ProductListAddOrUpdateProductListItems(params: ProductListService.ProductListAddOrUpdateProductListItemsParams): __Observable<ListResponseArgsOfProductListItemDTO> {
+    return this.ProductListAddOrUpdateProductListItemsResponse(params).pipe(
+      __map(_r => _r.body as ListResponseArgsOfProductListItemDTO)
+    );
+  }
+
   /**
    * Artikelliste als PDF (base64)
    * @param payload DocumentPayload mit EANsK
@@ -326,7 +455,7 @@ class ProductListService extends __BaseService {
   /**
    * @param productlistUId undefined
    */
-  ProductListProductlistCompletedResponse(productlistUId: null | string): __Observable<__StrictHttpResponse<ResponseArgsOfProductListDTO>> {
+  ProductListProductlistCompletedResponse(productlistUId: string): __Observable<__StrictHttpResponse<ResponseArgsOfProductListDTO>> {
     let __params = this.newParams();
     let __headers = new HttpHeaders();
     let __body: any = null;
@@ -351,7 +480,7 @@ class ProductListService extends __BaseService {
   /**
    * @param productlistUId undefined
    */
-  ProductListProductlistCompleted(productlistUId: null | string): __Observable<ResponseArgsOfProductListDTO> {
+  ProductListProductlistCompleted(productlistUId: string): __Observable<ResponseArgsOfProductListDTO> {
     return this.ProductListProductlistCompletedResponse(productlistUId).pipe(
       __map(_r => _r.body as ResponseArgsOfProductListDTO)
     );
@@ -451,7 +580,7 @@ class ProductListService extends __BaseService {
   /**
    * @param productListItemUId undefined
    */
-  ProductListProductListItemCompletedResponse(productListItemUId: null | string): __Observable<__StrictHttpResponse<ResponseArgsOfProductListItemDTO>> {
+  ProductListProductListItemCompletedResponse(productListItemUId: string): __Observable<__StrictHttpResponse<ResponseArgsOfProductListItemDTO>> {
     let __params = this.newParams();
     let __headers = new HttpHeaders();
     let __body: any = null;
@@ -476,7 +605,7 @@ class ProductListService extends __BaseService {
   /**
    * @param productListItemUId undefined
    */
-  ProductListProductListItemCompleted(productListItemUId: null | string): __Observable<ResponseArgsOfProductListItemDTO> {
+  ProductListProductListItemCompleted(productListItemUId: string): __Observable<ResponseArgsOfProductListItemDTO> {
     return this.ProductListProductListItemCompletedResponse(productListItemUId).pipe(
       __map(_r => _r.body as ResponseArgsOfProductListItemDTO)
     );
@@ -519,6 +648,22 @@ class ProductListService extends __BaseService {
 
 module ProductListService {
 
+  /**
+   * Parameters for ProductListCreateOrUpdateProductlist
+   */
+  export interface ProductListCreateOrUpdateProductlistParams {
+    payload: ProductListDTO;
+    key: string;
+  }
+
+  /**
+   * Parameters for ProductListAddOrUpdateProductListItems
+   */
+  export interface ProductListAddOrUpdateProductListItemsParams {
+    payload: Array<ProductListItemDTO>;
+    key: string;
+  }
+
   /**
    * Parameters for ProductListCreateProductList
    */
@@ -541,7 +686,7 @@ module ProductListService {
    * Parameters for ProductListGetProductlistItems
    */
   export interface ProductListGetProductlistItemsParams {
-    productlistUId: null | string;
+    productlistUId: string;
     take?: null | number;
     skip?: null | number;
   }
@@ -558,7 +703,7 @@ module ProductListService {
    * Parameters for ProductListUpdateProductListItem
    */
   export interface ProductListUpdateProductListItemParams {
-    productListItemUId: null | string;
+    productListItemUId: string;
     data: ProductListItemDTO;
     locale?: null | string;
   }

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

@@ -684,7 +684,7 @@ module StockService {
     /**
      * Filial-Nr
      */
-    branchNumber: null | string;
+    branchNumber: string;
 
     /**
      * Lokalisierung (optional)

apps/swagger/wws/src/lib/services/wareneingang.service.ts

@@ -102,7 +102,7 @@ class WareneingangService extends __BaseService {
    * Packstück-Details
    * @param packageId undefined
    */
-  WareneingangGetPackageDetailsResponse(packageId: null | string): __Observable<__StrictHttpResponse<ResponseArgsOfPackageDetailResponseDTO>> {
+  WareneingangGetPackageDetailsResponse(packageId: string): __Observable<__StrictHttpResponse<ResponseArgsOfPackageDetailResponseDTO>> {
     let __params = this.newParams();
     let __headers = new HttpHeaders();
     let __body: any = null;
@@ -128,7 +128,7 @@ class WareneingangService extends __BaseService {
    * Packstück-Details
    * @param packageId undefined
    */
-  WareneingangGetPackageDetails(packageId: null | string): __Observable<ResponseArgsOfPackageDetailResponseDTO> {
+  WareneingangGetPackageDetails(packageId: string): __Observable<ResponseArgsOfPackageDetailResponseDTO> {
     return this.WareneingangGetPackageDetailsResponse(packageId).pipe(
       __map(_r => _r.body as ResponseArgsOfPackageDetailResponseDTO)
     );
@@ -192,8 +192,8 @@ module WareneingangService {
    */
   export interface WareneingangChangePackageStatusParams {
     payload: PackageArrivalStatusDTO;
-    packageId: null | string;
-    modifier: null | string;
+    packageId: string;
+    modifier: string;
   }
 }