@colijnit/sharedcomponents 254.1.2 → 254.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/colijnit-sharedcomponents.umd.js +97 -31
- package/bundles/colijnit-sharedcomponents.umd.js.map +1 -1
- package/colijnit-sharedcomponents.metadata.json +1 -1
- package/esm2015/lib/components/activity-list/activity-list.component.js +7 -3
- package/esm2015/lib/components/open-activity-list/component-activity-list.component.js +7 -1
- package/esm2015/lib/components/stock/components/stock-location/components/stock-location-popup/stock-location-popup.component.js +3 -3
- package/esm2015/lib/components/stock/components/stock-location/stock-location.component.js +28 -2
- package/esm2015/lib/components/stock/localization/translation.js +3 -1
- package/esm2015/lib/components/stock/stock-tabs/stock-tabs.component.js +7 -2
- package/esm2015/lib/components/stock/stock-transfer/stock-transfer.component.js +144 -85
- package/esm2015/lib/components/stock/stock.component.js +11 -42
- package/esm2015/lib/components/stock/stock.module.js +4 -3
- package/fesm2015/colijnit-sharedcomponents.js +201 -132
- package/fesm2015/colijnit-sharedcomponents.js.map +1 -1
- package/index.html +2 -2
- package/lib/components/activity-list/style/_layout.scss +17 -6
- package/lib/components/open-activity-list/component-activity-list.component.d.ts +1 -0
- package/lib/components/stock/components/stock-location/stock-location.component.d.ts +7 -1
- package/lib/components/stock/localization/translation.d.ts +2 -0
- package/lib/components/stock/stock-tabs/stock-tabs.component.d.ts +2 -0
- package/lib/components/stock/stock-transfer/stock-transfer.component.d.ts +19 -6
- package/lib/components/stock/stock.component.d.ts +3 -0
- package/lib/components/stock/style/_layout.scss +64 -31
- package/lib/style/_variables.scss +2 -0
- package/{main.894c3ac9caba556953e2.js → main.b62bfdc80736ecda90e4.js} +1 -1
- package/package.json +1 -1
- package/{styles.b92683eab3a233f3fb51.css → styles.051675db76590b099897.css} +1 -1
|
@@ -38,8 +38,8 @@ import { ArticleStock as ArticleStock$1 } from '@colijnit/articleapi/build/model
|
|
|
38
38
|
import { ArticleExtendedRequest } from '@colijnit/articleapi/build/model/article-extended-request';
|
|
39
39
|
import * as i1 from '@angular/platform-browser';
|
|
40
40
|
import { DomSanitizer } from '@angular/platform-browser';
|
|
41
|
-
import { IconModule, InputCheckboxModule, CoDialogModule, ButtonModule, ListOfValuesModule, OverlayService, ClickoutsideModule, OverlayModule, InputRadioButtonModule, SimpleGridModule, ImageModule, InputTextModule, InputNumberPickerModule, CoDialogWizardModule, InputTextareaModule, PopupModule, ResponsiveTextModule, InputDatePickerModule, InputSearchModule, PromptService, FormComponent, SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME, CoOrientation, CoreComponentsTranslationModule, TemplateWrapperModule, FormModule, ScreenConfigurationModule, FormMasterService, IconCacheService as IconCacheService$1, CoreDialogService, InputDateRangePickerModule, CollapsibleModule, ColorSequenceService } from '@colijnit/corecomponents_v12';
|
|
42
41
|
import { ArticleStockManagement } from '@colijnit/articleapi/build/model/article-stock-management';
|
|
42
|
+
import { IconModule, InputCheckboxModule, CoDialogModule, ButtonModule, ListOfValuesModule, OverlayService, ClickoutsideModule, OverlayModule, InputRadioButtonModule, SimpleGridModule, ImageModule, InputTextModule, InputNumberPickerModule, CoDialogWizardModule, InputTextareaModule, PopupModule, InputDatePickerModule, ResponsiveTextModule, InputSearchModule, PromptService, FormComponent, SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME, CoOrientation, CoreComponentsTranslationModule, TemplateWrapperModule, FormModule, ScreenConfigurationModule, FormMasterService, IconCacheService as IconCacheService$1, CoreDialogService, InputDateRangePickerModule, CollapsibleModule, ColorSequenceService } from '@colijnit/corecomponents_v12';
|
|
43
43
|
import { ArticleTransaction as ArticleTransaction$1 } from '@colijnit/articleapi/build/model/article-transaction';
|
|
44
44
|
import { PrintPriceStickers } from '@colijnit/sharedapi/build/model/print-price-stickers.bo';
|
|
45
45
|
import { ReportingDocumentEmailSignDocBaseRequest } from '@colijnit/mainapi/build/model/reporting-document-email-sign-doc-base-request';
|
|
@@ -1613,10 +1613,12 @@ class StockComponent {
|
|
|
1613
1613
|
this.okButtonClicked = new EventEmitter();
|
|
1614
1614
|
this.cancelButtonClicked = new EventEmitter();
|
|
1615
1615
|
this.handleClick = new EventEmitter();
|
|
1616
|
+
this.updateGridData = new EventEmitter();
|
|
1616
1617
|
this.loaded = false;
|
|
1617
1618
|
this.showStockInformationGrid = true;
|
|
1618
1619
|
this.showStockTransfer = false;
|
|
1619
1620
|
this.stockInformation = [];
|
|
1621
|
+
this.articleDetailsInformation = new ArticleStockManagement();
|
|
1620
1622
|
this.stockHistory = [];
|
|
1621
1623
|
this.allAvailableStock = 0;
|
|
1622
1624
|
this.allTechnicalStock = 0;
|
|
@@ -1664,7 +1666,12 @@ class StockComponent {
|
|
|
1664
1666
|
data.entryDate = new Date;
|
|
1665
1667
|
this._stockService.updateArticleDetails(data).then(result => {
|
|
1666
1668
|
this.handleClick.emit();
|
|
1669
|
+
this._stockService.getArticleDetails(this.articleDetailsInformation).then((details) => {
|
|
1670
|
+
this.updateGridData.emit(details);
|
|
1671
|
+
});
|
|
1667
1672
|
});
|
|
1673
|
+
this.loaded = true;
|
|
1674
|
+
this.loadData();
|
|
1668
1675
|
}
|
|
1669
1676
|
backToStock(goodId) {
|
|
1670
1677
|
this.loadData();
|
|
@@ -1753,48 +1760,9 @@ StockComponent.decorators = [
|
|
|
1753
1760
|
(transferIconClicked)="handleStockTransferClick($event)"
|
|
1754
1761
|
(sendMethodDialogClicked)="handleSendMethodClick($event)"
|
|
1755
1762
|
[warehouses]="warehouses"
|
|
1756
|
-
|
|
1757
|
-
<div class="stock-transfer-wrapper">
|
|
1758
|
-
<co-dialog *ngIf="showStockTransfer"
|
|
1759
|
-
(closeClick)="showStockTransfer = false"
|
|
1760
|
-
[showCloseIcon]="true"
|
|
1761
|
-
[modal]="true"
|
|
1762
|
-
[headerTemplate]="headerTemplate"
|
|
1763
|
-
[footerTemplate]="footerTemplate">
|
|
1764
|
-
<ng-template #headerTemplate>
|
|
1765
|
-
<div class="co-dialog-header-title-wrapper">
|
|
1766
|
-
<co-icon [iconData]="iconCacheService.getIcon(icons.Cubes)"></co-icon>
|
|
1767
|
-
<div class="co-dialog-header-title" [textContent]="'TRANSFER_STOCK' | localize"></div>
|
|
1768
|
-
</div>
|
|
1769
|
-
</ng-template>
|
|
1770
|
-
<div class="dialog-wrapper">
|
|
1771
|
-
<co-stock-transfer (handleClick)="backToStock($event)"
|
|
1772
|
-
class="stock-transfer-dialog"
|
|
1773
|
-
[article]="stockTransferArticle"
|
|
1774
|
-
[articleToTransfer]="stockTransferArticleDetails"
|
|
1775
|
-
(handleStickerClicked)="handleStickerClicked.emit($event)"
|
|
1776
|
-
[articleWarehouse]="articleWarehouse"
|
|
1777
|
-
[allWarehouses]="allWarehouses">
|
|
1778
|
-
</co-stock-transfer>
|
|
1779
|
-
</div>
|
|
1780
|
-
<ng-template #footerTemplate>
|
|
1781
|
-
<div class="button-wrapper ok-cancel-buttons">
|
|
1782
|
-
<co-button class="save-button"
|
|
1783
|
-
(click)="handleOkClick(stockTransferArticleDetails)"
|
|
1784
|
-
[iconData]="iconCacheService.getIcon(icons.CheckDuotone)">
|
|
1785
|
-
</co-button>
|
|
1786
|
-
<co-button class="cancel-button"
|
|
1787
|
-
(click)="showStockTransfer = false"
|
|
1788
|
-
[iconData]="iconCacheService.getIcon(icons.CrossSkinny)">
|
|
1789
|
-
</co-button>
|
|
1790
|
-
</div>
|
|
1791
|
-
</ng-template>
|
|
1792
|
-
</co-dialog>
|
|
1793
|
-
</div>
|
|
1763
|
+
[showStockTransfer]="showStockTransfer"
|
|
1794
1764
|
|
|
1795
|
-
|
|
1796
|
-
|
|
1797
|
-
</co-send-method-dialog>
|
|
1765
|
+
></co-stock-tabs>
|
|
1798
1766
|
</div>
|
|
1799
1767
|
`,
|
|
1800
1768
|
encapsulation: ViewEncapsulation.None
|
|
@@ -2316,15 +2284,24 @@ StockInformationGridComponent.propDecorators = {
|
|
|
2316
2284
|
};
|
|
2317
2285
|
|
|
2318
2286
|
class StockTransferComponent {
|
|
2319
|
-
constructor(_stockService, iconCacheService) {
|
|
2287
|
+
constructor(_stockService, iconCacheService, _changeDetector) {
|
|
2320
2288
|
this._stockService = _stockService;
|
|
2321
2289
|
this.iconCacheService = iconCacheService;
|
|
2290
|
+
this._changeDetector = _changeDetector;
|
|
2291
|
+
this.selectedArticleDetailsData = new ArticleDetailsBo();
|
|
2292
|
+
this.articleDetailsInformation = new ArticleStockManagement();
|
|
2293
|
+
this.articleStockInfo = [];
|
|
2294
|
+
this.stockLocations = [];
|
|
2322
2295
|
this.handleClick = new EventEmitter();
|
|
2323
2296
|
this.handleStickerClicked = new EventEmitter();
|
|
2297
|
+
this.updateGridData = new EventEmitter();
|
|
2298
|
+
this.showStockTransferChange = new EventEmitter();
|
|
2324
2299
|
this.showSendMethodDialog = false;
|
|
2300
|
+
this.transferFull = false;
|
|
2325
2301
|
this.warehouses = [];
|
|
2326
2302
|
this.stockState = [];
|
|
2327
2303
|
this.locations = [];
|
|
2304
|
+
this.stockStatus = [];
|
|
2328
2305
|
this.icons = Icon;
|
|
2329
2306
|
}
|
|
2330
2307
|
ngAfterViewInit() {
|
|
@@ -2332,21 +2309,31 @@ class StockTransferComponent {
|
|
|
2332
2309
|
this.getStockState();
|
|
2333
2310
|
}
|
|
2334
2311
|
handleOkClick(data) {
|
|
2335
|
-
|
|
2336
|
-
|
|
2337
|
-
|
|
2338
|
-
|
|
2339
|
-
|
|
2340
|
-
|
|
2341
|
-
|
|
2312
|
+
if (this.articleToTransfer.amountTransfer > this.articleToTransfer.amountInStockFree) {
|
|
2313
|
+
this.transferFull = true;
|
|
2314
|
+
}
|
|
2315
|
+
else {
|
|
2316
|
+
data.selected = true;
|
|
2317
|
+
data.entryDate = new Date;
|
|
2318
|
+
this._stockService.updateArticleDetails(data).then((result) => {
|
|
2319
|
+
this.handleClick.emit();
|
|
2320
|
+
this.showStockTransferChange.emit(false);
|
|
2321
|
+
this._stockService.getArticleDetails(this.articleDetailsInformation).then((details) => {
|
|
2322
|
+
this.articleStockInfo = details;
|
|
2323
|
+
this.updateGridData.emit(details);
|
|
2324
|
+
});
|
|
2325
|
+
}).catch((result) => {
|
|
2326
|
+
// Log failure message
|
|
2327
|
+
});
|
|
2328
|
+
}
|
|
2342
2329
|
}
|
|
2343
|
-
|
|
2344
|
-
this.
|
|
2330
|
+
onCloseClick() {
|
|
2331
|
+
this.showStockTransferChange.emit(false);
|
|
2345
2332
|
}
|
|
2346
2333
|
handleSelectedWarehouse(event) {
|
|
2347
2334
|
this.articleToTransfer.targetWarehouse = event.warehouseNo;
|
|
2348
2335
|
this.selectedWarehouse = event;
|
|
2349
|
-
this.getStockManagementLocations(
|
|
2336
|
+
this.getStockManagementLocations();
|
|
2350
2337
|
}
|
|
2351
2338
|
handleSelectedLocation(event) {
|
|
2352
2339
|
this.articleToTransfer.targetLocation = event.locationNo;
|
|
@@ -2363,9 +2350,9 @@ class StockTransferComponent {
|
|
|
2363
2350
|
this.warehouses = warehouses;
|
|
2364
2351
|
});
|
|
2365
2352
|
}
|
|
2366
|
-
getStockManagementLocations(
|
|
2367
|
-
this._stockService.getStockManagementLocations(
|
|
2368
|
-
this.
|
|
2353
|
+
getStockManagementLocations() {
|
|
2354
|
+
this._stockService.getStockManagementLocations(this.selectedWarehouse.warehouseNo).then((locations) => {
|
|
2355
|
+
this.stockLocations = locations;
|
|
2369
2356
|
});
|
|
2370
2357
|
}
|
|
2371
2358
|
getStockState() {
|
|
@@ -2379,96 +2366,134 @@ StockTransferComponent.decorators = [
|
|
|
2379
2366
|
selector: "co-stock-transfer",
|
|
2380
2367
|
template: `
|
|
2381
2368
|
<div class="stock-transfer">
|
|
2382
|
-
<
|
|
2383
|
-
|
|
2384
|
-
|
|
2385
|
-
|
|
2386
|
-
|
|
2387
|
-
|
|
2369
|
+
<co-dialog
|
|
2370
|
+
(closeClick)="onCloseClick()"
|
|
2371
|
+
[showCloseIcon]="true"
|
|
2372
|
+
[modal]="true"
|
|
2373
|
+
[headerTemplate]="headerTemplate"
|
|
2374
|
+
[footerTemplate]="footerTemplate">
|
|
2375
|
+
<ng-template #headerTemplate>
|
|
2376
|
+
<div class="co-dialog-header-title-wrapper">
|
|
2377
|
+
<co-icon [iconData]="iconCacheService.getIcon(icons.Cubes)"></co-icon>
|
|
2378
|
+
<div class="co-dialog-header-title" [textContent]="'TRANSFER_STOCK' | localize"></div>
|
|
2379
|
+
</div>
|
|
2380
|
+
</ng-template>
|
|
2381
|
+
<div class="dialog-wrapper">
|
|
2382
|
+
<div class="stock-transfer-columns">
|
|
2383
|
+
<div *ngIf="articleToTransfer" class="stock-transfer-top-column">
|
|
2384
|
+
<div class="transfer-items">
|
|
2385
|
+
<div class="transfer-item">
|
|
2386
|
+
<label class="item-label" [textContent]="'WAREHOUSE' | localize"></label>
|
|
2387
|
+
<span class="item-value" [textContent]="articleToTransfer.warehouseDescription"></span>
|
|
2388
|
+
</div>
|
|
2389
|
+
<div class="transfer-item">
|
|
2390
|
+
<label class="item-label" [textContent]="'LOCATION' | localize"></label>
|
|
2391
|
+
<span class="item-value" [textContent]="articleToTransfer.locationNo"></span>
|
|
2392
|
+
</div>
|
|
2393
|
+
<div class="transfer-item" *ngIf="articleToTransfer?.batchNo">
|
|
2394
|
+
<label class="item-label" [textContent]="'BATCH_NO' | localize"></label>
|
|
2395
|
+
<span class="item-value" [textContent]="articleToTransfer.batchNo"></span>
|
|
2396
|
+
</div>
|
|
2397
|
+
<div class="transfer-item" *ngIf="articleToTransfer?.serialNo">
|
|
2398
|
+
<label class="item-label" [textContent]="'SERIE_NO' | localize"></label>
|
|
2399
|
+
<span class="item-value" [textContent]="articleToTransfer.serialNo"></span>
|
|
2400
|
+
</div>
|
|
2401
|
+
</div>
|
|
2402
|
+
<div class="transfer-quantity">
|
|
2403
|
+
<co-input-number-picker
|
|
2404
|
+
[(model)]="articleToTransfer.amountTransfer"
|
|
2405
|
+
[min]="1"
|
|
2406
|
+
[label]="'QUANTITY' | localize">
|
|
2407
|
+
</co-input-number-picker>
|
|
2408
|
+
<span *ngIf="transferFull" [textContent]="this.articleToTransfer.amountInStockFree + (' AVAILABLE' | localize)"></span>
|
|
2409
|
+
</div>
|
|
2388
2410
|
</div>
|
|
2389
|
-
<div class="transfer-
|
|
2390
|
-
<
|
|
2391
|
-
<
|
|
2411
|
+
<div class="transfer-arrow-wrapper">
|
|
2412
|
+
<span class="half-circle"></span>
|
|
2413
|
+
<div class="icon-wrapper">
|
|
2414
|
+
<co-icon [iconData]="iconCacheService.getIcon(icons.ArrowDownRegular)"></co-icon>
|
|
2415
|
+
</div>
|
|
2392
2416
|
</div>
|
|
2393
|
-
|
|
2394
|
-
|
|
2395
|
-
|
|
2417
|
+
|
|
2418
|
+
|
|
2419
|
+
<div class="stock-transfer-bottom-column">
|
|
2420
|
+
<div class="transfer-bottom-row">
|
|
2421
|
+
<co-list-of-values [collection]="warehouses"
|
|
2422
|
+
[displayField]="'warehouseDescription'"
|
|
2423
|
+
(modelChange)="handleSelectedWarehouse($event)"
|
|
2424
|
+
[label]="'WAREHOUSE' | localize"
|
|
2425
|
+
>
|
|
2426
|
+
</co-list-of-values>
|
|
2427
|
+
<co-list-of-values [collection]="stockLocations"
|
|
2428
|
+
[displayField]="'locationNo'"
|
|
2429
|
+
(modelChange)="handleSelectedLocation($event)"
|
|
2430
|
+
[label]="'LOCATION' | localize"
|
|
2431
|
+
>
|
|
2432
|
+
</co-list-of-values>
|
|
2433
|
+
</div>
|
|
2434
|
+
<div class="transfer-bottom-row">
|
|
2435
|
+
<co-list-of-values [collection]="stockState"
|
|
2436
|
+
[displayField]="'stateDescription'"
|
|
2437
|
+
[label]="'STOCK_STATE' | localize"
|
|
2438
|
+
(modelChange)="handleSelectedStockState($event)"
|
|
2439
|
+
>
|
|
2440
|
+
</co-list-of-values>
|
|
2441
|
+
</div>
|
|
2442
|
+
|
|
2396
2443
|
</div>
|
|
2397
|
-
<div class="transfer-
|
|
2398
|
-
<
|
|
2399
|
-
|
|
2444
|
+
<div class="transfer-sticker-buttons">
|
|
2445
|
+
<co-button
|
|
2446
|
+
[label]="'STICKER' | localize"
|
|
2447
|
+
(click)="handleStickerClick()"
|
|
2448
|
+
[iconData]="iconCacheService.getIcon(icons.BarcodeReadRegular)">
|
|
2449
|
+
</co-button>
|
|
2400
2450
|
</div>
|
|
2401
2451
|
</div>
|
|
2402
|
-
<div class="transfer-quantity">
|
|
2403
|
-
<co-input-number-picker
|
|
2404
|
-
[(model)]="articleToTransfer.amountTransfer"
|
|
2405
|
-
[min]="1"
|
|
2406
|
-
[label]="'QUANTITY' | localize">
|
|
2407
|
-
</co-input-number-picker>
|
|
2408
|
-
</div>
|
|
2409
|
-
</div>
|
|
2410
|
-
<div class="transfer-arrow-wrapper">
|
|
2411
|
-
<span class="half-circle"></span>
|
|
2412
|
-
<div class="icon-wrapper">
|
|
2413
|
-
<co-icon [iconData]="iconCacheService.getIcon(icons.ArrowDownRegular)"></co-icon>
|
|
2414
|
-
</div>
|
|
2415
2452
|
</div>
|
|
2416
|
-
|
|
2417
|
-
|
|
2418
|
-
|
|
2419
|
-
|
|
2420
|
-
|
|
2421
|
-
|
|
2422
|
-
|
|
2423
|
-
|
|
2424
|
-
|
|
2425
|
-
</co-
|
|
2426
|
-
<co-list-of-values [collection]="locations"
|
|
2427
|
-
[displayField]="'description'"
|
|
2428
|
-
(modelChange)="handleSelectedLocation($event)"
|
|
2429
|
-
[label]="'LOCATION' | localize"
|
|
2430
|
-
>
|
|
2431
|
-
</co-list-of-values>
|
|
2453
|
+
<ng-template #footerTemplate>
|
|
2454
|
+
<div class="button-wrapper ok-cancel-buttons">
|
|
2455
|
+
<co-button class="save-button"
|
|
2456
|
+
(click)="handleOkClick(articleToTransfer)"
|
|
2457
|
+
[iconData]="iconCacheService.getIcon(icons.CheckDuotone)">
|
|
2458
|
+
</co-button>
|
|
2459
|
+
<co-button class="cancel-button"
|
|
2460
|
+
(click)="onCloseClick()"
|
|
2461
|
+
[iconData]="iconCacheService.getIcon(icons.CrossSkinny)">
|
|
2462
|
+
</co-button>
|
|
2432
2463
|
</div>
|
|
2433
|
-
|
|
2434
|
-
|
|
2435
|
-
[displayField]="'stateDescription'"
|
|
2436
|
-
[label]="'STOCK_STATE' | localize"
|
|
2437
|
-
(modelChange)="handleSelectedStockState($event)"
|
|
2438
|
-
>
|
|
2439
|
-
</co-list-of-values>
|
|
2440
|
-
</div>
|
|
2441
|
-
<div class="transfer-bottom-row">
|
|
2442
|
-
<co-input-text [placeholder]="'DESCRIPTION' | localize"
|
|
2443
|
-
[(model)]="articleToTransfer.stockStateRemark">
|
|
2444
|
-
</co-input-text>
|
|
2445
|
-
</div>
|
|
2446
|
-
</div>
|
|
2447
|
-
<div class="transfer-sticker-buttons">
|
|
2448
|
-
<co-button
|
|
2449
|
-
[label]="'STICKER' | localize"
|
|
2450
|
-
(click)="handleStickerClick()"
|
|
2451
|
-
[iconData]="iconCacheService.getIcon(icons.BarcodeReadRegular)">
|
|
2452
|
-
</co-button>
|
|
2453
|
-
</div>
|
|
2454
|
-
</div>
|
|
2464
|
+
</ng-template>
|
|
2465
|
+
</co-dialog>
|
|
2455
2466
|
</div>
|
|
2467
|
+
<co-send-method-dialog *ngIf="showSendMethodDialog"
|
|
2468
|
+
(closeClick)="showSendMethodDialog = false">
|
|
2469
|
+
|
|
2470
|
+
</co-send-method-dialog>
|
|
2456
2471
|
`,
|
|
2457
2472
|
encapsulation: ViewEncapsulation.None
|
|
2458
2473
|
},] }
|
|
2459
2474
|
];
|
|
2460
2475
|
StockTransferComponent.ctorParameters = () => [
|
|
2461
2476
|
{ type: StockService },
|
|
2462
|
-
{ type: IconCacheService }
|
|
2477
|
+
{ type: IconCacheService },
|
|
2478
|
+
{ type: ChangeDetectorRef }
|
|
2463
2479
|
];
|
|
2464
2480
|
StockTransferComponent.propDecorators = {
|
|
2465
2481
|
stockSticker: [{ type: Input }],
|
|
2466
2482
|
article: [{ type: Input }],
|
|
2467
2483
|
articleToTransfer: [{ type: Input }],
|
|
2468
|
-
articleWarehouse: [{ type: Input }],
|
|
2469
2484
|
allWarehouses: [{ type: Input }],
|
|
2485
|
+
showStockTransfer: [{ type: Input }],
|
|
2486
|
+
selectedArticleDetailsData: [{ type: Input }],
|
|
2487
|
+
articleFlat: [{ type: Input }],
|
|
2488
|
+
articleDetailsInformation: [{ type: Input }],
|
|
2489
|
+
selectedWarehouse: [{ type: Input }],
|
|
2490
|
+
selectedLocationNo: [{ type: Input }],
|
|
2491
|
+
articleStockInfo: [{ type: Input }],
|
|
2492
|
+
stockLocations: [{ type: Input }],
|
|
2470
2493
|
handleClick: [{ type: Output }],
|
|
2471
|
-
handleStickerClicked: [{ type: Output }]
|
|
2494
|
+
handleStickerClicked: [{ type: Output }],
|
|
2495
|
+
updateGridData: [{ type: Output }],
|
|
2496
|
+
showStockTransferChange: [{ type: Output }]
|
|
2472
2497
|
};
|
|
2473
2498
|
|
|
2474
2499
|
class SharedService {
|
|
@@ -3640,6 +3665,9 @@ class StockTabsComponent {
|
|
|
3640
3665
|
},
|
|
3641
3666
|
];
|
|
3642
3667
|
}
|
|
3668
|
+
onShowStockTransferChange(show) {
|
|
3669
|
+
this.showStockTransfer = show;
|
|
3670
|
+
}
|
|
3643
3671
|
handleLocationClicked(data) {
|
|
3644
3672
|
this.tabs[0].active = false;
|
|
3645
3673
|
this.tabs[2].active = true;
|
|
@@ -3779,7 +3807,8 @@ StockTabsComponent.decorators = [
|
|
|
3779
3807
|
[stockLocations]="stockLocations"
|
|
3780
3808
|
(transferIconClicked)="transferIconClicked.emit($event)"
|
|
3781
3809
|
(sendMethodDialogClicked)="sendMethodDialogClicked.emit($event)"
|
|
3782
|
-
|
|
3810
|
+
[showStockTransfer]="showStockTransfer"
|
|
3811
|
+
(showStockTransferChange)="onShowStockTransferChange($event)"
|
|
3783
3812
|
></co-stock-location>
|
|
3784
3813
|
|
|
3785
3814
|
<co-order-tab *ngIf="tabs[3].active"
|
|
@@ -3826,6 +3855,7 @@ StockTabsComponent.propDecorators = {
|
|
|
3826
3855
|
stockInformation: [{ type: Input }],
|
|
3827
3856
|
article: [{ type: Input }],
|
|
3828
3857
|
articleFlat: [{ type: Input }],
|
|
3858
|
+
showStockTransfer: [{ type: Input }],
|
|
3829
3859
|
warehouses: [{ type: Input }],
|
|
3830
3860
|
transferIconClicked: [{ type: Output }],
|
|
3831
3861
|
sendMethodDialogClicked: [{ type: Output }]
|
|
@@ -3913,9 +3943,13 @@ class StockLocationComponent {
|
|
|
3913
3943
|
this.icons = Icon;
|
|
3914
3944
|
this.articleStockInfo = [];
|
|
3915
3945
|
this.articleStockInformation = [];
|
|
3946
|
+
this.articleWarehouse = [];
|
|
3947
|
+
this.allWarehouses = [];
|
|
3916
3948
|
this.dataWareHouseCode = [];
|
|
3917
3949
|
this.transferIconClicked = new EventEmitter();
|
|
3918
3950
|
this.sendMethodDialogClicked = new EventEmitter();
|
|
3951
|
+
this.showStockTransferChange = new EventEmitter();
|
|
3952
|
+
this.handleStickerClicked = new EventEmitter();
|
|
3919
3953
|
this.showConfirmationDialog = false;
|
|
3920
3954
|
this.newStockLine = false;
|
|
3921
3955
|
this.showConfirmStockRow = false;
|
|
@@ -3940,6 +3974,10 @@ class StockLocationComponent {
|
|
|
3940
3974
|
}
|
|
3941
3975
|
ngOnDestroy() {
|
|
3942
3976
|
}
|
|
3977
|
+
onShowStockTransferChange(show) {
|
|
3978
|
+
this.showStockTransfer = show;
|
|
3979
|
+
this.showStockTransferChange.emit(this.showStockTransfer);
|
|
3980
|
+
}
|
|
3943
3981
|
onLocationDropdownClick() {
|
|
3944
3982
|
this._stockService.getStockManagementLocations(this.selectedWarehouse.warehouseNo).then((locations) => {
|
|
3945
3983
|
this.stockLocations = locations;
|
|
@@ -3957,7 +3995,8 @@ class StockLocationComponent {
|
|
|
3957
3995
|
this.sendMethodDialogClicked.emit(data);
|
|
3958
3996
|
}
|
|
3959
3997
|
handleStockTransferClick(event) {
|
|
3960
|
-
this.
|
|
3998
|
+
this.articleDetails = event;
|
|
3999
|
+
this.showStockTransfer = true;
|
|
3961
4000
|
}
|
|
3962
4001
|
onOkClickSendLocations(row) {
|
|
3963
4002
|
this.selectedArticleDetailsData = row;
|
|
@@ -4029,6 +4068,18 @@ StockLocationComponent.decorators = [
|
|
|
4029
4068
|
selector: "co-stock-location",
|
|
4030
4069
|
template: `
|
|
4031
4070
|
<div class="stock-grid">
|
|
4071
|
+
<div class="stock-transfer-wrapper">
|
|
4072
|
+
<co-stock-transfer *ngIf="showStockTransfer"
|
|
4073
|
+
class="stock-transfer-dialog"
|
|
4074
|
+
[articleToTransfer]="articleDetails"
|
|
4075
|
+
(handleStickerClicked)="handleStickerClicked.emit($event)"
|
|
4076
|
+
[allWarehouses]="allWarehouses"
|
|
4077
|
+
[stockLocations]="stockLocations"
|
|
4078
|
+
[articleFlat]="articleFlat"
|
|
4079
|
+
[showStockTransfer]="showStockTransfer"
|
|
4080
|
+
(showStockTransferChange)="onShowStockTransferChange($event)">
|
|
4081
|
+
</co-stock-transfer>
|
|
4082
|
+
</div>
|
|
4032
4083
|
<co-stock-location-popup
|
|
4033
4084
|
[selectedWarehouse]="selectedWarehouse"
|
|
4034
4085
|
[articleFlat]="articleFlat"
|
|
@@ -4139,11 +4190,16 @@ StockLocationComponent.ctorParameters = () => [
|
|
|
4139
4190
|
StockLocationComponent.propDecorators = {
|
|
4140
4191
|
articleStockInfo: [{ type: Input }],
|
|
4141
4192
|
articleStockInformation: [{ type: Input }],
|
|
4193
|
+
articleWarehouse: [{ type: Input }],
|
|
4194
|
+
allWarehouses: [{ type: Input }],
|
|
4142
4195
|
article: [{ type: Input }],
|
|
4196
|
+
showStockTransfer: [{ type: Input }],
|
|
4143
4197
|
articleFlat: [{ type: Input }],
|
|
4144
4198
|
dataWareHouseCode: [{ type: Input }],
|
|
4145
4199
|
transferIconClicked: [{ type: Output }],
|
|
4146
4200
|
sendMethodDialogClicked: [{ type: Output }],
|
|
4201
|
+
showStockTransferChange: [{ type: Output }],
|
|
4202
|
+
handleStickerClicked: [{ type: Output }],
|
|
4147
4203
|
selectedWarehouse: [{ type: Input }],
|
|
4148
4204
|
stockLocations: [{ type: Input }]
|
|
4149
4205
|
};
|
|
@@ -5030,10 +5086,10 @@ StockLocationPopupComponent.decorators = [
|
|
|
5030
5086
|
[readonly]="false"
|
|
5031
5087
|
></co-input-text>
|
|
5032
5088
|
</div>
|
|
5033
|
-
<co-input-
|
|
5089
|
+
<co-input-date [model]="selectedArticleDetailsData?.entryDate | date"
|
|
5034
5090
|
[placeholder]="'DATE' | localize"
|
|
5035
5091
|
[readonly]="false"
|
|
5036
|
-
></co-input-
|
|
5092
|
+
></co-input-date>
|
|
5037
5093
|
</div>
|
|
5038
5094
|
<div class="stock-dialog-row">
|
|
5039
5095
|
<co-list-of-values [label]="'STATUS' | localize"
|
|
@@ -5112,7 +5168,8 @@ StockModule.decorators = [
|
|
|
5112
5168
|
StockStatusbarModule,
|
|
5113
5169
|
ListOfValuesModule,
|
|
5114
5170
|
LocalizationModule,
|
|
5115
|
-
PopupModule
|
|
5171
|
+
PopupModule,
|
|
5172
|
+
InputDatePickerModule
|
|
5116
5173
|
],
|
|
5117
5174
|
declarations: [
|
|
5118
5175
|
StockComponent,
|
|
@@ -5195,6 +5252,7 @@ class Translation {
|
|
|
5195
5252
|
this.REFERENCE = 'REFERENCE';
|
|
5196
5253
|
this.RELATION_ID = 'RELATION_ID';
|
|
5197
5254
|
this.RELATION_NR = 'RELATION_NR';
|
|
5255
|
+
this.REMARK = 'REMARK';
|
|
5198
5256
|
this.RESERVED = 'RESERVED';
|
|
5199
5257
|
this.QUANTITY = 'QUANTITY';
|
|
5200
5258
|
this.SEARCH = 'SEARCH';
|
|
@@ -5202,6 +5260,7 @@ class Translation {
|
|
|
5202
5260
|
this.SERIE_NO = 'SERIE_NO';
|
|
5203
5261
|
this.STANDARD_WAREHOUSE = 'STANDARD_WAREHOUSE';
|
|
5204
5262
|
this.STANDARD_LOCATION = 'STANDARD_LOCATION';
|
|
5263
|
+
this.STATUS = 'STATUS';
|
|
5205
5264
|
this.STICKER = 'STICKER';
|
|
5206
5265
|
this.STOCK = 'STOCK';
|
|
5207
5266
|
this.STOCK_DETAILS = 'STOCK_DETAILS';
|
|
@@ -11232,7 +11291,11 @@ class ActivityListComponent {
|
|
|
11232
11291
|
}
|
|
11233
11292
|
}
|
|
11234
11293
|
getDateString(date) {
|
|
11235
|
-
|
|
11294
|
+
const day = date.getDate();
|
|
11295
|
+
const month = this._dictionaryService.get(ALL_MONTHS[date.getMonth()]);
|
|
11296
|
+
const hours = date.getHours().toString().padStart(2, '0');
|
|
11297
|
+
const minutes = date.getMinutes().toString().padStart(2, '0');
|
|
11298
|
+
return `${day} ${month} ${hours}:${minutes}`;
|
|
11236
11299
|
}
|
|
11237
11300
|
getActivityIcon(activity) {
|
|
11238
11301
|
switch (activity.activityType) {
|
|
@@ -11282,7 +11345,7 @@ ActivityListComponent.decorators = [
|
|
|
11282
11345
|
<div class="activity-wrapper" [class.customer-reply-wrapper]="(getRelationKind(activity.author) === RelationKind.Customer)" *ngFor="let activity of activities" >
|
|
11283
11346
|
<div class="activity-display">
|
|
11284
11347
|
<div class="activity-display-title">
|
|
11285
|
-
<span>{{activity.author
|
|
11348
|
+
<span>{{activity.author && (activity.author.initials || activity.author.familyName) ? (activity.author.initials || '') + ' ' + (activity.author.familyName || '') : ''}}</span>
|
|
11286
11349
|
<span>{{getDateString(activity.lastActionDateTime)}}</span>
|
|
11287
11350
|
<co-icon [iconData]="iconCacheService.getIcon(getActivityIcon(activity))"></co-icon>
|
|
11288
11351
|
</div>
|
|
@@ -12490,6 +12553,7 @@ class ComponentActivityListComponent extends BaseActivityListComponent {
|
|
|
12490
12553
|
this.icons = Icon;
|
|
12491
12554
|
this.activityClass = Activity;
|
|
12492
12555
|
this.activitySortType = ActivitySortType;
|
|
12556
|
+
this.showActivityHeader = true;
|
|
12493
12557
|
this.hideTitle = false;
|
|
12494
12558
|
this.noFreeTasks = false;
|
|
12495
12559
|
this.componentActivitiesMethod = OperationWithAlwaysSuccessCallback;
|
|
@@ -12647,6 +12711,7 @@ ComponentActivityListComponent.decorators = [
|
|
|
12647
12711
|
selector: "co-component-activity-list",
|
|
12648
12712
|
template: `
|
|
12649
12713
|
<co-activity-list-header
|
|
12714
|
+
*ngIf="showActivityHeader"
|
|
12650
12715
|
[title]="'ACTIVITIES'"
|
|
12651
12716
|
[table]="table"
|
|
12652
12717
|
[key]="key"
|
|
@@ -12724,6 +12789,7 @@ ComponentActivityListComponent.propDecorators = {
|
|
|
12724
12789
|
showClass: [{ type: HostBinding, args: ["class.co-component-activity-list",] }],
|
|
12725
12790
|
table: [{ type: Input }],
|
|
12726
12791
|
key: [{ type: Input }],
|
|
12792
|
+
showActivityHeader: [{ type: Input }],
|
|
12727
12793
|
hideTitle: [{ type: Input }],
|
|
12728
12794
|
noFreeTasks: [{ type: Input }],
|
|
12729
12795
|
customTitle: [{ type: Input }],
|
|
@@ -12739,6 +12805,9 @@ ComponentActivityListComponent.propDecorators = {
|
|
|
12739
12805
|
showUsergroupActivitiesChanged: [{ type: Output }],
|
|
12740
12806
|
activitiesList: [{ type: Input }]
|
|
12741
12807
|
};
|
|
12808
|
+
__decorate([
|
|
12809
|
+
InputBoolean()
|
|
12810
|
+
], ComponentActivityListComponent.prototype, "showActivityHeader", void 0);
|
|
12742
12811
|
__decorate([
|
|
12743
12812
|
InputBoolean()
|
|
12744
12813
|
], ComponentActivityListComponent.prototype, "hideTitle", void 0);
|