@things-factory/operato-wms 3.8.4 → 3.8.5

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

@@ -803,14 +803,18 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
           if (this._enableCartonLabel) {
             let worksheetDetail = this._getSelectedOrderProducts(this.cartonInput.value)
             worksheetDetailNames.push(worksheetDetail[0].name)
-            if (worksheetDetail[0].expirationPeriod > 0 && locationDetails.type !== 'QUARANTINE') {
-              await this._expiryAlert()
-            }
+            await this._checkExpiry(
+              worksheetDetail[0].expirationPeriod,
+              new Date(worksheetDetail[0].expirationDate),
+              locationDetails.type
+            )
           } else {
             worksheetDetailNames.push(this._selectedOrderProduct.name)
-            if (this._selectedOrderProduct.expirationPeriod > 0 && locationDetails.type !== 'QUARANTINE') {
-              await this._expiryAlert()
-            }
+            await this._checkExpiry(
+              this._selectedOrderProduct.expirationPeriod,
+              new Date(this._selectedOrderProduct.expirationDate),
+              locationDetails.type
+            )
           }
 
           const response = await client.mutate({
@@ -874,16 +878,20 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
           const locationDetails = await this._fetchLocation(this.locationInput.value.trim())
 
           if (this._enableCartonLabel) {
-            worksheetDetailNames.push(worksheetDetail[0].name)
             let worksheetDetail = this._getSelectedOrderProducts(this.cartonInput.value)
-            if (worksheetDetail[0].expirationPeriod > 0 && locationDetails.type !== 'QUARANTINE') {
-              await this._expiryAlert()
-            }
+            worksheetDetailNames.push(worksheetDetail[0].name)
+            await this._checkExpiry(
+              worksheetDetail[0].expirationPeriod,
+              new Date(worksheetDetail[0].expirationDate),
+              locationDetails.type
+            )
           } else {
             worksheetDetailNames.push(this._selectedOrderProduct.name)
-            if (this._selectedOrderProduct.expirationPeriod > 0 && locationDetails.type !== 'QUARANTINE') {
-              await this._expiryAlert()
-            }
+            await this._checkExpiry(
+              this._selectedOrderProduct.expirationPeriod,
+              new Date(this._selectedOrderProduct.expirationDate),
+              locationDetails.type
+            )
           }
 
           const response = await client.mutate({
@@ -945,8 +953,10 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
         await this._validatePutaway()
         if (!this.incompleteLocationName) {
           let worksheetDetailNames = []
-          if (this._enableCartonLabel) worksheetDetailNames = this._getSelectedOrderProducts(this.cartonInput.value)
-          else worksheetDetailNames.push(this._selectedOrderProduct.name)
+          if (this._enableCartonLabel) {
+            const selectedWorksheetDetailName = this._getSelectedOrderProducts(this.cartonInput.value)
+            worksheetDetailNames.push(selectedWorksheetDetailName[0].name)
+          } else worksheetDetailNames.push(this._selectedOrderProduct.name)
 
           const response = await client.mutate({
             mutation: gql`
@@ -1096,6 +1106,15 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
+  async _checkExpiry(expirationPeriod, expiryDate, locationType) {
+    let date = new Date()
+    let acceptBefore = new Date(date.setDate(date.getDate() + expirationPeriod))
+
+    if (expirationPeriod > 0) {
+      if (expiryDate < acceptBefore && locationType !== 'QUARANTINE') await this._expiryAlert()
+    }
+  }
+
   _validateTransfer() {
     // 1. validate for order selection
     if (!this._selectedOrderProduct) throw new Error(i18next.t('text.target_is_not_selected'))

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

@@ -328,7 +328,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
               <input name="batchIdRef" readonly />
 
               <label>${i18next.t('label.packing_type')}</label>
-              <input name="packingTypeSize" readonly />
+              <input name="packingType" readonly />
 
               <label>${i18next.t('label.total_pallet_qty')}</label>
               <input name="palletQty" type="number" readonly />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "3.8.4",
+  "version": "3.8.5",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -71,7 +71,7 @@
     "@things-factory/print-ui": "^3.8.0",
     "@things-factory/product-base": "^3.8.3",
     "@things-factory/resource-ui": "^3.8.0",
-    "@things-factory/sales-ui": "^3.8.3",
+    "@things-factory/sales-ui": "^3.8.5",
     "@things-factory/scene-chartjs": "^3.7.5",
     "@things-factory/scene-clock": "^3.7.5",
     "@things-factory/scene-clone": "^3.7.5",
@@ -102,11 +102,11 @@
     "@things-factory/system-ui": "^3.8.0",
     "@things-factory/transport-base": "^3.8.0",
     "@things-factory/tutorial-ui": "^3.8.0",
-    "@things-factory/warehouse-base": "^3.8.3",
-    "@things-factory/worksheet-base": "^3.8.4"
+    "@things-factory/warehouse-base": "^3.8.5",
+    "@things-factory/worksheet-base": "^3.8.5"
   },
   "devDependencies": {
     "@things-factory/builder": "^3.7.5"
   },
-  "gitHead": "9dedf75962d3a804204ae3341588ee91533c63dd"
+  "gitHead": "1f8f8ca9c0d96737732388c9cc685e64b0759a96"
 }