Merged PR 1763: #4547 Wareneingang // Kontrolle der Service Packstücke

#4547 Wareneingang // Kontrolle der Service Packstücke

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/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;
   }
 }