@ignos/api-client 20240614.0.9562 → 20240618.0.9588

package/lib/ignosportal-api.d.ts

@@ -532,9 +532,10 @@ export declare class TraceClient extends AuthorizedApiBase implements ITraceClie
 export interface IMoveBookingClient {
     listBookings(request: BookingRequestListDto): Promise<BookingListDto>;
     getBooking(bookingId: string): Promise<BookingDto>;
-    updateBooking(bookingId: string, bookingRequest: BookingRequestDto): Promise<BookingDto>;
+    updateBooking(bookingId: string, bookingRequest: BookingTransportRequestDto): Promise<BookingDto>;
     getWorkOrderBooking(workOrderId: string): Promise<BookingDto[]>;
-    createBooking(bookingRequest: BookingRequestDto): Promise<BookingDto>;
+    createBookingTransport(bookingRequest: BookingTransportRequestDto): Promise<BookingDto>;
+    createBookingGeneral(bookingRequest: BookingGeneralRequestDto): Promise<BookingDto>;
     cancelBooking(bookingUpdate: BookingUpdateDto): Promise<BookingDto>;
     revertBooking(bookingUpdate: BookingUpdateDto): Promise<BookingDto>;
     startDelivery(bookingUpdate: BookingUpdateDto): Promise<BookingDto>;
@@ -551,12 +552,14 @@ export declare class MoveBookingClient extends AuthorizedApiBase implements IMov
     protected processListBookings(response: Response): Promise<BookingListDto>;
     getBooking(bookingId: string): Promise<BookingDto>;
     protected processGetBooking(response: Response): Promise<BookingDto>;
-    updateBooking(bookingId: string, bookingRequest: BookingRequestDto): Promise<BookingDto>;
+    updateBooking(bookingId: string, bookingRequest: BookingTransportRequestDto): Promise<BookingDto>;
     protected processUpdateBooking(response: Response): Promise<BookingDto>;
     getWorkOrderBooking(workOrderId: string): Promise<BookingDto[]>;
     protected processGetWorkOrderBooking(response: Response): Promise<BookingDto[]>;
-    createBooking(bookingRequest: BookingRequestDto): Promise<BookingDto>;
-    protected processCreateBooking(response: Response): Promise<BookingDto>;
+    createBookingTransport(bookingRequest: BookingTransportRequestDto): Promise<BookingDto>;
+    protected processCreateBookingTransport(response: Response): Promise<BookingDto>;
+    createBookingGeneral(bookingRequest: BookingGeneralRequestDto): Promise<BookingDto>;
+    protected processCreateBookingGeneral(response: Response): Promise<BookingDto>;
     cancelBooking(bookingUpdate: BookingUpdateDto): Promise<BookingDto>;
     protected processCancelBooking(response: Response): Promise<BookingDto>;
     revertBooking(bookingUpdate: BookingUpdateDto): Promise<BookingDto>;
@@ -4098,7 +4101,8 @@ export interface IBookingListDto {
 }
 export declare class BookingDto implements IBookingDto {
     bookingId: string;
-    bookingType: BookingTypeDto;
+    bookingKind: BookingKindDto;
+    transportKind: TransportKindDto;
     status: BookingStatusDto;
     items: BookingItemDto[];
     fromLocation: LocationDto;
@@ -4115,7 +4119,8 @@ export declare class BookingDto implements IBookingDto {
 }
 export interface IBookingDto {
     bookingId: string;
-    bookingType: BookingTypeDto;
+    bookingKind: BookingKindDto;
+    transportKind: TransportKindDto;
     status: BookingStatusDto;
     items: BookingItemDto[];
     fromLocation: LocationDto;
@@ -4126,12 +4131,14 @@ export interface IBookingDto {
     updatedBy?: string | null;
     updatedById?: string | null;
 }
-export type BookingTypeDto = "NormalForklift" | "LargeForklift" | "SideLoadingForklift";
+export type BookingKindDto = "Forklift" | "General" | "ChipDisposal" | "Garbage";
+export type TransportKindDto = "NormalForklift" | "LargeForklift" | "SideLoadingForklift";
 export type BookingStatusDto = "Pending" | "Cancelled" | "InProgress" | "Delivered";
 export declare class BookingItemDto implements IBookingItemDto {
     trackingId: string;
-    workOrderId: string;
+    workOrderId?: string | null;
     material?: string | null;
+    comment?: string | null;
     constructor(data?: IBookingItemDto);
     init(_data?: any): void;
     static fromJS(data: any): BookingItemDto;
@@ -4139,8 +4146,9 @@ export declare class BookingItemDto implements IBookingItemDto {
 }
 export interface IBookingItemDto {
     trackingId: string;
-    workOrderId: string;
+    workOrderId?: string | null;
     material?: string | null;
+    comment?: string | null;
 }
 export declare class LocationDto implements ILocationDto {
     locationId: string;
@@ -4176,18 +4184,20 @@ export interface IBookingRequestListDto {
     continuationToken?: string | null;
 }
 export type BookingOrderDto = "Ascending" | "Descending";
-export declare class BookingRequestDto implements IBookingRequestDto {
-    bookingType: BookingTypeDto;
+export declare class BookingTransportRequestDto implements IBookingTransportRequestDto {
+    transportKind: TransportKindDto;
+    bookingKind: BookingKindDto;
     items: BookingItemRequestDto[];
     fromLocationId: string;
     toLocationId: string;
-    constructor(data?: IBookingRequestDto);
+    constructor(data?: IBookingTransportRequestDto);
     init(_data?: any): void;
-    static fromJS(data: any): BookingRequestDto;
+    static fromJS(data: any): BookingTransportRequestDto;
     toJSON(data?: any): any;
 }
-export interface IBookingRequestDto {
-    bookingType: BookingTypeDto;
+export interface IBookingTransportRequestDto {
+    transportKind: TransportKindDto;
+    bookingKind: BookingKindDto;
     items: BookingItemRequestDto[];
     fromLocationId: string;
     toLocationId: string;
@@ -4204,9 +4214,28 @@ export interface IBookingItemRequestDto {
     trackingId: string;
     comment?: string | null;
 }
+export declare class BookingGeneralRequestDto implements IBookingGeneralRequestDto {
+    bookingKind: BookingKindDto;
+    transportKind: TransportKindDto;
+    fromLocationId: string;
+    toLocationId: string;
+    material?: string | null;
+    comment?: string | null;
+    constructor(data?: IBookingGeneralRequestDto);
+    init(_data?: any): void;
+    static fromJS(data: any): BookingGeneralRequestDto;
+    toJSON(data?: any): any;
+}
+export interface IBookingGeneralRequestDto {
+    bookingKind: BookingKindDto;
+    transportKind: TransportKindDto;
+    fromLocationId: string;
+    toLocationId: string;
+    material?: string | null;
+    comment?: string | null;
+}
 export declare class BookingUpdateDto implements IBookingUpdateDto {
     bookingId: string;
-    comment?: string | null;
     constructor(data?: IBookingUpdateDto);
     init(_data?: any): void;
     static fromJS(data: any): BookingUpdateDto;
@@ -4214,11 +4243,9 @@ export declare class BookingUpdateDto implements IBookingUpdateDto {
 }
 export interface IBookingUpdateDto {
     bookingId: string;
-    comment?: string | null;
 }
 export declare class BookingDeliveryUpdateDto implements IBookingDeliveryUpdateDto {
     bookingId: string;
-    comment?: string | null;
     deliveryExceptions?: BookingDeliveryExceptionDto[] | null;
     constructor(data?: IBookingDeliveryUpdateDto);
     init(_data?: any): void;
@@ -4227,7 +4254,6 @@ export declare class BookingDeliveryUpdateDto implements IBookingDeliveryUpdateD
 }
 export interface IBookingDeliveryUpdateDto {
     bookingId: string;
-    comment?: string | null;
     deliveryExceptions?: BookingDeliveryExceptionDto[] | null;
 }
 export declare class BookingDeliveryExceptionDto implements IBookingDeliveryExceptionDto {
@@ -4247,7 +4273,7 @@ export interface IBookingDeliveryExceptionDto {
 export declare class TrackingHistoryDto implements ITrackingHistoryDto {
     trackingId: string;
     palletNumber: number;
-    workOrderId: string;
+    workOrderId?: string | null;
     trackingEvents: TrackingEventDto[];
     constructor(data?: ITrackingHistoryDto);
     init(_data?: any): void;
@@ -4257,7 +4283,7 @@ export declare class TrackingHistoryDto implements ITrackingHistoryDto {
 export interface ITrackingHistoryDto {
     trackingId: string;
     palletNumber: number;
-    workOrderId: string;
+    workOrderId?: string | null;
     trackingEvents: TrackingEventDto[];
 }
 export declare class TrackingEventDto implements ITrackingEventDto {

package/lib/ignosportal-api.js

@@ -3630,8 +3630,8 @@ export class MoveBookingClient extends AuthorizedApiBase {
         }
         return Promise.resolve(null);
     }
-    createBooking(bookingRequest) {
-        let url_ = this.baseUrl + "/move/booking/book";
+    createBookingTransport(bookingRequest) {
+        let url_ = this.baseUrl + "/move/booking/book/transport";
         url_ = url_.replace(/[?&]$/, "");
         const content_ = JSON.stringify(bookingRequest);
         let options_ = {
@@ -3645,10 +3645,50 @@ export class MoveBookingClient extends AuthorizedApiBase {
         return this.transformOptions(options_).then(transformedOptions_ => {
             return this.http.fetch(url_, transformedOptions_);
         }).then((_response) => {
-            return this.processCreateBooking(_response);
+            return this.processCreateBookingTransport(_response);
         });
     }
-    processCreateBooking(response) {
+    processCreateBookingTransport(response) {
+        const status = response.status;
+        let _headers = {};
+        if (response.headers && response.headers.forEach) {
+            response.headers.forEach((v, k) => _headers[k] = v);
+        }
+        ;
+        if (status === 200) {
+            return response.text().then((_responseText) => {
+                let result200 = null;
+                let resultData200 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
+                result200 = BookingDto.fromJS(resultData200);
+                return result200;
+            });
+        }
+        else if (status !== 200 && status !== 204) {
+            return response.text().then((_responseText) => {
+                return throwException("An unexpected server error occurred.", status, _responseText, _headers);
+            });
+        }
+        return Promise.resolve(null);
+    }
+    createBookingGeneral(bookingRequest) {
+        let url_ = this.baseUrl + "/move/booking/book/general";
+        url_ = url_.replace(/[?&]$/, "");
+        const content_ = JSON.stringify(bookingRequest);
+        let options_ = {
+            body: content_,
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                "Accept": "application/json"
+            }
+        };
+        return this.transformOptions(options_).then(transformedOptions_ => {
+            return this.http.fetch(url_, transformedOptions_);
+        }).then((_response) => {
+            return this.processCreateBookingGeneral(_response);
+        });
+    }
+    processCreateBookingGeneral(response) {
         const status = response.status;
         let _headers = {};
         if (response.headers && response.headers.forEach) {
@@ -22384,7 +22424,8 @@ export class BookingDto {
     init(_data) {
         if (_data) {
             this.bookingId = _data["bookingId"];
-            this.bookingType = _data["bookingType"];
+            this.bookingKind = _data["bookingKind"];
+            this.transportKind = _data["transportKind"];
             this.status = _data["status"];
             if (Array.isArray(_data["items"])) {
                 this.items = [];
@@ -22409,7 +22450,8 @@ export class BookingDto {
     toJSON(data) {
         data = typeof data === 'object' ? data : {};
         data["bookingId"] = this.bookingId;
-        data["bookingType"] = this.bookingType;
+        data["bookingKind"] = this.bookingKind;
+        data["transportKind"] = this.transportKind;
         data["status"] = this.status;
         if (Array.isArray(this.items)) {
             data["items"] = [];
@@ -22440,6 +22482,7 @@ export class BookingItemDto {
             this.trackingId = _data["trackingId"];
             this.workOrderId = _data["workOrderId"];
             this.material = _data["material"];
+            this.comment = _data["comment"];
         }
     }
     static fromJS(data) {
@@ -22453,6 +22496,7 @@ export class BookingItemDto {
         data["trackingId"] = this.trackingId;
         data["workOrderId"] = this.workOrderId;
         data["material"] = this.material;
+        data["comment"] = this.comment;
         return data;
     }
 }
@@ -22528,7 +22572,7 @@ export class BookingRequestListDto {
         return data;
     }
 }
-export class BookingRequestDto {
+export class BookingTransportRequestDto {
     constructor(data) {
         if (data) {
             for (var property in data) {
@@ -22542,7 +22586,8 @@ export class BookingRequestDto {
     }
     init(_data) {
         if (_data) {
-            this.bookingType = _data["bookingType"];
+            this.transportKind = _data["transportKind"];
+            this.bookingKind = _data["bookingKind"];
             if (Array.isArray(_data["items"])) {
                 this.items = [];
                 for (let item of _data["items"])
@@ -22554,13 +22599,14 @@ export class BookingRequestDto {
     }
     static fromJS(data) {
         data = typeof data === 'object' ? data : {};
-        let result = new BookingRequestDto();
+        let result = new BookingTransportRequestDto();
         result.init(data);
         return result;
     }
     toJSON(data) {
         data = typeof data === 'object' ? data : {};
-        data["bookingType"] = this.bookingType;
+        data["transportKind"] = this.transportKind;
+        data["bookingKind"] = this.bookingKind;
         if (Array.isArray(this.items)) {
             data["items"] = [];
             for (let item of this.items)
@@ -22599,6 +22645,42 @@ export class BookingItemRequestDto {
         return data;
     }
 }
+export class BookingGeneralRequestDto {
+    constructor(data) {
+        if (data) {
+            for (var property in data) {
+                if (data.hasOwnProperty(property))
+                    this[property] = data[property];
+            }
+        }
+    }
+    init(_data) {
+        if (_data) {
+            this.bookingKind = _data["bookingKind"];
+            this.transportKind = _data["transportKind"];
+            this.fromLocationId = _data["fromLocationId"];
+            this.toLocationId = _data["toLocationId"];
+            this.material = _data["material"];
+            this.comment = _data["comment"];
+        }
+    }
+    static fromJS(data) {
+        data = typeof data === 'object' ? data : {};
+        let result = new BookingGeneralRequestDto();
+        result.init(data);
+        return result;
+    }
+    toJSON(data) {
+        data = typeof data === 'object' ? data : {};
+        data["bookingKind"] = this.bookingKind;
+        data["transportKind"] = this.transportKind;
+        data["fromLocationId"] = this.fromLocationId;
+        data["toLocationId"] = this.toLocationId;
+        data["material"] = this.material;
+        data["comment"] = this.comment;
+        return data;
+    }
+}
 export class BookingUpdateDto {
     constructor(data) {
         if (data) {
@@ -22611,7 +22693,6 @@ export class BookingUpdateDto {
     init(_data) {
         if (_data) {
             this.bookingId = _data["bookingId"];
-            this.comment = _data["comment"];
         }
     }
     static fromJS(data) {
@@ -22623,7 +22704,6 @@ export class BookingUpdateDto {
     toJSON(data) {
         data = typeof data === 'object' ? data : {};
         data["bookingId"] = this.bookingId;
-        data["comment"] = this.comment;
         return data;
     }
 }
@@ -22639,7 +22719,6 @@ export class BookingDeliveryUpdateDto {
     init(_data) {
         if (_data) {
             this.bookingId = _data["bookingId"];
-            this.comment = _data["comment"];
             if (Array.isArray(_data["deliveryExceptions"])) {
                 this.deliveryExceptions = [];
                 for (let item of _data["deliveryExceptions"])
@@ -22656,7 +22735,6 @@ export class BookingDeliveryUpdateDto {
     toJSON(data) {
         data = typeof data === 'object' ? data : {};
         data["bookingId"] = this.bookingId;
-        data["comment"] = this.comment;
         if (Array.isArray(this.deliveryExceptions)) {
             data["deliveryExceptions"] = [];
             for (let item of this.deliveryExceptions)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ignos/api-client",
-  "version": "20240614.0.9562",
+  "version": "20240618.0.9588",
   "description": "IGNOS API Client",
   "type": "module",
   "main": "lib/index.js",

package/src/ignosportal-api.ts

@@ -3751,11 +3751,13 @@ export interface IMoveBookingClient {
 
     getBooking(bookingId: string): Promise<BookingDto>;
 
-    updateBooking(bookingId: string, bookingRequest: BookingRequestDto): Promise<BookingDto>;
+    updateBooking(bookingId: string, bookingRequest: BookingTransportRequestDto): Promise<BookingDto>;
 
     getWorkOrderBooking(workOrderId: string): Promise<BookingDto[]>;
 
-    createBooking(bookingRequest: BookingRequestDto): Promise<BookingDto>;
+    createBookingTransport(bookingRequest: BookingTransportRequestDto): Promise<BookingDto>;
+
+    createBookingGeneral(bookingRequest: BookingGeneralRequestDto): Promise<BookingDto>;
 
     cancelBooking(bookingUpdate: BookingUpdateDto): Promise<BookingDto>;
 
@@ -3856,7 +3858,7 @@ export class MoveBookingClient extends AuthorizedApiBase implements IMoveBooking
         return Promise.resolve<BookingDto>(null as any);
     }
 
-    updateBooking(bookingId: string, bookingRequest: BookingRequestDto): Promise<BookingDto> {
+    updateBooking(bookingId: string, bookingRequest: BookingTransportRequestDto): Promise<BookingDto> {
         let url_ = this.baseUrl + "/move/booking/{bookingId}";
         if (bookingId === undefined || bookingId === null)
             throw new Error("The parameter 'bookingId' must be defined.");
@@ -3942,8 +3944,8 @@ export class MoveBookingClient extends AuthorizedApiBase implements IMoveBooking
         return Promise.resolve<BookingDto[]>(null as any);
     }
 
-    createBooking(bookingRequest: BookingRequestDto): Promise<BookingDto> {
-        let url_ = this.baseUrl + "/move/booking/book";
+    createBookingTransport(bookingRequest: BookingTransportRequestDto): Promise<BookingDto> {
+        let url_ = this.baseUrl + "/move/booking/book/transport";
         url_ = url_.replace(/[?&]$/, "");
 
         const content_ = JSON.stringify(bookingRequest);
@@ -3960,11 +3962,51 @@ export class MoveBookingClient extends AuthorizedApiBase implements IMoveBooking
         return this.transformOptions(options_).then(transformedOptions_ => {
             return this.http.fetch(url_, transformedOptions_);
         }).then((_response: Response) => {
-            return this.processCreateBooking(_response);
+            return this.processCreateBookingTransport(_response);
         });
     }
 
-    protected processCreateBooking(response: Response): Promise<BookingDto> {
+    protected processCreateBookingTransport(response: Response): Promise<BookingDto> {
+        const status = response.status;
+        let _headers: any = {}; if (response.headers && response.headers.forEach) { response.headers.forEach((v: any, k: any) => _headers[k] = v); };
+        if (status === 200) {
+            return response.text().then((_responseText) => {
+            let result200: any = null;
+            let resultData200 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
+            result200 = BookingDto.fromJS(resultData200);
+            return result200;
+            });
+        } else if (status !== 200 && status !== 204) {
+            return response.text().then((_responseText) => {
+            return throwException("An unexpected server error occurred.", status, _responseText, _headers);
+            });
+        }
+        return Promise.resolve<BookingDto>(null as any);
+    }
+
+    createBookingGeneral(bookingRequest: BookingGeneralRequestDto): Promise<BookingDto> {
+        let url_ = this.baseUrl + "/move/booking/book/general";
+        url_ = url_.replace(/[?&]$/, "");
+
+        const content_ = JSON.stringify(bookingRequest);
+
+        let options_: RequestInit = {
+            body: content_,
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                "Accept": "application/json"
+            }
+        };
+
+        return this.transformOptions(options_).then(transformedOptions_ => {
+            return this.http.fetch(url_, transformedOptions_);
+        }).then((_response: Response) => {
+            return this.processCreateBookingGeneral(_response);
+        });
+    }
+
+    protected processCreateBookingGeneral(response: Response): Promise<BookingDto> {
         const status = response.status;
         let _headers: any = {}; if (response.headers && response.headers.forEach) { response.headers.forEach((v: any, k: any) => _headers[k] = v); };
         if (status === 200) {
@@ -25501,7 +25543,8 @@ export interface IBookingListDto {
 
 export class BookingDto implements IBookingDto {
     bookingId!: string;
-    bookingType!: BookingTypeDto;
+    bookingKind!: BookingKindDto;
+    transportKind!: TransportKindDto;
     status!: BookingStatusDto;
     items!: BookingItemDto[];
     fromLocation!: LocationDto;
@@ -25529,7 +25572,8 @@ export class BookingDto implements IBookingDto {
     init(_data?: any) {
         if (_data) {
             this.bookingId = _data["bookingId"];
-            this.bookingType = _data["bookingType"];
+            this.bookingKind = _data["bookingKind"];
+            this.transportKind = _data["transportKind"];
             this.status = _data["status"];
             if (Array.isArray(_data["items"])) {
                 this.items = [] as any;
@@ -25556,7 +25600,8 @@ export class BookingDto implements IBookingDto {
     toJSON(data?: any) {
         data = typeof data === 'object' ? data : {};
         data["bookingId"] = this.bookingId;
-        data["bookingType"] = this.bookingType;
+        data["bookingKind"] = this.bookingKind;
+        data["transportKind"] = this.transportKind;
         data["status"] = this.status;
         if (Array.isArray(this.items)) {
             data["items"] = [];
@@ -25576,7 +25621,8 @@ export class BookingDto implements IBookingDto {
 
 export interface IBookingDto {
     bookingId: string;
-    bookingType: BookingTypeDto;
+    bookingKind: BookingKindDto;
+    transportKind: TransportKindDto;
     status: BookingStatusDto;
     items: BookingItemDto[];
     fromLocation: LocationDto;
@@ -25588,14 +25634,17 @@ export interface IBookingDto {
     updatedById?: string | null;
 }
 
-export type BookingTypeDto = "NormalForklift" | "LargeForklift" | "SideLoadingForklift";
+export type BookingKindDto = "Forklift" | "General" | "ChipDisposal" | "Garbage";
+
+export type TransportKindDto = "NormalForklift" | "LargeForklift" | "SideLoadingForklift";
 
 export type BookingStatusDto = "Pending" | "Cancelled" | "InProgress" | "Delivered";
 
 export class BookingItemDto implements IBookingItemDto {
     trackingId!: string;
-    workOrderId!: string;
+    workOrderId?: string | null;
     material?: string | null;
+    comment?: string | null;
 
     constructor(data?: IBookingItemDto) {
         if (data) {
@@ -25611,6 +25660,7 @@ export class BookingItemDto implements IBookingItemDto {
             this.trackingId = _data["trackingId"];
             this.workOrderId = _data["workOrderId"];
             this.material = _data["material"];
+            this.comment = _data["comment"];
         }
     }
 
@@ -25626,14 +25676,16 @@ export class BookingItemDto implements IBookingItemDto {
         data["trackingId"] = this.trackingId;
         data["workOrderId"] = this.workOrderId;
         data["material"] = this.material;
+        data["comment"] = this.comment;
         return data;
     }
 }
 
 export interface IBookingItemDto {
     trackingId: string;
-    workOrderId: string;
+    workOrderId?: string | null;
     material?: string | null;
+    comment?: string | null;
 }
 
 export class LocationDto implements ILocationDto {
@@ -25744,13 +25796,14 @@ export interface IBookingRequestListDto {
 
 export type BookingOrderDto = "Ascending" | "Descending";
 
-export class BookingRequestDto implements IBookingRequestDto {
-    bookingType!: BookingTypeDto;
+export class BookingTransportRequestDto implements IBookingTransportRequestDto {
+    transportKind!: TransportKindDto;
+    bookingKind!: BookingKindDto;
     items!: BookingItemRequestDto[];
     fromLocationId!: string;
     toLocationId!: string;
 
-    constructor(data?: IBookingRequestDto) {
+    constructor(data?: IBookingTransportRequestDto) {
         if (data) {
             for (var property in data) {
                 if (data.hasOwnProperty(property))
@@ -25764,7 +25817,8 @@ export class BookingRequestDto implements IBookingRequestDto {
 
     init(_data?: any) {
         if (_data) {
-            this.bookingType = _data["bookingType"];
+            this.transportKind = _data["transportKind"];
+            this.bookingKind = _data["bookingKind"];
             if (Array.isArray(_data["items"])) {
                 this.items = [] as any;
                 for (let item of _data["items"])
@@ -25775,16 +25829,17 @@ export class BookingRequestDto implements IBookingRequestDto {
         }
     }
 
-    static fromJS(data: any): BookingRequestDto {
+    static fromJS(data: any): BookingTransportRequestDto {
         data = typeof data === 'object' ? data : {};
-        let result = new BookingRequestDto();
+        let result = new BookingTransportRequestDto();
         result.init(data);
         return result;
     }
 
     toJSON(data?: any) {
         data = typeof data === 'object' ? data : {};
-        data["bookingType"] = this.bookingType;
+        data["transportKind"] = this.transportKind;
+        data["bookingKind"] = this.bookingKind;
         if (Array.isArray(this.items)) {
             data["items"] = [];
             for (let item of this.items)
@@ -25796,8 +25851,9 @@ export class BookingRequestDto implements IBookingRequestDto {
     }
 }
 
-export interface IBookingRequestDto {
-    bookingType: BookingTypeDto;
+export interface IBookingTransportRequestDto {
+    transportKind: TransportKindDto;
+    bookingKind: BookingKindDto;
     items: BookingItemRequestDto[];
     fromLocationId: string;
     toLocationId: string;
@@ -25843,9 +25899,64 @@ export interface IBookingItemRequestDto {
     comment?: string | null;
 }
 
+export class BookingGeneralRequestDto implements IBookingGeneralRequestDto {
+    bookingKind!: BookingKindDto;
+    transportKind!: TransportKindDto;
+    fromLocationId!: string;
+    toLocationId!: string;
+    material?: string | null;
+    comment?: string | null;
+
+    constructor(data?: IBookingGeneralRequestDto) {
+        if (data) {
+            for (var property in data) {
+                if (data.hasOwnProperty(property))
+                    (<any>this)[property] = (<any>data)[property];
+            }
+        }
+    }
+
+    init(_data?: any) {
+        if (_data) {
+            this.bookingKind = _data["bookingKind"];
+            this.transportKind = _data["transportKind"];
+            this.fromLocationId = _data["fromLocationId"];
+            this.toLocationId = _data["toLocationId"];
+            this.material = _data["material"];
+            this.comment = _data["comment"];
+        }
+    }
+
+    static fromJS(data: any): BookingGeneralRequestDto {
+        data = typeof data === 'object' ? data : {};
+        let result = new BookingGeneralRequestDto();
+        result.init(data);
+        return result;
+    }
+
+    toJSON(data?: any) {
+        data = typeof data === 'object' ? data : {};
+        data["bookingKind"] = this.bookingKind;
+        data["transportKind"] = this.transportKind;
+        data["fromLocationId"] = this.fromLocationId;
+        data["toLocationId"] = this.toLocationId;
+        data["material"] = this.material;
+        data["comment"] = this.comment;
+        return data;
+    }
+}
+
+export interface IBookingGeneralRequestDto {
+    bookingKind: BookingKindDto;
+    transportKind: TransportKindDto;
+    fromLocationId: string;
+    toLocationId: string;
+    material?: string | null;
+    comment?: string | null;
+}
+
 export class BookingUpdateDto implements IBookingUpdateDto {
     bookingId!: string;
-    comment?: string | null;
 
     constructor(data?: IBookingUpdateDto) {
         if (data) {
@@ -25859,7 +25970,6 @@ export class BookingUpdateDto implements IBookingUpdateDto {
     init(_data?: any) {
         if (_data) {
             this.bookingId = _data["bookingId"];
-            this.comment = _data["comment"];
         }
     }
 
@@ -25873,19 +25983,16 @@ export class BookingUpdateDto implements IBookingUpdateDto {
     toJSON(data?: any) {
         data = typeof data === 'object' ? data : {};
         data["bookingId"] = this.bookingId;
-        data["comment"] = this.comment;
         return data;
     }
 }
 
 export interface IBookingUpdateDto {
     bookingId: string;
-    comment?: string | null;
 }
 
 export class BookingDeliveryUpdateDto implements IBookingDeliveryUpdateDto {
     bookingId!: string;
-    comment?: string | null;
     deliveryExceptions?: BookingDeliveryExceptionDto[] | null;
 
     constructor(data?: IBookingDeliveryUpdateDto) {
@@ -25900,7 +26007,6 @@ export class BookingDeliveryUpdateDto implements IBookingDeliveryUpdateDto {
     init(_data?: any) {
         if (_data) {
             this.bookingId = _data["bookingId"];
-            this.comment = _data["comment"];
             if (Array.isArray(_data["deliveryExceptions"])) {
                 this.deliveryExceptions = [] as any;
                 for (let item of _data["deliveryExceptions"])
@@ -25919,7 +26025,6 @@ export class BookingDeliveryUpdateDto implements IBookingDeliveryUpdateDto {
     toJSON(data?: any) {
         data = typeof data === 'object' ? data : {};
         data["bookingId"] = this.bookingId;
-        data["comment"] = this.comment;
         if (Array.isArray(this.deliveryExceptions)) {
             data["deliveryExceptions"] = [];
             for (let item of this.deliveryExceptions)
@@ -25931,7 +26036,6 @@ export class BookingDeliveryUpdateDto implements IBookingDeliveryUpdateDto {
 
 export interface IBookingDeliveryUpdateDto {
     bookingId: string;
-    comment?: string | null;
     deliveryExceptions?: BookingDeliveryExceptionDto[] | null;
 }
 
@@ -25982,7 +26086,7 @@ export interface IBookingDeliveryExceptionDto {
 export class TrackingHistoryDto implements ITrackingHistoryDto {
     trackingId!: string;
     palletNumber!: number;
-    workOrderId!: string;
+    workOrderId?: string | null;
     trackingEvents!: TrackingEventDto[];
 
     constructor(data?: ITrackingHistoryDto) {
@@ -26034,7 +26138,7 @@ export class TrackingHistoryDto implements ITrackingHistoryDto {
 export interface ITrackingHistoryDto {
     trackingId: string;
     palletNumber: number;
-    workOrderId: string;
+    workOrderId?: string | null;
     trackingEvents: TrackingEventDto[];
 }