@things-factory/operato-wms 4.3.824 → 4.3.825

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

@@ -857,17 +857,8 @@ class TransferInventory extends connect(store)(localize(i18next)(PageView)) {
   async pageInitialized() {
     this._transferCodes = await getCodeByName('TRANSFER_CODES')
 
-    const [locationRecommendationLevel, stackingOptionLimitStr] = await Promise.all([
-      fetchSettingRule('location-recommendation-level'),
-      fetchSettingRule('stacking-option-limit')
-    ])
+    const locationRecommendationLevel = await fetchSettingRule('location-recommendation-level')
     this._locationRecommendationLevel = (locationRecommendationLevel || '').toUpperCase().trim()
-    try {
-      const parsed = JSON.parse(stackingOptionLimitStr || '{}')
-      this._stackingOptionLimit = { min: Number(parsed.Min) || 1, max: Number(parsed.Max) || 1 }
-    } catch {
-      this._stackingOptionLimit = { min: 1, max: 1 }
-    }
 
     await this._fetchLocations()
     this.refInventoryType = INVENTORY_TYPES.LOT.value
@@ -1340,73 +1331,42 @@ class TransferInventory extends connect(store)(localize(i18next)(PageView)) {
     const level = this._locationRecommendationLevel
     if (!level) return true
 
-    const fromSku = this._selectedInventory?.product?.sku
+    const originPalletId = this._selectedInventory?.palletId
+    const qty = parseFloat(this.qtyInput?.value) || 0
+
+    // RECOMMENDATION LEVEL 4 -> QTY IS REQUIRED FOR CHECKING
+    if (level === 'LEVEL 4' && qty <= 0) {
+      throw new Error(i18next.t('text.please_enter_transfer_qty'))
+    }
 
     const response = await client.query({
       query: gql`
-        query inventories($filters: [Filter!]) {
-          inventories(filters: $filters) {
-            items {
-              product { sku }
-            }
-            total
+        query checkTransferLocationRecommendation($originPalletId: String!, $toLocationName: String!, $qty: Float!) {
+          checkTransferLocationRecommendation(originPalletId: $originPalletId, toLocationName: $toLocationName, qty: $qty) {
+            warningMessage
           }
         }
       `,
-      variables: {
-        filters: [
-          { name: 'locationName', operator: 'eq', value: toLocationName },
-          { name: 'status', operator: 'eq', value: 'STORED' }
-        ]
-      }
+      variables: { originPalletId, toLocationName, qty }
     })
 
-    if (response.errors) return true
+    if (!response.errors) {
+      const warningKey = response.data?.checkTransferLocationRecommendation?.warningMessage
+      if (!warningKey) return true
 
-    const { items: inventoriesAtLocation = [], total: countAtLocation = 0 } = response.data.inventories
+      const warningMsg = i18next.t(`text.${warningKey}`)
 
-    let warningMsg = null
+      const result = await CustomAlert({
+        title: i18next.t('title.reminder'),
+        text: level === 'LEVEL 4' ? `${warningMsg}\n\n${i18next.t('text.may_proceed_without_level_4_recommendation')}` : warningMsg,
+        confirmButton: { text: i18next.t('button.proceed') },
+        cancelButton: { text: i18next.t('button.cancel') }
+      })
 
-    switch (level) {
-      case 'LEVEL 1': {
-        await this._fetchLocations(); // REFRESH TO GET LATEST
-        const toLocation = (this._locations || []).find(l => l.name === toLocationName)
-        if (toLocation?.status?.toUpperCase() !== 'EMPTY') {
-          warningMsg = i18next.t('text.reminder_location_assigned_to_another_sku')
-        }
-        break
-      }
-      case 'LEVEL 2': {
-        const hasDifferentSku = inventoriesAtLocation.some(inv => inv.product?.sku !== fromSku)
-        if (hasDifferentSku) {
-          warningMsg = i18next.t('text.reminder_location_assigned_to_another_sku')
-        }
-        break
-      }
-      case 'LEVEL 3': {
-        const hasDifferentSku = inventoriesAtLocation.some(inv => inv.product?.sku !== fromSku)
-        const allowStacking = this._selectedInventory?.product?.allowStackingOption
-        const stackingLimit = allowStacking ? this._stackingOptionLimit?.max : null
-        const hitStackingLimit = stackingLimit != null && countAtLocation >= stackingLimit
-        if (hasDifferentSku || hitStackingLimit) {
-          warningMsg = i18next.t('text.reminder_location_occupied_by_different_sku_or_stacking_capacity')
-        }
-        break
-      }
-      default:
-        
+      return result.value
     }
 
-    if (!warningMsg) return true
-
-    const result = await CustomAlert({
-      title: i18next.t('title.reminder'),
-      text: warningMsg,
-      confirmButton: { text: i18next.t('button.confirm') },
-      cancelButton: { text: i18next.t('button.cancel') }
-    })
-
-    return result.value
+    return false
   }
 
   _isSpecialLocationType(type) {

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

@@ -215,6 +215,11 @@ class SelectProductPopup extends localize(i18next)(LitElement) {
               uom
               uomValue
               costPrice
+              lengthUnit
+              width
+              depth
+              height
+              volume
               product {
                 id
                 name
@@ -269,6 +274,11 @@ class SelectProductPopup extends localize(i18next)(LitElement) {
           isError: false,
           productBrand: record.brand,
           unitPrice: parseFloat(record.costPrice).toFixed(2),
+          lengthUnit: record.lengthUnit || null,
+          width: record.width || null,
+          depth: record.depth || null,
+          height: record.height || null,
+          volume: record.volume || null,
           product: {
             id: record.productId,
             name: record.name,
@@ -302,6 +312,11 @@ class SelectProductPopup extends localize(i18next)(LitElement) {
               isError: false,
               productBrand: selectedProduct.brand,
               unitPrice: parseFloat(selectedProduct.costPrice).toFixed(2),
+              lengthUnit: selectedProduct.lengthUnit || null,
+              width: selectedProduct.width || null,
+              depth: selectedProduct.depth || null,
+              height: selectedProduct.height || null,
+              volume: selectedProduct.volume || null,
               product: {
                 id: selectedProduct.productId,
                 name: selectedProduct.name,
@@ -336,6 +351,11 @@ class SelectProductPopup extends localize(i18next)(LitElement) {
             isError: false,
             unitPrice: parseFloat(itm.costPrice).toFixed(2),
             productBrand: itm.brand,
+            lengthUnit: itm.lengthUnit || null,
+            width: itm.width || null,
+            depth: itm.depth || null,
+            height: itm.height || null,
+            volume: itm.volume || null,
             product: {
               id: itm.productId,
               name: itm.name,

package/client/pages/constants/location.js

@@ -45,5 +45,9 @@ export const LOCATION_TYPE = {
   DAMAGE: {
     name: 'DAMAGE',
     value: 'DAMAGE'
+  },
+  PICKFACE: {
+    name: 'PICKFACE',
+    value: 'PICKFACE'
   }
 }

package/client/pages/master/location-list.js

@@ -70,7 +70,7 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
         .config=${this.config}
         .fetchHandler="${this.fetchHandler.bind(this)}"
         @select-record-change=${e => (this._selectedRecords = e.detail.selectedRecords)}
-        }
+        @record-change=${this._onRecordChange.bind(this)}
       ></data-grist>
     `
   }
@@ -275,6 +275,41 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
           sortable: true,
           width: 80
         },
+        {
+          type: 'float',
+          name: 'length',
+          header: i18next.t('field.length_m'),
+          record: { editable: true },
+          imex: { header: i18next.t('field.length_m'), key: 'length', width: 25, type: 'float' },
+          sortable: true,
+          width: 80
+        },
+        {
+          type: 'float',
+          name: 'width',
+          header: i18next.t('field.width_m'),
+          record: { editable: true },
+          imex: { header: i18next.t('field.width_m'), key: 'width', width: 25, type: 'float' },
+          sortable: true,
+          width: 80
+        },
+        {
+          type: 'float',
+          name: 'height',
+          header: i18next.t('field.height_m'),
+          record: { editable: true },
+          imex: { header: i18next.t('field.height_m'), key: 'height', width: 25, type: 'float' },
+          sortable: true,
+          width: 80
+        },
+        {
+          type: 'float',
+          name: 'volume',
+          header: i18next.t('field.volume_m3'),
+          record: { editable: false },
+          sortable: true,
+          width: 80
+        },
         {
           type: 'select',
           name: 'status',
@@ -302,6 +337,15 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
           sortable: true,
           width: 80
         },
+        {
+          type: 'string',
+          name: 'locationClass',
+          header: i18next.t('field.class'),
+          record: { editable: true },
+          imex: { header: i18next.t('field.class'), key: 'locationClass', width: 50, type: 'string' },
+          sortable: true,
+          width: 120
+        },
         {
           type: 'datetime',
           name: 'updatedAt',
@@ -336,8 +380,18 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
             .records=${records}
             .config=${{
               rows: this.config.rows,
-              columns: [...this.config.columns.filter(column => column.imex !== undefined)]
+              columns: [
+                ...this.config.columns.filter(column => column.imex !== undefined),
+                {
+                  type: 'string',
+                  name: 'errMsg',
+                  header: i18next.t('field.error_message'),
+                  record: { editable: false },
+                  width: 300
+                }
+              ]
             }}
+            .enableRowErrors=${true}
             .importHandler="${this.importHandler.bind(this)}"
           ></import-pop-up>
         `,
@@ -373,6 +427,11 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
               column
               shelf
               status
+              length
+              width
+              height
+              volume
+              locationClass
               updatedAt
               updater {
                 id
@@ -394,16 +453,10 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
     if (!response.errors) {
       var responseItems = response.data.locations.items || []
       var total = response.data.locations.total || 0
-
-      if (this._locationList.length > 0) {
-        let generatedItems = this._locationList
-        var records = [...responseItems, ...generatedItems]
-        total += generatedItems.length
-      }
     }
 
     return {
-      records: records || responseItems || [],
+      records: responseItems || [],
       total: total || 0
     }
   }
@@ -419,7 +472,10 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
       const locationType = Object.keys(LOCATION_TYPE)
       const locationStatus = Object.keys(LOCATION_STATUS)
 
+      let hasError = false
       patches = patches.map(itm => {
+        itm.errMsg = ''
+
         //  Error if there is an empty value
         if (
           isEmpty(itm.name) ||
@@ -430,30 +486,56 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
           isEmpty(itm.status) ||
           ''
         ) {
-          throw new Error(i18next.t('text.empty_value_in_list'))
+          itm.errMsg = i18next.t('text.empty_value_in_list')
+          hasError = true
+          return itm
         }
         // Error if location name is already existed
         if (records.find(exist => exist.name == itm.name)) {
-          throw new Error(i18next.t('text.location_name(s)_already_existed'))
+          itm.errMsg = i18next.t('text.location_name(s)_already_existed')
+          hasError = true
+          return itm
         }
 
-        // Error if location status does not exist
+        // Error if location type does not exist
         let foundLocationType = locationType.find(exist => exist == itm.type)
         if (!foundLocationType) {
-          throw new Error(i18next.t('text.location_type_does_not_exist'))
+          itm.errMsg = i18next.t('text.location_type_does_not_exist')
+          hasError = true
+          return itm
         }
-        // Error if location type does not exist
+
+        // Error if Class has data for Quarantine or Damage location type
+        const isRestricted = [LOCATION_TYPE.QUARANTINE.value, LOCATION_TYPE.DAMAGE.value].includes(itm.type)
+        if (isRestricted && itm.locationClass) {
+          itm.errMsg = i18next.t('text.cannot_update_class_for_quarantine_or_damage_location')
+          hasError = true
+          return itm
+        }
+
+        // Error if location status does not exist
         let foundLocationStatus = locationStatus.find(exist => exist == itm.status)
         if (!foundLocationStatus) {
-          throw new Error(i18next.t('text.location_status_does_not_exist'))
+          itm.errMsg = i18next.t('text.location_status_does_not_exist')
+          hasError = true
+          return itm
         }
+
         return itm
       })
+
+      if (hasError) return patches
+
       if (patches && patches.length) {
         patches = patches.map(patch => {
           if (this._warehouseId) {
             patch.warehouse = { id: this._warehouseId }
           }
+          delete patch.errMsg
+          delete patch.volume
+          patch.length = patch.length || null
+          patch.width = patch.width || null
+          patch.height = patch.height || null
           return patch
         })
         const response = await client.mutate({
@@ -502,6 +584,7 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
           if (this._warehouseId && !patch.warehouse) {
             patch.warehouse = { id: this._warehouseId }
           }
+          delete patch.volume
           return patch
         })
 
@@ -650,9 +733,11 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
     openPopup(
       html`
         <generate-location-list
-          @generated="${e => {
-            this._locationList = e.detail
-            this.dataGrist.fetch()
+          @generated="${async e => {
+            await this.dataGrist.fetch()
+            this.dataGrist._data.records.push(...e.detail)
+            this.dataGrist._data.total += e.detail.length
+            this.dataGrist.refresh()
           }}"
         ></generate-location-list>
       `,
@@ -783,6 +868,43 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
+  _onRecordChange(e) {
+    const { column, after } = e.detail
+
+    if (column.name === 'type') {
+      const isRestricted = [LOCATION_TYPE.QUARANTINE.value, LOCATION_TYPE.DAMAGE.value].includes(after.type)
+      if (isRestricted) after.locationClass = null
+      return
+    }
+
+    if (column.name === 'locationClass') {
+      const isRestricted = [LOCATION_TYPE.QUARANTINE.value, LOCATION_TYPE.DAMAGE.value].includes(after.type)
+      if (isRestricted) {
+        after.locationClass = null
+        showToast(new Error(i18next.t('text.cannot_update_class_for_quarantine_or_damage_location')))
+      }
+      return
+    }
+
+    if (!['length', 'width', 'height'].includes(column.name)) return
+
+    const value = parseFloat(after[column.name])
+    if (!isNaN(value) && value <= 0) {
+      showToast(new Error(i18next.t('text.value_must_be_greater_than_zero')))
+      after[column.name] = null
+    } else if (!isNaN(value)) {
+      after[column.name] = parseFloat(value.toFixed(2))
+    }
+
+    const length = after.length
+    const width = after.width
+    const height = after.height
+
+    after.volume = length > 0 && width > 0 && height > 0
+      ? parseFloat((parseFloat(length) * parseFloat(width) * parseFloat(height)).toFixed(2))
+      : null
+  }
+
   stateChanged(state) {
     var locationLabelSetting = state.dashboard[LOCATION_LABEL_SETTING_KEY]
     this._locationLabel = (locationLabelSetting && locationLabelSetting.board) || {}

package/client/pages/order/arrival-notice/create-arrival-notice.js

@@ -46,6 +46,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       _disableCrossDockingSetting: Boolean,
       _hideCrossDockingSetting: Boolean,
       _strictProductSelection: Boolean,
+      _locationRecommendationLevel: String,
       containerSizes: Array,
       productGristConfig: Object,
       vasGristConfig: Object,
@@ -477,6 +478,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
     this._hideCrossDockingSetting = await fetchSettingRule('hide-cross-dock')
     this._bizplaces = await this.fetchBizplaces()
     this.enableDirectInbound = await fetchSettingRule('enable-direct-gan-order')
+    this._locationRecommendationLevel = (await fetchSettingRule('location-recommendation-level') || '').toUpperCase().trim()
 
     this._validateTransport()
 
@@ -1223,6 +1225,22 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       this._validateProducts()
       this._validateVas()
 
+      if (this._locationRecommendationLevel === 'LEVEL 4') {
+        const records = this.productGrist.dirtyData.records
+        const invalidProduct = records.find(record =>
+          !record.lengthUnit || (record.volume == null && (!record.width || !record.depth || !record.height))
+        )
+        if (invalidProduct) {
+          const result = await CustomAlert({
+            title: i18next.t('title.reminder'),
+            text: i18next.t('text.missing_product_dimensions_for_level_4'),
+            confirmButton: { text: i18next.t('button.proceed') },
+            cancelButton: { text: i18next.t('button.cancel') }
+          })
+          if (!result.value) return
+        }
+      }
+
       const result = await CustomAlert({
         title: i18next.t('title.are_you_sure'),
         text: i18next.t('text.create_arrival_notice'),

package/client/pages/order/draft-release-good/draft-release-good-list.js

@@ -241,6 +241,7 @@ class DraftReleaseGoodList extends localize(i18next)(PageView) {
           { name: 'Shopify', value: 'SPF' },
           { name: 'Tiktok', value: 'TTK' },
           { name: 'Magento', value: 'MGT' },
+          { name: 'Xilnex', value: 'XILNEX' },
           { name: 'Generic', value: 'GENERIC' }
         ]
       }