@things-factory/operato-wms 4.3.817 → 4.3.819
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.
|
@@ -437,7 +437,7 @@ class ValidateGanPopup extends localize(i18next)(LitElement) {
|
|
|
437
437
|
//make sure no batchId and sku pair is duplicated in the same gan
|
|
438
438
|
let batchSkuPairs = this.records
|
|
439
439
|
.filter(item => item.batchId !== null && item.sku !== null) // Filter out items with null batchId or sku
|
|
440
|
-
.map(item => `${item.batchId.toLowerCase()}-${item.sku
|
|
440
|
+
.map(item => `${item.batchId.toLowerCase()}-${item.sku}-${item.refNo.toLowerCase()}`) // Create a combined key of batchId and sku
|
|
441
441
|
|
|
442
442
|
let uniqueBatchSkuPairs = new Set(batchSkuPairs)
|
|
443
443
|
if (uniqueBatchSkuPairs.size !== batchSkuPairs.length) {
|
|
@@ -1304,9 +1304,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
|
|
|
1304
1304
|
try {
|
|
1305
1305
|
patches = patches.map(patch => normalizeInventoryPatch(patch))
|
|
1306
1306
|
|
|
1307
|
-
const validAdjustmentCodes = new Set(
|
|
1308
|
-
Object.values(ADJUSTMENT_CODE).map(ac => ac.value)
|
|
1309
|
-
)
|
|
1307
|
+
const validAdjustmentCodes = new Set(Object.values(ADJUSTMENT_CODE).map(ac => ac.value))
|
|
1310
1308
|
|
|
1311
1309
|
// Fetch fresh locations for client-side validation (avoid stale cache)
|
|
1312
1310
|
await this.fetchLocation()
|
|
@@ -1509,9 +1507,9 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
|
|
|
1509
1507
|
<import-pop-up
|
|
1510
1508
|
.records=${records}
|
|
1511
1509
|
.config=${{
|
|
1512
|
-
|
|
1513
|
-
|
|
1514
|
-
|
|
1510
|
+
rows: this.config.rows,
|
|
1511
|
+
columns: columns
|
|
1512
|
+
}}
|
|
1515
1513
|
.enableRowErrors=${true}
|
|
1516
1514
|
.importHandler="${this.importHandler.bind(this)}"
|
|
1517
1515
|
@field-change="${this.fieldChange.bind(this)}"
|
|
@@ -1691,15 +1689,15 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
|
|
|
1691
1689
|
.title="${i18next.t('title.inventory_remark')}"
|
|
1692
1690
|
.value="${record.remark}"
|
|
1693
1691
|
@submit="${async e => {
|
|
1694
|
-
|
|
1692
|
+
await this.updateRemark(record.id, e.detail.value)
|
|
1695
1693
|
|
|
1696
|
-
|
|
1697
|
-
|
|
1698
|
-
|
|
1699
|
-
|
|
1700
|
-
|
|
1701
|
-
|
|
1702
|
-
|
|
1694
|
+
this.dataGrist._data = {
|
|
1695
|
+
records: this.dataGrist._data.records.map(updateRecord => {
|
|
1696
|
+
if (updateRecord.id === record.id) updateRecord.remark = e.detail.value
|
|
1697
|
+
return updateRecord
|
|
1698
|
+
})
|
|
1699
|
+
}
|
|
1700
|
+
}}"
|
|
1703
1701
|
></popup-note>
|
|
1704
1702
|
`,
|
|
1705
1703
|
{
|
|
@@ -1713,13 +1711,13 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
|
|
|
1713
1711
|
openSerialNumberPopup(inventory, rowIndex, records) {
|
|
1714
1712
|
const removable =
|
|
1715
1713
|
inventory?.product?.isRequireSerialNumberScanningOutbound &&
|
|
1716
|
-
|
|
1714
|
+
inventory?.product?.isRequireSerialNumberScanningInbound
|
|
1717
1715
|
? true
|
|
1718
1716
|
: false
|
|
1719
1717
|
|
|
1720
1718
|
const updatable =
|
|
1721
1719
|
inventory?.product?.isRequireSerialNumberScanningOutbound &&
|
|
1722
|
-
|
|
1720
|
+
inventory?.product?.isRequireSerialNumberScanningInbound
|
|
1723
1721
|
? true
|
|
1724
1722
|
: false
|
|
1725
1723
|
|
|
@@ -1732,43 +1730,43 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
|
|
|
1732
1730
|
.enableRemove=${removable}
|
|
1733
1731
|
.enableUpdateBtn=${updatable}
|
|
1734
1732
|
@confirm-serial-number-list="${e => {
|
|
1735
|
-
|
|
1736
|
-
|
|
1737
|
-
|
|
1738
|
-
|
|
1739
|
-
|
|
1733
|
+
let totalSerialNumber = 0
|
|
1734
|
+
let newRecords = []
|
|
1735
|
+
for (let i = 0; i < e.detail.inventoryItemChanges.length; i++) {
|
|
1736
|
+
let inventoryItemChange = e.detail.inventoryItemChanges[i]
|
|
1737
|
+
newRecords.push(inventoryItemChange)
|
|
1740
1738
|
|
|
1741
|
-
|
|
1739
|
+
if (inventoryItemChange.type == INVENTORY_ITEM_CHANGE_TYPE.NEW.value) totalSerialNumber++
|
|
1742
1740
|
|
|
1743
|
-
|
|
1744
|
-
|
|
1741
|
+
if (inventoryItemChange.type == INVENTORY_ITEM_CHANGE_TYPE.REMOVED.value) totalSerialNumber--
|
|
1742
|
+
}
|
|
1745
1743
|
|
|
1746
|
-
|
|
1747
|
-
|
|
1744
|
+
let inventoryItemChangesJson = JSON.stringify(newRecords)
|
|
1745
|
+
let currentInventoryItemCount = records[rowIndex]?.inventoryItemCount || 0
|
|
1748
1746
|
|
|
1749
|
-
|
|
1750
|
-
|
|
1751
|
-
|
|
1752
|
-
|
|
1753
|
-
|
|
1754
|
-
|
|
1755
|
-
|
|
1756
|
-
|
|
1757
|
-
|
|
1758
|
-
|
|
1759
|
-
|
|
1760
|
-
|
|
1761
|
-
|
|
1747
|
+
this.dataGrist.dirtyData.records[rowIndex].inventoryItemChanges = inventoryItemChangesJson
|
|
1748
|
+
this.dataGrist.dirtyData.records[rowIndex].inventoryItemCount =
|
|
1749
|
+
currentInventoryItemCount + totalSerialNumber
|
|
1750
|
+
if (!this.dataGrist?.dirtyData?.records[rowIndex]?.__dirtyfields__) {
|
|
1751
|
+
this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__ = {
|
|
1752
|
+
inventoryItemChanges: { before: '', after: inventoryItemChangesJson }
|
|
1753
|
+
}
|
|
1754
|
+
} else {
|
|
1755
|
+
this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__ = {
|
|
1756
|
+
...this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__,
|
|
1757
|
+
inventoryItemChanges: {
|
|
1758
|
+
before: '',
|
|
1759
|
+
after: inventoryItemChangesJson
|
|
1760
|
+
}
|
|
1762
1761
|
}
|
|
1763
1762
|
}
|
|
1764
|
-
|
|
1765
|
-
this.dataGrist.dirtyData.records[rowIndex].__dirty__ = 'M'
|
|
1763
|
+
this.dataGrist.dirtyData.records[rowIndex].__dirty__ = 'M'
|
|
1766
1764
|
|
|
1767
|
-
|
|
1768
|
-
|
|
1769
|
-
|
|
1770
|
-
|
|
1771
|
-
|
|
1765
|
+
if (records[rowIndex]) {
|
|
1766
|
+
records[rowIndex].inventoryItemChanges = inventoryItemChangesJson
|
|
1767
|
+
records[rowIndex].inventoryItemCount = currentInventoryItemCount + totalSerialNumber
|
|
1768
|
+
}
|
|
1769
|
+
}}"
|
|
1772
1770
|
></serial-number-list-popup>
|
|
1773
1771
|
`,
|
|
1774
1772
|
{
|
|
@@ -1852,6 +1850,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
|
|
|
1852
1850
|
searchParams.append('customer', record.bizplace.name)
|
|
1853
1851
|
searchParams.append('packing', record.packingType)
|
|
1854
1852
|
searchParams.append('packingSize', record.packingSize)
|
|
1853
|
+
searchParams.append('packQty', record.qty)
|
|
1855
1854
|
searchParams.append('uom', record.uom)
|
|
1856
1855
|
searchParams.append('uomValue', record.uomValue)
|
|
1857
1856
|
searchParams.append('date', dateIn)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-wms",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.819",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"@things-factory/attachment-ui": "^4.3.815",
|
|
67
67
|
"@things-factory/auth-ui": "^4.3.815",
|
|
68
68
|
"@things-factory/barcode-ui": "^4.3.815",
|
|
69
|
-
"@things-factory/biz-ui": "^4.3.
|
|
69
|
+
"@things-factory/biz-ui": "^4.3.819",
|
|
70
70
|
"@things-factory/board-service": "^4.3.815",
|
|
71
71
|
"@things-factory/board-ui": "^4.3.815",
|
|
72
72
|
"@things-factory/code-ui": "^4.3.815",
|
|
@@ -89,9 +89,9 @@
|
|
|
89
89
|
"@things-factory/pdf": "^4.3.815",
|
|
90
90
|
"@things-factory/print-proxy-service": "^4.3.815",
|
|
91
91
|
"@things-factory/print-ui": "^4.3.815",
|
|
92
|
-
"@things-factory/product-base": "^4.3.
|
|
92
|
+
"@things-factory/product-base": "^4.3.819",
|
|
93
93
|
"@things-factory/resource-ui": "^4.3.815",
|
|
94
|
-
"@things-factory/sales-ui": "^4.3.
|
|
94
|
+
"@things-factory/sales-ui": "^4.3.819",
|
|
95
95
|
"@things-factory/scene-data-transform": "^4.3.815",
|
|
96
96
|
"@things-factory/scene-excel": "^4.3.815",
|
|
97
97
|
"@things-factory/scene-firebase": "^4.3.815",
|
|
@@ -105,10 +105,10 @@
|
|
|
105
105
|
"@things-factory/scene-visualizer": "^4.3.815",
|
|
106
106
|
"@things-factory/setting-ui": "^4.3.815",
|
|
107
107
|
"@things-factory/system-ui": "^4.3.815",
|
|
108
|
-
"@things-factory/transport-base": "^4.3.
|
|
108
|
+
"@things-factory/transport-base": "^4.3.819",
|
|
109
109
|
"@things-factory/tutorial-ui": "^4.3.815",
|
|
110
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
111
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
110
|
+
"@things-factory/warehouse-base": "^4.3.819",
|
|
111
|
+
"@things-factory/worksheet-base": "^4.3.819"
|
|
112
112
|
},
|
|
113
113
|
"devDependencies": {
|
|
114
114
|
"@things-factory/builder": "^4.3.815",
|
|
@@ -117,5 +117,5 @@
|
|
|
117
117
|
"cypress-localstorage-commands": "^1.6.1",
|
|
118
118
|
"eslint-plugin-cypress": "^2.12.1"
|
|
119
119
|
},
|
|
120
|
-
"gitHead": "
|
|
120
|
+
"gitHead": "c6a6478dad09702aeafad6a491bf9936ade6a1fe"
|
|
121
121
|
}
|