@things-factory/operato-wms 4.3.699 → 4.3.700

package/client/pages/components/select-inventory-popup.js

@@ -17,6 +17,7 @@ class SelectInventoryPopUp extends localize(i18next)(LitElement) {
       productConfig: Object,
       data: Object,
       bizplaceId: String,
+      releaseShelfLifeOverride: Number,
       searchFields: Array,
       selectMultipleProducts: Boolean,
       switchTypePane: String,
@@ -427,10 +428,13 @@ class SelectInventoryPopUp extends localize(i18next)(LitElement) {
     }
 
     if (paneType === 'product') {
-      const data = this.inventoryData.filter(res => res.batchId !== null)
+      const data = this.processedInventoryData ? this.processedInventoryData : this.inventoryData
+      const filtered = Array.isArray(data)
+        ? data.filter(res => res && res.batchId !== null)
+        : this.inventoryData.filter(res => res && res.batchId !== null)
 
-      if (data?.length > 0) {
-        const remapData = data.map(res => {
+      if (filtered?.length > 0) {
+        const remapData = filtered.map(res => {
           return {
             batchId: res.batchId,
             groupType: res.groupType,
@@ -443,6 +447,10 @@ class SelectInventoryPopUp extends localize(i18next)(LitElement) {
         })
         filters.push({ name: 'batch_product', operator: 'notin', value: remapData })
       }
+      // ensure release shelf-life override is passed for product selection as well
+      if (typeof this.releaseShelfLifeOverride !== 'undefined' && this.releaseShelfLifeOverride !== null) {
+        filters.push({ name: 'releaseShelfLifeOverride', operator: 'eq', value: Number(this.releaseShelfLifeOverride) })
+      }
 
       const response = await client.query({
         query: gql`
@@ -480,6 +488,13 @@ class SelectInventoryPopUp extends localize(i18next)(LitElement) {
         }
       }
     } else {
+      if (typeof this.releaseShelfLifeOverride !== 'undefined' && this.releaseShelfLifeOverride !== null) {
+        filters.push({
+          name: 'releaseShelfLifeOverride',
+          operator: 'eq',
+          value: Number(this.releaseShelfLifeOverride)
+        })
+      }
       filters.push({ name: 'status', operator: 'eq', value: INVENTORY_STATUS.STORED.value })
 
       const data = this.inventoryData
@@ -565,7 +580,7 @@ class SelectInventoryPopUp extends localize(i18next)(LitElement) {
                 packingSize: selectedProduct.packingSize,
                 primaryUnit: selectedProduct.uom,
                 primaryValue: selectedProduct.uomValue,
-                isInventoryDecimal: selectedProduct.isInventoryDecimal,
+                isInventoryDecimal: selectedProduct.isInventoryDecimal
               },
               productDetail: {
                 id: selectedProduct.productDetailId

package/client/pages/order/release-order/create-release-order.js

@@ -117,6 +117,7 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
 
       // refractor
       _contactPointInfo: Object,
+      _releaseShelfLifeOverride: Number,
 
       /* Tab Toggle*/
       _showReleasedOrderInfo: Boolean,
@@ -1433,6 +1434,7 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
     this.refNo = ''
     this.refNo2 = ''
     this.refNo3 = ''
+    this._releaseShelfLifeOverride = null
     this.releaseDate = ''
     this.collectionOrderNo = ''
     this._files = []
@@ -2455,6 +2457,10 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
       releaseGood.vas = undefined
       releaseGood.orderInventories = await this._getOrderInventories()
       // releaseGood.orderVass = this._getOrderVass()
+      // attach selected ContactPoint as relation if present (GraphQL expects a string ID)
+      if (this._contactPointId) {
+        releaseGood.deliverTo = this._contactPointId
+      }
       releaseGood.ownTransport = this._ownTransport
       releaseGood.type = RO_TYPES.B2B.value
       releaseGood.orderMethod = this._pickingStd
@@ -2542,6 +2548,55 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
             ...this.inventoryData,
             records: data
           }
+          return
+        }
+        const insufficientError = response.errors.find(err => err?.extensions?.exception?.errorCode == 'ins1')
+        if (insufficientError) {
+          let failed = []
+          try {
+            failed = JSON.parse(insufficientError?.extensions?.exception?.detail?.data || '[]')
+          } catch (e) {
+            // ignore parse error
+          }
+          const data = this.inventoryData.records
+          const skus = []
+          failed.forEach(dt => {
+            if (dt?.productSku) {
+              skus.push(dt.batchId ? `${dt.productSku} (${dt.batchId})` : `${dt.productSku}`)
+              return
+            }
+            const idx = data.findIndex(
+              x =>
+                x.productId == dt.productId &&
+                (x.batchId || '') == (dt.batchId || '') &&
+                x.packingType == dt.packingType
+            )
+            if (idx >= 0) {
+              const rec = data[idx]
+              rec.isError = true
+              const sku =
+                rec.productSKU ||
+                (rec.inventory ? rec.inventory.productSKU : undefined) ||
+                (rec.product ? rec.product.sku : undefined) ||
+                rec.sku
+              if (sku) {
+                skus.push(dt.batchId ? `${sku} (${dt.batchId})` : `${sku}`)
+              } else {
+                skus.push(dt.productId)
+              }
+            } else {
+              // fallback if record not found in grid
+              skus.push(dt.productId)
+            }
+          })
+          this.inventoryData = { ...this.inventoryData, records: [...data] }
+          const uniqueSkus = [...new Set(skus)]
+          const msg =
+            uniqueSkus.length > 0
+              ? `Insufficient stock for: ${uniqueSkus.join(', ')}`
+              : i18next.t('text.insufficient_stock')
+          this._showToast({ type: 'error', message: msg })
+          return
         }
       }
     } catch (e) {
@@ -2800,6 +2855,9 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
             .switchTypePane="${type}"
             .inventoryData="${this.inventoryGrist.dirtyData.records}"
             .recall="${this._recallInput.checked}"
+            .releaseShelfLifeOverride="${this._releaseShelfLifeOverride != null
+              ? Number(this._releaseShelfLifeOverride)
+              : null}"
             @selected="${e => {
               let newRecords = []
               for (let i = 0; i < e.detail.multipleProducts.length; i++) {
@@ -3647,6 +3705,12 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
         <contact-points-popup
           @selected="${e => {
             this._fillUpDeliveryInfo(e.detail)
+            this._contactPointInfo = e.detail || {}
+            this._contactPointId = e.detail?.id || ''
+            this._releaseShelfLifeOverride =
+              e.detail && e.detail.releaseShelfLife != null && e.detail.releaseShelfLife !== 0
+                ? Number(e.detail.releaseShelfLife)
+                : null
           }}"
           .partnerBizplaceIds="${this._bizplaces.map(itm => itm.id)}"
         ></contact-points-popup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "4.3.699",
+  "version": "4.3.700",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -66,7 +66,7 @@
     "@things-factory/attachment-ui": "^4.3.695",
     "@things-factory/auth-ui": "^4.3.695",
     "@things-factory/barcode-ui": "^4.3.695",
-    "@things-factory/biz-ui": "^4.3.695",
+    "@things-factory/biz-ui": "^4.3.700",
     "@things-factory/board-service": "^4.3.695",
     "@things-factory/board-ui": "^4.3.695",
     "@things-factory/code-ui": "^4.3.695",
@@ -82,16 +82,16 @@
     "@things-factory/i18n-base": "^4.3.695",
     "@things-factory/id-rule-base": "^4.3.695",
     "@things-factory/import-ui": "^4.3.695",
-    "@things-factory/import-ui-excel": "^4.3.695",
+    "@things-factory/import-ui-excel": "^4.3.700",
     "@things-factory/menu-ui": "^4.3.695",
     "@things-factory/more-ui": "^4.3.695",
     "@things-factory/notification": "^4.3.695",
     "@things-factory/pdf": "^4.3.591",
     "@things-factory/print-proxy-service": "^4.3.695",
     "@things-factory/print-ui": "^4.3.695",
-    "@things-factory/product-base": "^4.3.695",
+    "@things-factory/product-base": "^4.3.700",
     "@things-factory/resource-ui": "^4.3.695",
-    "@things-factory/sales-ui": "^4.3.697",
+    "@things-factory/sales-ui": "^4.3.700",
     "@things-factory/scene-data-transform": "^4.3.591",
     "@things-factory/scene-excel": "^4.3.591",
     "@things-factory/scene-firebase": "^4.3.591",
@@ -105,10 +105,10 @@
     "@things-factory/scene-visualizer": "^4.3.591",
     "@things-factory/setting-ui": "^4.3.695",
     "@things-factory/system-ui": "^4.3.695",
-    "@things-factory/transport-base": "^4.3.695",
+    "@things-factory/transport-base": "^4.3.700",
     "@things-factory/tutorial-ui": "^4.3.695",
-    "@things-factory/warehouse-base": "^4.3.695",
-    "@things-factory/worksheet-base": "^4.3.699"
+    "@things-factory/warehouse-base": "^4.3.700",
+    "@things-factory/worksheet-base": "^4.3.700"
   },
   "devDependencies": {
     "@things-factory/builder": "^4.3.591",
@@ -117,5 +117,5 @@
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "1d70991e559afcb07bc401d3871703295e65a452"
+  "gitHead": "f1b712fc8f3a7b7b5136204e4c4fd6bfad0e766e"
 }