@things-factory/operato-wms 4.3.767 → 4.3.769

package/client/pages/bulk-operation/validate-gan-popup.js

@@ -353,8 +353,8 @@ class ValidateGanPopup extends localize(i18next)(LitElement) {
             containerNo: raw.containerNo,
             containerSize: raw.containerSize,
             sku: raw.sku,
-            batchId: raw.batchId,
-            batchIdRef: raw.batchIdRef,
+            batchId: raw.batchId ? raw.batchId.trim() : raw.batchId,
+            batchIdRef: raw.batchIdRef ? raw.batchIdRef.trim() : raw.batchIdRef,
             packingType: raw.packingType,
             packingSize: raw.packingSize,
             uom: raw.uom,

package/client/pages/inventory/inventory-adjustment.js

@@ -1220,6 +1220,9 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
         row.transferQty = toFloatOrUndefined(row.transferQty)
         row.transferUomValue = toFloatOrUndefined(row.transferUomValue)
 
+        if (row?.batchId) row.batchId = row.batchId.trim()
+        if (row?.batchIdRef) row.batchIdRef = row.batchIdRef.trim()
+
         if (row?.inventoryItemChanges) {
           row.inventoryItemChangesJson = row.inventoryItemChanges
           delete row.inventoryItemChanges
@@ -1423,9 +1426,9 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           <import-pop-up
             .records=${records}
             .config=${{
-              rows: this.config.rows,
-              columns: columns
-            }}
+            rows: this.config.rows,
+            columns: columns
+          }}
             .importHandler="${this.importHandler.bind(this)}"
             @field-change="${this.fieldChange.bind(this)}"
           ></import-pop-up>
@@ -1604,15 +1607,15 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           .title="${i18next.t('title.inventory_remark')}"
           .value="${record.remark}"
           @submit="${async e => {
-            await this.updateRemark(record.id, e.detail.value)
+          await this.updateRemark(record.id, e.detail.value)
 
-            this.dataGrist._data = {
-              records: this.dataGrist._data.records.map(updateRecord => {
-                if (updateRecord.id === record.id) updateRecord.remark = e.detail.value
-                return updateRecord
-              })
-            }
-          }}"
+          this.dataGrist._data = {
+            records: this.dataGrist._data.records.map(updateRecord => {
+              if (updateRecord.id === record.id) updateRecord.remark = e.detail.value
+              return updateRecord
+            })
+          }
+        }}"
         ></popup-note>
       `,
       {
@@ -1626,13 +1629,13 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
   openSerialNumberPopup(inventory, rowIndex, records) {
     const removable =
       inventory?.product?.isRequireSerialNumberScanningOutbound &&
-      inventory?.product?.isRequireSerialNumberScanningInbound
+        inventory?.product?.isRequireSerialNumberScanningInbound
         ? true
         : false
 
     const updatable =
       inventory?.product?.isRequireSerialNumberScanningOutbound &&
-      inventory?.product?.isRequireSerialNumberScanningInbound
+        inventory?.product?.isRequireSerialNumberScanningInbound
         ? true
         : false
 
@@ -1645,43 +1648,43 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           .enableRemove=${removable}
           .enableUpdateBtn=${updatable}
           @confirm-serial-number-list="${e => {
-            let totalSerialNumber = 0
-            let newRecords = []
-            for (let i = 0; i < e.detail.inventoryItemChanges.length; i++) {
-              let inventoryItemChange = e.detail.inventoryItemChanges[i]
-              newRecords.push(inventoryItemChange)
+          let totalSerialNumber = 0
+          let newRecords = []
+          for (let i = 0; i < e.detail.inventoryItemChanges.length; i++) {
+            let inventoryItemChange = e.detail.inventoryItemChanges[i]
+            newRecords.push(inventoryItemChange)
 
-              if (inventoryItemChange.type == INVENTORY_ITEM_CHANGE_TYPE.NEW.value) totalSerialNumber++
+            if (inventoryItemChange.type == INVENTORY_ITEM_CHANGE_TYPE.NEW.value) totalSerialNumber++
 
-              if (inventoryItemChange.type == INVENTORY_ITEM_CHANGE_TYPE.REMOVED.value) totalSerialNumber--
-            }
+            if (inventoryItemChange.type == INVENTORY_ITEM_CHANGE_TYPE.REMOVED.value) totalSerialNumber--
+          }
 
-            let inventoryItemChangesJson = JSON.stringify(newRecords)
-            let currentInventoryItemCount = records[rowIndex]?.inventoryItemCount || 0
+          let inventoryItemChangesJson = JSON.stringify(newRecords)
+          let currentInventoryItemCount = records[rowIndex]?.inventoryItemCount || 0
 
-            this.dataGrist.dirtyData.records[rowIndex].inventoryItemChanges = inventoryItemChangesJson
-            this.dataGrist.dirtyData.records[rowIndex].inventoryItemCount =
-              currentInventoryItemCount + totalSerialNumber
-            if (!this.dataGrist?.dirtyData?.records[rowIndex]?.__dirtyfields__) {
-              this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__ = {
-                inventoryItemChanges: { before: '', after: inventoryItemChangesJson }
-              }
-            } else {
-              this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__ = {
-                ...this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__,
-                inventoryItemChanges: {
-                  before: '',
-                  after: inventoryItemChangesJson
-                }
+          this.dataGrist.dirtyData.records[rowIndex].inventoryItemChanges = inventoryItemChangesJson
+          this.dataGrist.dirtyData.records[rowIndex].inventoryItemCount =
+            currentInventoryItemCount + totalSerialNumber
+          if (!this.dataGrist?.dirtyData?.records[rowIndex]?.__dirtyfields__) {
+            this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__ = {
+              inventoryItemChanges: { before: '', after: inventoryItemChangesJson }
+            }
+          } else {
+            this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__ = {
+              ...this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__,
+              inventoryItemChanges: {
+                before: '',
+                after: inventoryItemChangesJson
               }
             }
-            this.dataGrist.dirtyData.records[rowIndex].__dirty__ = 'M'
+          }
+          this.dataGrist.dirtyData.records[rowIndex].__dirty__ = 'M'
 
-            if (records[rowIndex]) {
-              records[rowIndex].inventoryItemChanges = inventoryItemChangesJson
-              records[rowIndex].inventoryItemCount = currentInventoryItemCount + totalSerialNumber
-            }
-          }}"
+          if (records[rowIndex]) {
+            records[rowIndex].inventoryItemChanges = inventoryItemChangesJson
+            records[rowIndex].inventoryItemCount = currentInventoryItemCount + totalSerialNumber
+          }
+        }}"
         ></serial-number-list-popup>
       `,
       {