@things-factory/operato-wms 4.3.745 → 4.3.747

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

@@ -339,7 +339,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
                 />
               `
             : ''}
-          ${this._isRequiredCheckManufactureDate && this.refOrderType === AVAIL_ORDER_TYPES.ARRIVAL_NOTICE.value
+          ${this._isRequiredCheckManufactureDate
             ? html`
                 <label>${i18next.t('label.manufacture_date')}</label>
                 <input
@@ -471,8 +471,20 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
 
               this.inputForm.reset()
               
-              if (this._isRequiredCheckManufactureDate && record.manufactureDate && this.manufactureDateInput) {
-                this.manufactureDateInput.value = this._formatDateForInput(record.manufactureDate)
+              if (this._isRequiredCheckManufactureDate && record?.manufactureDate && this.refOrderType === AVAIL_ORDER_TYPES.ARRIVAL_NOTICE.value) {
+                setTimeout(() => {
+                  if (this.manufactureDateInput) {
+                    this.manufactureDateInput.value = this._formatDateForInput(record.manufactureDate)
+                  }
+                }, 0)
+              }
+
+              if (this._isRequiredCheckManufactureDate && record?.inventory?.manufactureDate && this.refOrderType === AVAIL_ORDER_TYPES.RETURN_ORDER.value) {
+                setTimeout(() => {
+                  if (this.manufactureDateInput) {
+                    this.manufactureDateInput.value = this._formatDateForInput(record.inventory.manufactureDate)
+                  }
+                }, 0)
               }
               
               if (this._enableCartonLabel) {
@@ -782,6 +794,22 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     return value
   }
 
+  _getManufactureDateValue() {
+    if (this._isRequiredCheckManufactureDate) {
+      return this._getValidManufactureDate()
+    }
+    
+    if (this.refOrderType === AVAIL_ORDER_TYPES.ARRIVAL_NOTICE.value) {
+      return this._selectedOrderProduct?.manufactureDate || null
+    }
+    
+    if (this.refOrderType === AVAIL_ORDER_TYPES.RETURN_ORDER.value) {
+      return this._selectedOrderProduct?.inventory?.manufactureDate || null
+    }
+    
+    return null
+  }
+
   async _fetchProducts(orderNo, response) {
     if (this.refOrderType === AVAIL_ORDER_TYPES.ARRIVAL_NOTICE.value) {
       const response = await client.query({
@@ -979,6 +1007,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
                 }
                 inventory {
                   id
+                  manufactureDate
                 }
                 name
                 targetName
@@ -1241,7 +1270,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
             palletId: this._enableCartonLabel ? null : this.lotInput.value.trim(),
             cartonId: this._enableCartonLabel ? this.cartonInput.value.trim() : null,
             expirationDate: this._isRequiredCheckExpiry ? this.expDateInput.value : null,
-            manufactureDate: this._isRequiredCheckManufactureDate ? this._getValidManufactureDate() : null
+            manufactureDate: this._getManufactureDateValue(),
           }
         }
       })
@@ -1299,7 +1328,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
             palletId: this._enableCartonLabel ? null : this.lotInput.value.trim(),
             cartonId: this._enableCartonLabel ? this.cartonInput.value.trim() : null,
             expirationDate: this._isRequiredCheckExpiry ? this.expDateInput.value : null,
-            manufactureDate: this._isRequiredCheckManufactureDate ? this._getValidManufactureDate() : null
+            manufactureDate: this._getManufactureDateValue(),
           }
         }
       })
@@ -1394,7 +1423,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
             cartonId: this._enableCartonLabel ? this.cartonInput.value.trim() : null,
             qty: qty, // Use the validated qty
             expirationDate: this._isRequiredCheckExpiry ? this.expDateInput.value : null,
-            manufactureDate: this._isRequiredCheckManufactureDate ? this._getValidManufactureDate() : null,
+            manufactureDate: this._getManufactureDateValue(),
             reusablePallet: this._usingReusablePallet ? this._reusablePallet : null
           },
           productBarcode: this._enableProductScanning

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "4.3.745",
+  "version": "4.3.747",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -108,7 +108,7 @@
     "@things-factory/transport-base": "^4.3.745",
     "@things-factory/tutorial-ui": "^4.3.743",
     "@things-factory/warehouse-base": "^4.3.745",
-    "@things-factory/worksheet-base": "^4.3.745"
+    "@things-factory/worksheet-base": "^4.3.747"
   },
   "devDependencies": {
     "@things-factory/builder": "^4.3.743",
@@ -117,5 +117,5 @@
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "89c8b3c8c7ac589d4f547a984c1027a6f509671f"
+  "gitHead": "f75b0a9eee4f2843663d2a652d96be2a8790e6d6"
 }