@things-factory/operato-wms 4.3.752 → 4.3.755

package/client/pages/inbound/unload-product.js

@@ -744,22 +744,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  _formatManufactureDate(date) {
-    if (!date) return date
-    
-    if (!isNaN(Number(date))) {
-      date = Number(date)
-    }
-    
-    const DATE_OPTIONS = {
-      year: 'numeric',
-      month: 'numeric',
-      day: 'numeric'
-    }
-    const formatter = new Intl.DateTimeFormat(navigator.language, DATE_OPTIONS)
-    return formatter.format(new Date(date))
-  }
-
+  //===== FORMAT TIMESTAMP VALUE TO DATE STRING (YYYY-MM-DD) =====
   _formatDateForInput(date) {
     if (!date) return ''
     
@@ -781,6 +766,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     return `${year}-${month}-${day}`
   }
 
+  //==== GET THE VALID MANUFACTURING DATE FROM THE MANUFACTURING DATE INPUT =====
   _getValidManufactureDate() {
     const value = this.manufactureDateInput?.value
     if (!value || value.trim() === '') return null
@@ -795,19 +781,24 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
   }
 
   _getManufactureDateValue() {
+    //===== IF MANUFACTURING DATE CHECK SETTING IS SET =====
     if (this._isRequiredCheckManufactureDate) {
       return this._getValidManufactureDate()
     }
     
+    //===== ELSE, GET THE MANUFACTURING DATE FROM THE SELECTED ORDER PRODUCT =====
+    let manufactureDate = null
+    
     if (this.refOrderType === AVAIL_ORDER_TYPES.ARRIVAL_NOTICE.value) {
-      return this._selectedOrderProduct?.manufactureDate || null
+      manufactureDate = this._selectedOrderProduct?.manufactureDate || null
+    } else if (this.refOrderType === AVAIL_ORDER_TYPES.RETURN_ORDER.value) {
+      manufactureDate = this._selectedOrderProduct?.inventory?.manufactureDate || null
     }
     
-    if (this.refOrderType === AVAIL_ORDER_TYPES.RETURN_ORDER.value) {
-      return this._selectedOrderProduct?.inventory?.manufactureDate || null
-    }
+    if (!manufactureDate) return null
     
-    return null
+    const formattedDate = this._formatDateForInput(manufactureDate)
+    return formattedDate || null
   }
 
   async _fetchProducts(orderNo, response) {
@@ -945,7 +936,12 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
             itm => itm.id == this._selectedOrderProduct.id && itm.actualPackQty == itm.packQty
           )
           if (quantityTally?.length == 1) {
-            this._selectedOrderProduct = null
+            // Only clear selected product if serial number scanning is NOT required
+            // This ensures the Serial Number button remains visible when qty is matched
+            if (!this._isRequireSerialNumberScanningInbound) {
+              this._selectedOrderProduct = null
+            }
+
             if (this._isRequireSerialNumberScanningInbound) {
               this.serialNumberInput.value = ''
 
@@ -1122,17 +1118,18 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
               inventory.packingSize == orderProduct.packingSize
           )
 
-          if (matchingInventories.length > 0) {
-            const manufactureDates = matchingInventories
-              .map(inv => inv.manufactureDate)
-              .filter(date => date != null && date !== '')
-              .map(date => this._formatManufactureDate(date))
-              .filter((date, index, self) => self.indexOf(date) === index)
-              .sort()
-
-            orderProduct.displayManufactureDate = manufactureDates.length > 0 ? manufactureDates.join(', ') : (orderProduct.manufactureDate ? this._formatManufactureDate(orderProduct.manufactureDate) : null)
-          } else if (orderProduct.manufactureDate) {
-            orderProduct.displayManufactureDate = this._formatManufactureDate(orderProduct.manufactureDate)
+          if (matchingInventories.length > 0) { // FOR ARRIVAL NOTICE AND RETURN ORDER WHERE ORDER PRODUCT IS UNLOADED
+            const manufactureDates = [...new Set(
+              matchingInventories
+                .map(inv => this._formatDateForInput(inv.manufactureDate))
+                .filter(date => date)
+            )].sort()
+
+            orderProduct.displayManufactureDate = manufactureDates.length > 0 ? manufactureDates.join(', ') : (orderProduct.manufactureDate ? this._formatDateForInput(orderProduct.manufactureDate) : null)
+          } else if (orderProduct.manufactureDate) { // FOR ARRIVAL NOTICE
+            orderProduct.displayManufactureDate = this._formatDateForInput(orderProduct.manufactureDate)
+          } else if (orderProduct?.inventory?.manufactureDate) { // FOR RETURN ORDER
+            orderProduct.displayManufactureDate = this._formatDateForInput(orderProduct.inventory.manufactureDate)
           }
 
           return orderProduct

package/client/pages/outbound/loading-product.js

@@ -345,8 +345,7 @@ class LoadingProduct extends connect(store)(localize(i18next)(PageView)) {
     this._requireDeliveryInformation = enableLoadingDeliveryInformation
     this._enableLoadingSelectAll = enableLoadingSelectAll || false
 
-    // let enableToteScanning = await fetchSettingRule('enable-tote-scanning')
-    // this._requireDeliveryInformation = await fetchSettingRule('enable-loading-delivery-information')
+    const toteScanningValue = parseInt(enableToteScanning || '0', 10)
 
     let configColumns = [
       { type: 'gutter', gutterName: 'sequence' },
@@ -365,7 +364,7 @@ class LoadingProduct extends connect(store)(localize(i18next)(PageView)) {
       'loadedQty'
     ]
 
-    if (enableToteScanning) {
+    if (toteScanningValue >= 1) {
       configColumns.push({
         type: 'string',
         name: 'toteName',