@things-factory/operato-wms 4.1.26 → 5.0.0-alpha.1
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/client/pages/adjustment/transfer-inventory.js +8 -4
- package/client/pages/bulk-operation/bulk-operation.js +12 -5
- package/client/pages/bulk-operation/validate-gan-popup.js +6 -6
- package/client/pages/inbound/unload-product.js +1 -1
- package/client/pages/inventory/inventory-adjustment-approval.js +21 -7
- package/client/pages/inventory/inventory-adjustment.js +99 -54
- package/client/pages/inventory-check/create-cycle-count.js +0 -2
- package/client/pages/master/product/product-detail-bizplace-setting-popup.js +0 -2
- package/client/pages/master/product/product-details-popup.js +10 -9
- package/client/pages/master/product/product-list.js +10 -9
- package/client/pages/order/arrival-notice/arrival-notice-detail.js +6 -6
- package/client/pages/order/arrival-notice/create-arrival-notice.js +25 -24
- package/client/pages/order/arrival-notice/duplicate-arrival-notice.js +31 -30
- package/client/pages/order/arrival-notice/edit-product-popup.js +12 -25
- package/client/pages/order/arrival-notice/proceed-edit-product-popup.js +4 -4
- package/client/pages/order/arrival-notice/view-product-changes-popup.js +4 -4
- package/client/pages/outbound/worksheet-batch-picking.js +1 -1
- package/client/pages/report/inbound-order-details-report.js +9 -8
- package/client/pages/report/outbound-order-details-report.js +9 -8
- package/dist-server/graphql/index.js +5 -1
- package/dist-server/graphql/index.js.map +1 -1
- package/dist-server/graphql/resolvers/index.js +5 -1
- package/dist-server/graphql/resolvers/index.js.map +1 -1
- package/dist-server/graphql/resolvers/reports/inbound-order-details-report.js +2 -2
- package/dist-server/graphql/resolvers/reports/outbound-order-details-report.js +2 -2
- package/dist-server/graphql/types/index.js +5 -1
- package/dist-server/graphql/types/index.js.map +1 -1
- package/dist-server/graphql/types/reports/inbound-order-details-report.js +1 -1
- package/dist-server/graphql/types/reports/outbound-order-details-report.js +1 -1
- package/dist-server/index.js +5 -1
- package/dist-server/index.js.map +1 -1
- package/dist-server/utils/index.js +5 -1
- package/dist-server/utils/index.js.map +1 -1
- package/package.json +51 -51
- package/server/graphql/resolvers/reports/inbound-order-details-report.ts +2 -2
- package/server/graphql/resolvers/reports/outbound-order-details-report.ts +2 -2
- package/server/graphql/types/reports/inbound-order-details-report.ts +1 -1
- package/server/graphql/types/reports/outbound-order-details-report.ts +1 -1
- package/translations/en.json +5 -2
- package/translations/ko.json +5 -1
- package/translations/ms.json +5 -1
- package/translations/zh.json +5 -1
|
@@ -700,12 +700,12 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
700
700
|
width: 80
|
|
701
701
|
},
|
|
702
702
|
{
|
|
703
|
-
type: '
|
|
704
|
-
name: '
|
|
705
|
-
header: i18next.t('field.
|
|
706
|
-
imex: { header: i18next.t('field.
|
|
703
|
+
type: 'date',
|
|
704
|
+
name: 'manufactureDate',
|
|
705
|
+
header: i18next.t('field.manufacture_date'),
|
|
706
|
+
imex: { header: i18next.t('field.manufacture_date'), key: 'manufactureDate', width: 25, type: 'string' },
|
|
707
707
|
record: { editable: editable },
|
|
708
|
-
width:
|
|
708
|
+
width: 150
|
|
709
709
|
},
|
|
710
710
|
{
|
|
711
711
|
type: 'string',
|
|
@@ -860,16 +860,13 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
860
860
|
}
|
|
861
861
|
}
|
|
862
862
|
|
|
863
|
-
if (changedColumn === '
|
|
864
|
-
let
|
|
865
|
-
|
|
863
|
+
if (changedColumn === 'manufactureDate') {
|
|
864
|
+
let manufactureDate = new Date(changeRecord.manufactureDate)
|
|
865
|
+
let today = new Date()
|
|
866
866
|
|
|
867
|
-
if (
|
|
868
|
-
|
|
869
|
-
|
|
870
|
-
} else {
|
|
871
|
-
throw new Error(i18next.t('text.invalid_x', { state: { x: i18next.t('label.manufacture_year') } }))
|
|
872
|
-
}
|
|
867
|
+
if (manufactureDate > today) {
|
|
868
|
+
delete event.detail.after[event.detail.column.name]
|
|
869
|
+
throw Error(i18next.t('text.manufacture-date-cannot-be-later-than-today'))
|
|
873
870
|
}
|
|
874
871
|
}
|
|
875
872
|
|
|
@@ -1363,7 +1360,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
1363
1360
|
totalUomValue: record?.totalUomValue ? record?.totalUomValue : 0,
|
|
1364
1361
|
unitPrice: record?.unitPrice ? record.unitPrice : 0,
|
|
1365
1362
|
remark: record?.remark ? record.remark : null,
|
|
1366
|
-
|
|
1363
|
+
manufactureDate: record?.manufactureDate ? record.manufactureDate : null
|
|
1367
1364
|
}
|
|
1368
1365
|
|
|
1369
1366
|
if (record.palletQty) orderProduct.palletQty = record.palletQty
|
|
@@ -1621,11 +1618,11 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
1621
1618
|
width: 100
|
|
1622
1619
|
},
|
|
1623
1620
|
{
|
|
1624
|
-
type: '
|
|
1625
|
-
name: '
|
|
1626
|
-
header: i18next.t('field.
|
|
1627
|
-
imex: { header: i18next.t('field.
|
|
1628
|
-
width:
|
|
1621
|
+
type: 'date',
|
|
1622
|
+
name: 'manufactureDate',
|
|
1623
|
+
header: i18next.t('field.manufacture_date'),
|
|
1624
|
+
imex: { header: i18next.t('field.manufacture_date'), key: 'manufactureDate', width: 25, type: 'string' },
|
|
1625
|
+
width: 120
|
|
1629
1626
|
},
|
|
1630
1627
|
{
|
|
1631
1628
|
type: 'string',
|
|
@@ -1682,7 +1679,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
1682
1679
|
totalUomValue
|
|
1683
1680
|
packQty
|
|
1684
1681
|
palletQty
|
|
1685
|
-
|
|
1682
|
+
manufactureDate
|
|
1686
1683
|
batchId
|
|
1687
1684
|
batchIdRef
|
|
1688
1685
|
unitPrice
|
|
@@ -1713,7 +1710,6 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
1713
1710
|
...item,
|
|
1714
1711
|
productName: item?.productName,
|
|
1715
1712
|
unitPrice: parseFloat(item.unitPrice) || '',
|
|
1716
|
-
manufactureYear: parseFloat(item.manufactureYear) || '',
|
|
1717
1713
|
packQty: parseFloat(item.packQty) || '',
|
|
1718
1714
|
palletQty: parseFloat(item.palletQty) || ''
|
|
1719
1715
|
}
|
|
@@ -1737,8 +1733,14 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
1737
1733
|
async importHandler(patches) {
|
|
1738
1734
|
patches.map(itm => {
|
|
1739
1735
|
itm.unitPrice = parseFloat(itm.unitPrice) || ''
|
|
1736
|
+
if (itm.manufactureDate) {
|
|
1737
|
+
let mdt = new Date(itm.manufactureDate)
|
|
1738
|
+
itm.manufactureDate =
|
|
1739
|
+
mdt < new Date() ? `${mdt.getFullYear()}-${mdt.getMonth() + 1}-${mdt.getDate()}` || '' : ''
|
|
1740
|
+
} else {
|
|
1741
|
+
delete itm.manufactureDate
|
|
1742
|
+
}
|
|
1740
1743
|
itm.uomValue = parseFloat(itm.uomValue) || ''
|
|
1741
|
-
itm.manufactureYear = parseFloat(itm.manufactureYear) || ''
|
|
1742
1744
|
itm.packQty = parseFloat(itm.packQty) || ''
|
|
1743
1745
|
itm.palletQty = parseFloat(itm.palletQty) || ''
|
|
1744
1746
|
})
|
|
@@ -1753,7 +1755,6 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
1753
1755
|
...patch,
|
|
1754
1756
|
unitPrice: parseFloat(patch.unitPrice) || 0,
|
|
1755
1757
|
uomValue: parseFloat(patch.uomValue) || 0,
|
|
1756
|
-
manufactureYear: parseFloat(patch.manufactureYear) || 0,
|
|
1757
1758
|
packQty: parseFloat(patch.packQty) || 0,
|
|
1758
1759
|
palletQty: parseFloat(patch.palletQty) || 0
|
|
1759
1760
|
}
|
|
@@ -357,7 +357,7 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
357
357
|
<div class="button-div">
|
|
358
358
|
<mwc-button
|
|
359
359
|
id="button-add-products"
|
|
360
|
-
label=${i18next.t('button.
|
|
360
|
+
label=${i18next.t('button.bulk_select_products')}
|
|
361
361
|
raised
|
|
362
362
|
@click=${e => this._openBulkProductSelection(0)}
|
|
363
363
|
?disabled=${!this._showAddProducts}
|
|
@@ -710,11 +710,11 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
710
710
|
width: 80
|
|
711
711
|
},
|
|
712
712
|
{
|
|
713
|
-
type: '
|
|
714
|
-
name: '
|
|
715
|
-
header: i18next.t('field.
|
|
716
|
-
record: { editable: editable
|
|
717
|
-
width:
|
|
713
|
+
type: 'date',
|
|
714
|
+
name: 'manufactureDate',
|
|
715
|
+
header: i18next.t('field.manufacture_date'),
|
|
716
|
+
record: { editable: editable },
|
|
717
|
+
width: 120
|
|
718
718
|
},
|
|
719
719
|
{
|
|
720
720
|
type: 'string',
|
|
@@ -859,19 +859,6 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
859
859
|
}
|
|
860
860
|
}
|
|
861
861
|
|
|
862
|
-
if (changedColumn === 'manufactureYear') {
|
|
863
|
-
let manufactureYear = changeRecord.manufactureYear
|
|
864
|
-
const regExp = /^(181[2-9]|18[2-9]\d|19\d\d|2\d{3}|30[0-3]\d|304[0-8])$/
|
|
865
|
-
|
|
866
|
-
if (typeof manufactureYear === undefined || !regExp.test(manufactureYear)) {
|
|
867
|
-
if (manufactureYear === 0) {
|
|
868
|
-
delete event.detail.after[event.detail.column.name]
|
|
869
|
-
} else {
|
|
870
|
-
throw new Error(i18next.t('text.invalid_x', { state: { x: i18next.t('label.manufacture_year') } }))
|
|
871
|
-
}
|
|
872
|
-
}
|
|
873
|
-
}
|
|
874
|
-
|
|
875
862
|
if (changedColumn === 'unitPrice') {
|
|
876
863
|
let unitPrice = changeRecord.unitPrice
|
|
877
864
|
if (typeof unitPrice === undefined || unitPrice < 0) {
|
|
@@ -879,6 +866,16 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
879
866
|
}
|
|
880
867
|
}
|
|
881
868
|
|
|
869
|
+
if (changedColumn === 'manufactureDate') {
|
|
870
|
+
let manufactureDate = new Date(changeRecord.manufactureDate)
|
|
871
|
+
let today = new Date()
|
|
872
|
+
|
|
873
|
+
if (manufactureDate > today) {
|
|
874
|
+
delete event.detail.after[event.detail.column.name]
|
|
875
|
+
throw Error(i18next.t('text.manufacture-date-cannot-be-later-than-today'))
|
|
876
|
+
}
|
|
877
|
+
}
|
|
878
|
+
|
|
882
879
|
this._updateVasTargets(true)
|
|
883
880
|
} catch (e) {
|
|
884
881
|
const beforeValue = event.detail.before && event.detail.before[event.detail.column.name]
|
|
@@ -1074,7 +1071,7 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
1074
1071
|
adjustedTotalUomValue
|
|
1075
1072
|
palletQty
|
|
1076
1073
|
adjustedPalletQty
|
|
1077
|
-
|
|
1074
|
+
manufactureDate
|
|
1078
1075
|
releaseQty
|
|
1079
1076
|
releaseUomValue
|
|
1080
1077
|
}
|
|
@@ -1437,7 +1434,7 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
1437
1434
|
totalUomValue: record?.totalUomValue ? record?.totalUomValue : 0,
|
|
1438
1435
|
unitPrice: record?.unitPrice ? record.unitPrice : 0,
|
|
1439
1436
|
remark: record?.remark ? record.remark : null,
|
|
1440
|
-
|
|
1437
|
+
manufactureDate: record?.manufactureDate ? record.manufactureDate : null
|
|
1441
1438
|
}
|
|
1442
1439
|
|
|
1443
1440
|
if (record.palletQty) orderProduct.palletQty = record.palletQty
|
|
@@ -1677,11 +1674,11 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
1677
1674
|
width: 100
|
|
1678
1675
|
},
|
|
1679
1676
|
{
|
|
1680
|
-
type: '
|
|
1681
|
-
name: '
|
|
1682
|
-
header: i18next.t('field.
|
|
1683
|
-
imex: { header: i18next.t('field.
|
|
1684
|
-
width:
|
|
1677
|
+
type: 'date',
|
|
1678
|
+
name: 'manufactureDate',
|
|
1679
|
+
header: i18next.t('field.manufacture_date'),
|
|
1680
|
+
imex: { header: i18next.t('field.manufacture_date'), key: 'manufactureDate', width: 25, type: 'string' },
|
|
1681
|
+
width: 120
|
|
1685
1682
|
},
|
|
1686
1683
|
{
|
|
1687
1684
|
type: 'string',
|
|
@@ -1738,7 +1735,7 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
1738
1735
|
totalUomValue
|
|
1739
1736
|
packQty
|
|
1740
1737
|
palletQty
|
|
1741
|
-
|
|
1738
|
+
manufactureDate
|
|
1742
1739
|
batchId
|
|
1743
1740
|
batchIdRef
|
|
1744
1741
|
unitPrice
|
|
@@ -1767,7 +1764,6 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
1767
1764
|
...item,
|
|
1768
1765
|
productName: item?.productName,
|
|
1769
1766
|
unitPrice: parseFloat(item.unitPrice) || '',
|
|
1770
|
-
manufactureYear: parseFloat(item.manufactureYear) || '',
|
|
1771
1767
|
packQty: parseFloat(item.packQty) || '',
|
|
1772
1768
|
palletQty: parseFloat(item.palletQty) || ''
|
|
1773
1769
|
}
|
|
@@ -1791,7 +1787,13 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
1791
1787
|
async importHandler(patches) {
|
|
1792
1788
|
patches.map(itm => {
|
|
1793
1789
|
itm.unitPrice = parseFloat(itm.unitPrice) || ''
|
|
1794
|
-
|
|
1790
|
+
if (itm.manufactureDate) {
|
|
1791
|
+
let mdt = new Date(itm.manufactureDate)
|
|
1792
|
+
itm.manufactureDate =
|
|
1793
|
+
mdt < new Date() ? `${mdt.getFullYear()}-${mdt.getMonth() + 1}-${mdt.getDate()}` || '' : ''
|
|
1794
|
+
} else {
|
|
1795
|
+
delete itm.manufactureDate
|
|
1796
|
+
}
|
|
1795
1797
|
itm.packQty = parseFloat(itm.packQty) || ''
|
|
1796
1798
|
itm.palletQty = parseFloat(itm.palletQty) || ''
|
|
1797
1799
|
})
|
|
@@ -1805,7 +1807,6 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
|
|
|
1805
1807
|
return {
|
|
1806
1808
|
...patch,
|
|
1807
1809
|
unitPrice: parseFloat(patch.unitPrice) || 0,
|
|
1808
|
-
manufactureYear: parseFloat(patch.manufactureYear) || 0,
|
|
1809
1810
|
packQty: parseFloat(patch.packQty) || 0,
|
|
1810
1811
|
palletQty: parseFloat(patch.palletQty) || 0
|
|
1811
1812
|
}
|
|
@@ -144,7 +144,7 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
|
|
|
144
144
|
'packQty',
|
|
145
145
|
'totalUomValue',
|
|
146
146
|
'palletQty',
|
|
147
|
-
'
|
|
147
|
+
'manufactureDate',
|
|
148
148
|
'batchIdRef',
|
|
149
149
|
'unitPrice',
|
|
150
150
|
'remark',
|
|
@@ -219,11 +219,11 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
|
|
|
219
219
|
width: 80
|
|
220
220
|
},
|
|
221
221
|
{
|
|
222
|
-
type: '
|
|
223
|
-
name: '
|
|
224
|
-
header: i18next.t('field.
|
|
222
|
+
type: 'date',
|
|
223
|
+
name: 'manufactureDate',
|
|
224
|
+
header: i18next.t('field.manufacture_date'),
|
|
225
225
|
record: { editable: true },
|
|
226
|
-
width:
|
|
226
|
+
width: 120
|
|
227
227
|
},
|
|
228
228
|
{
|
|
229
229
|
type: 'string',
|
|
@@ -268,7 +268,7 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
|
|
|
268
268
|
'packQty',
|
|
269
269
|
'totalUomValue',
|
|
270
270
|
'palletQty',
|
|
271
|
-
'
|
|
271
|
+
'manufactureDate',
|
|
272
272
|
'batchIdRef',
|
|
273
273
|
'unitPrice',
|
|
274
274
|
'remark'
|
|
@@ -354,11 +354,11 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
|
|
|
354
354
|
width: 80
|
|
355
355
|
},
|
|
356
356
|
{
|
|
357
|
-
type: '
|
|
358
|
-
name: '
|
|
359
|
-
header: i18next.t('field.
|
|
357
|
+
type: 'date',
|
|
358
|
+
name: 'manufactureDate',
|
|
359
|
+
header: i18next.t('field.manufacture_date'),
|
|
360
360
|
record: { editable: true },
|
|
361
|
-
width:
|
|
361
|
+
width: 120
|
|
362
362
|
},
|
|
363
363
|
{
|
|
364
364
|
type: 'string',
|
|
@@ -416,19 +416,6 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
|
|
|
416
416
|
}
|
|
417
417
|
}
|
|
418
418
|
|
|
419
|
-
if (changedColumn === 'manufactureYear') {
|
|
420
|
-
let manufactureYear = changeRecord.manufactureYear
|
|
421
|
-
const regExp = /^(181[2-9]|18[2-9]\d|19\d\d|2\d{3}|30[0-3]\d|304[0-8])$/
|
|
422
|
-
|
|
423
|
-
if (typeof manufactureYear === undefined || !regExp.test(manufactureYear)) {
|
|
424
|
-
if (manufactureYear === 0) {
|
|
425
|
-
delete event.detail.after[event.detail.column.name]
|
|
426
|
-
} else {
|
|
427
|
-
throw new Error(i18next.t('text.invalid_x', { state: { x: i18next.t('label.manufacture_year') } }))
|
|
428
|
-
}
|
|
429
|
-
}
|
|
430
|
-
}
|
|
431
|
-
|
|
432
419
|
if (changedColumn === 'unitPrice') {
|
|
433
420
|
let unitPrice = changeRecord.unitPrice
|
|
434
421
|
if (typeof unitPrice === undefined || unitPrice < 0) {
|
|
@@ -661,7 +648,7 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
|
|
|
661
648
|
adjustedPackQty: record.packQty,
|
|
662
649
|
totalUomValue: 'N/A',
|
|
663
650
|
adjustedTotalUomValue: record?.totalUomValue ? record.totalUomValue : 'N/A',
|
|
664
|
-
|
|
651
|
+
manufactureDate: record?.manufactureDate ? record.manufactureDate : null,
|
|
665
652
|
batchIdRef: 'N/A',
|
|
666
653
|
adjustedBatchIdRef: record?.batchIdRef ? record.batchIdRef : null,
|
|
667
654
|
unitPrice: 0,
|
|
@@ -687,7 +674,7 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
|
|
|
687
674
|
adjustedUom: record.uom === record.__origin__.uom ? null : record.uom,
|
|
688
675
|
adjustedPackQty: record.packQty == record.__origin__.packQty ? null : record.packQty,
|
|
689
676
|
adjustedTotalUomValue: record.totalUomValue == record.__origin__.totalUomValue ? null : record.totalUomValue,
|
|
690
|
-
|
|
677
|
+
manufactureDate: record?.manufactureDate ? record.manufactureDate : null,
|
|
691
678
|
adjustedUnitPrice: record?.unitPrice ? record.__origin__.unitPrice : null,
|
|
692
679
|
remark: record?.remark ? record.remark : null
|
|
693
680
|
})
|
|
@@ -268,10 +268,10 @@ export class ProceedEditProductPopup extends localize(i18next)(LitElement) {
|
|
|
268
268
|
width: 80
|
|
269
269
|
},
|
|
270
270
|
{
|
|
271
|
-
type: '
|
|
272
|
-
name: '
|
|
273
|
-
header: i18next.t('field.
|
|
274
|
-
width:
|
|
271
|
+
type: 'date',
|
|
272
|
+
name: 'manufactureDate',
|
|
273
|
+
header: i18next.t('field.manufacture_date'),
|
|
274
|
+
width: 120
|
|
275
275
|
},
|
|
276
276
|
{
|
|
277
277
|
type: 'string',
|
|
@@ -244,10 +244,10 @@ export class ViewProductChangesPopup extends localize(i18next)(LitElement) {
|
|
|
244
244
|
width: 80
|
|
245
245
|
},
|
|
246
246
|
{
|
|
247
|
-
type: '
|
|
248
|
-
name: '
|
|
249
|
-
header: i18next.t('field.
|
|
250
|
-
width:
|
|
247
|
+
type: 'date',
|
|
248
|
+
name: 'manufactureDate',
|
|
249
|
+
header: i18next.t('field.manufacture_date'),
|
|
250
|
+
width: 120
|
|
251
251
|
},
|
|
252
252
|
{
|
|
253
253
|
type: 'float',
|
|
@@ -6,7 +6,7 @@ import './select-operator-popup'
|
|
|
6
6
|
|
|
7
7
|
import gql from 'graphql-tag'
|
|
8
8
|
import { css, html } from 'lit-element'
|
|
9
|
-
import orderBy from 'lodash/orderBy'
|
|
9
|
+
import orderBy from 'lodash-es/orderBy'
|
|
10
10
|
|
|
11
11
|
import { MultiColumnFormStyles } from '@things-factory/form-ui'
|
|
12
12
|
import { i18next, localize } from '@things-factory/i18n-base'
|
|
@@ -435,10 +435,10 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
|
|
|
435
435
|
width: 170
|
|
436
436
|
},
|
|
437
437
|
{
|
|
438
|
-
type: '
|
|
439
|
-
name: '
|
|
440
|
-
header: i18next.t('field.
|
|
441
|
-
width:
|
|
438
|
+
type: 'date',
|
|
439
|
+
name: 'manufactureDate',
|
|
440
|
+
header: i18next.t('field.manufacture_date'),
|
|
441
|
+
width: 120
|
|
442
442
|
},
|
|
443
443
|
{
|
|
444
444
|
type: 'string',
|
|
@@ -509,7 +509,7 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
|
|
|
509
509
|
'batchId',
|
|
510
510
|
'batchIdRef',
|
|
511
511
|
'expirationDate',
|
|
512
|
-
'
|
|
512
|
+
'manufactureDate',
|
|
513
513
|
'unloadedBy',
|
|
514
514
|
'unloadedAt',
|
|
515
515
|
'putawayBy',
|
|
@@ -625,7 +625,7 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
|
|
|
625
625
|
batchId
|
|
626
626
|
batchIdRef
|
|
627
627
|
expirationDate
|
|
628
|
-
|
|
628
|
+
manufactureDate
|
|
629
629
|
unloadedAt
|
|
630
630
|
unloadedBy
|
|
631
631
|
putawayAt
|
|
@@ -771,7 +771,7 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
|
|
|
771
771
|
{ header: i18next.t('field.batch_id_ref'), key: 'batchIdRef', width: 25, type: 'string' },
|
|
772
772
|
{ header: i18next.t('field.unloaded_at'), key: 'unloadedAt', width: 15, type: 'string' },
|
|
773
773
|
{ header: i18next.t('field.exp_date'), key: 'expirationDate', width: 15, type: 'string' },
|
|
774
|
-
{ header: i18next.t('field.
|
|
774
|
+
{ header: i18next.t('field.manufacture_date'), key: 'manufactureDate', width: 15, type: 'string' },
|
|
775
775
|
{ header: i18next.t('field.putaway_by'), key: 'putawayBy', width: 15, type: 'string' },
|
|
776
776
|
{ header: i18next.t('field.putaway_at'), key: 'putawayAt', width: 15, type: 'string' }
|
|
777
777
|
]
|
|
@@ -789,7 +789,8 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
|
|
|
789
789
|
acceptedAt: itm.acceptedAt ? new Date(parseInt(itm.acceptedAt)).toLocaleString() : '',
|
|
790
790
|
unloadedAt: itm.unloadedAt ? new Date(parseInt(itm.unloadedAt)).toLocaleString() : '',
|
|
791
791
|
putawayAt: itm.putawayAt ? new Date(parseInt(itm.putawayAt)).toLocaleString() : '',
|
|
792
|
-
expirationDate: itm.expirationDate ? new Date(parseInt(itm.expirationDate)).toLocaleString() : ''
|
|
792
|
+
expirationDate: itm.expirationDate ? new Date(parseInt(itm.expirationDate)).toLocaleString() : '',
|
|
793
|
+
manufactureDate: itm.manufactureDate ? new Date(parseInt(itm.manufactureDate)).toLocaleString() : ''
|
|
793
794
|
}
|
|
794
795
|
})
|
|
795
796
|
}
|
|
@@ -378,10 +378,10 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
|
|
|
378
378
|
width: 170
|
|
379
379
|
},
|
|
380
380
|
{
|
|
381
|
-
type: '
|
|
382
|
-
name: '
|
|
383
|
-
header: i18next.t('field.
|
|
384
|
-
width:
|
|
381
|
+
type: 'date',
|
|
382
|
+
name: 'manufactureDate',
|
|
383
|
+
header: i18next.t('field.manufacture_date'),
|
|
384
|
+
width: 120
|
|
385
385
|
},
|
|
386
386
|
{
|
|
387
387
|
type: 'string',
|
|
@@ -463,7 +463,7 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
|
|
|
463
463
|
'batchId',
|
|
464
464
|
'batchIdRef',
|
|
465
465
|
'expirationDate',
|
|
466
|
-
'
|
|
466
|
+
'manufactureDate',
|
|
467
467
|
'pickedAt',
|
|
468
468
|
'pickedBy',
|
|
469
469
|
'packedAt',
|
|
@@ -571,7 +571,7 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
|
|
|
571
571
|
batchId
|
|
572
572
|
batchIdRef
|
|
573
573
|
expirationDate
|
|
574
|
-
|
|
574
|
+
manufactureDate
|
|
575
575
|
pickedAt
|
|
576
576
|
pickedBy
|
|
577
577
|
packedAt
|
|
@@ -712,7 +712,7 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
|
|
|
712
712
|
{ header: i18next.t('field.batch_id'), key: 'batchId', width: 25, type: 'string' },
|
|
713
713
|
{ header: i18next.t('field.batch_id_ref'), key: 'batchIdRef', width: 25, type: 'string' },
|
|
714
714
|
{ header: i18next.t('field.exp_date'), key: 'expirationDate', width: 15, type: 'string' },
|
|
715
|
-
{ header: i18next.t('field.
|
|
715
|
+
{ header: i18next.t('field.manufacture_date'), key: 'manufactureDate', width: 15, type: 'string' },
|
|
716
716
|
{ header: i18next.t('field.picked_by'), key: 'pickedBy', width: 15, type: 'string' },
|
|
717
717
|
{ header: i18next.t('field.picked_at'), key: 'pickedAt', width: 15, type: 'string' },
|
|
718
718
|
{ header: i18next.t('field.packed_by'), key: 'packedBy', width: 15, type: 'string' },
|
|
@@ -735,7 +735,8 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
|
|
|
735
735
|
packedAt: itm.packedAt ? new Date(parseInt(itm.packedAt)).toLocaleString() : '',
|
|
736
736
|
loadedAt: itm.loadedAt ? new Date(parseInt(itm.loadedAt)).toLocaleString() : '',
|
|
737
737
|
shippedAt: itm.shippedAt ? new Date(parseInt(itm.shippedAt)).toLocaleString() : '',
|
|
738
|
-
expirationDate: itm.expirationDate ? new Date(parseInt(itm.expirationDate)).toLocaleString() : ''
|
|
738
|
+
expirationDate: itm.expirationDate ? new Date(parseInt(itm.expirationDate)).toLocaleString() : '',
|
|
739
|
+
manufactureDate: itm.manufactureDate ? new Date(parseInt(itm.manufactureDate)).toLocaleString() : ''
|
|
739
740
|
}
|
|
740
741
|
})
|
|
741
742
|
}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/graphql/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/graphql/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAmC;AACnC,uDAAwC;AAE3B,QAAA,MAAM,GAAG;IACpB,QAAQ;IACR,SAAS;CACV,CAAA"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/resolvers/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/resolvers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAA+C;AAC/C,4DAA6C;AAC7C,8DAA+C;AAC/C,uDAAwC;AACxC,+CAAgC;AAChC,oDAAqC;AACrC,mDAAoC;AACpC,4EAA6D;AAC7D,uEAAwD;AAE3C,QAAA,OAAO,GAAG;IACrB,YAAY,CAAC,KAAK;IAClB,WAAW,CAAC,KAAK;IACjB,YAAY,CAAC,KAAK;IAClB,SAAS,CAAC,KAAK;IACf,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,KAAK;IACb,mBAAmB,CAAC,KAAK;IACzB,iBAAiB,CAAC,KAAK;CACxB,CAAA;AAEY,QAAA,SAAS,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA"}
|
|
@@ -68,7 +68,7 @@ exports.inboundOrderDetailsReport = {
|
|
|
68
68
|
p.id as "product_id", p.sku as "product_sku", p.name as "product_name", p.description as "product_description", p.type as "product_type",
|
|
69
69
|
ih.packing_type as "pack_type", op.packing_size as "pack_size",
|
|
70
70
|
ih.qty, ih.uom_value, ih.uom, ih.pallet_id, ih.carton_id, ih.batch_id, ih.batch_id_ref,
|
|
71
|
-
i.expiration_date, i.
|
|
71
|
+
i.expiration_date, i.manufacture_date,
|
|
72
72
|
ih.created_at as "unloaded_at",u2.name as "unloaded_by",
|
|
73
73
|
ih2.created_at as "putaway_at", u3.name as "putaway_by",
|
|
74
74
|
coalesce((select volume from product_details pd where pd.product_id = i.product_id and pd.packing_type = i.packing_type and pd.packing_size = i.packing_size
|
|
@@ -171,7 +171,7 @@ exports.inboundOrderDetailsReport = {
|
|
|
171
171
|
batchId: itm.batch_id,
|
|
172
172
|
batchIdRef: itm.batch_id_ref,
|
|
173
173
|
expirationDate: itm.expiration_date,
|
|
174
|
-
|
|
174
|
+
manufactureDate: itm.manufacture_date,
|
|
175
175
|
unloadedAt: itm.unloaded_at,
|
|
176
176
|
unloadedBy: itm.unloaded_by,
|
|
177
177
|
putawayAt: itm.putaway_at,
|
|
@@ -51,7 +51,7 @@ exports.outboundOrderDetailsReport = {
|
|
|
51
51
|
oi.packing_type as "pack_type", oi.packing_size as "pack_size", oi.release_qty AS "release_qty",
|
|
52
52
|
w.started_at as "picking_start", w.ended_at as "picking_complete",
|
|
53
53
|
ih.qty as "qty", ih.uom_value as "uom_value", ih.uom, ih.pallet_id, ih.carton_id, ih.batch_id, ih.batch_id_ref,
|
|
54
|
-
i.expiration_date, i.
|
|
54
|
+
i.expiration_date, i.manufacture_date,
|
|
55
55
|
ih.created_at as "picked_at", u.name as "picked_by",
|
|
56
56
|
ih2.created_at as "packed_at", u2.name as "packed_by",
|
|
57
57
|
ih3.created_at as "loaded_at", u3.name as "loaded_by",
|
|
@@ -153,7 +153,7 @@ exports.outboundOrderDetailsReport = {
|
|
|
153
153
|
batchId: itm.batch_id,
|
|
154
154
|
batchIdRef: itm.batch_id_ref,
|
|
155
155
|
expirationDate: itm.expiration_date,
|
|
156
|
-
|
|
156
|
+
manufactureDate: itm.manufacture_date,
|
|
157
157
|
pickedAt: itm.picked_at,
|
|
158
158
|
pickedBy: itm.picked_by,
|
|
159
159
|
packedAt: itm.packed_at,
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/types/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAA+C;AAC/C,4DAA6C;AAC7C,8DAA+C;AAC/C,uDAAwC;AACxC,+CAAgC;AAChC,oDAAqC;AACrC,mDAAoC;AACpC,4EAA6D;AAC7D,sEAAuD;AAE1C,QAAA,OAAO,GAAG;IACrB,YAAY,CAAC,KAAK;IAClB,WAAW,CAAC,KAAK;IACjB,YAAY,CAAC,KAAK;IAClB,SAAS,CAAC,KAAK;IACf,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,KAAK;IACb,mBAAmB,CAAC,KAAK;IACzB,gBAAgB,CAAC,KAAK;CACvB,CAAA;AAEY,QAAA,SAAS,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;AAE5B,QAAA,KAAK,GAAG;IACnB,GAAG,YAAY,CAAC,KAAK;IACrB,GAAG,WAAW,CAAC,KAAK;IACpB,GAAG,SAAS,CAAC,KAAK;IAClB,GAAG,OAAO,CAAC,KAAK;IAChB,GAAG,OAAO,CAAC,KAAK;IAChB,GAAG,mBAAmB,CAAC,KAAK;IAC5B,GAAG,gBAAgB,CAAC,KAAK;CAC1B,CAAA"}
|
package/dist-server/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/dist-server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAAyB;AACzB,+CAA4B;AAE5B,oBAAiB"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/utils/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAmC"}
|