@things-factory/operato-wms 3.7.13 → 3.8.1

package/client/pages/inbound/inbound-worksheet.js

@@ -8,7 +8,7 @@ import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, navigate, PageView } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
-import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
+import { isMobileDevice } from '@things-factory/utils'
 
 import { WORKSHEET_TYPE } from '../constants'
 
@@ -181,13 +181,24 @@ class InboundWorksheet extends localize(i18next)(PageView) {
 
     this.config = {
       list: {
-        fields: ['arrivalNotice', 'bizplace', 'type', 'arrivalRefNo', 'status', 'startedAt', 'endedAt']
+        fields: [
+          'arrivalNotice',
+          'bizplace',
+          'type',
+          'arrivalRefNo',
+          'status',
+          'createdAt',
+          'startedAt',
+          'endedAt',
+          'updater',
+          'updatedAt'
+        ]
       },
-      rows: { appendable: false },
+      rows: { appendable: false, selectable: { multiple: true } },
       pagination: { limit: 100, pages: [20, 50, 100, 200, 500] },
       columns: [
-        { type: 'gutter', gutterName: 'dirty' },
         { type: 'gutter', gutterName: 'sequence' },
+        { type: 'gutter', gutterName: 'row-selector', multiple: true },
         {
           type: 'gutter',
           gutterName: 'button',
@@ -215,6 +226,7 @@ class InboundWorksheet extends localize(i18next)(PageView) {
           type: 'object',
           name: 'arrivalNotice',
           header: i18next.t('field.arrival_notice'),
+          label: true,
           sortable: true,
           width: 160
         },
@@ -222,6 +234,7 @@ class InboundWorksheet extends localize(i18next)(PageView) {
           type: 'string',
           name: 'arrivalRefNo',
           header: i18next.t('field.ref_no'),
+          label: true,
           sortable: true,
           width: 120
         },
@@ -229,12 +242,14 @@ class InboundWorksheet extends localize(i18next)(PageView) {
           type: 'boolean',
           name: 'crossDocking',
           header: i18next.t('field.cross_docking'),
+          label: true,
           width: 100
         },
         {
           type: 'object',
           name: 'bizplace',
           header: i18next.t('field.company'),
+          label: true,
           sortable: true,
           width: 200
         },
@@ -242,6 +257,7 @@ class InboundWorksheet extends localize(i18next)(PageView) {
           type: 'string',
           name: 'type',
           header: i18next.t('field.type'),
+          label: true,
           sortable: true,
           width: 120
         },
@@ -249,6 +265,7 @@ class InboundWorksheet extends localize(i18next)(PageView) {
           type: 'string',
           name: 'status',
           header: i18next.t('field.status'),
+          label: true,
           sortable: true,
           width: 120
         },
@@ -256,6 +273,7 @@ class InboundWorksheet extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'createdAt',
           header: i18next.t('field.created_at'),
+          label: true,
           sortable: true,
           width: 160
         },
@@ -263,6 +281,7 @@ class InboundWorksheet extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'startedAt',
           header: i18next.t('field.started_at'),
+          label: true,
           sortable: true,
           width: 160
         },
@@ -270,6 +289,7 @@ class InboundWorksheet extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'endedAt',
           header: i18next.t('field.ended_at'),
+          label: true,
           sortable: true,
           width: 160
         },
@@ -277,6 +297,7 @@ class InboundWorksheet extends localize(i18next)(PageView) {
           type: 'object',
           name: 'updater',
           header: i18next.t('field.updater'),
+          label: true,
           sortable: true,
           width: 150
         },
@@ -284,6 +305,7 @@ class InboundWorksheet extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'updatedAt',
           header: i18next.t('field.updated_at'),
+          label: true,
           sortable: true,
           width: 200
         }
@@ -311,12 +333,8 @@ class InboundWorksheet extends localize(i18next)(PageView) {
 
     const response = await client.query({
       query: gql`
-        query {
-          worksheets(${gqlBuilder.buildArgs({
-            filters,
-            pagination: { page, limit },
-            sortings: sorters
-          })}) {
+        query worksheets($filters: [Filter!]!, $pagination: Pagination, $sortings: [Sorting!]!) {
+          worksheets(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
               name
@@ -346,7 +364,8 @@ class InboundWorksheet extends localize(i18next)(PageView) {
             total
           }
         }
-      `
+      `,
+      variables: { filters, pagination: { page, limit }, sortings: sorters }
     })
 
     if (!response.errors) {
@@ -419,12 +438,59 @@ class InboundWorksheet extends localize(i18next)(PageView) {
     }
   }
 
-  get _columns() {
-    return this.config.columns
+  async _exportableData() {
+    try {
+      let data = []
+
+      var headerSetting = [
+        { header: i18next.t('field.order_no'), key: 'orderNo', width: 25, type: 'string' },
+        { header: i18next.t('field.company'), key: 'bizplaceName', width: 25, type: 'string' },
+        { header: i18next.t('field.ref_no'), key: 'arrivalRefNo', width: 25, type: 'string' },
+        { header: i18next.t('field.cross_docking'), key: 'crossDocking', width: 30, type: 'string' },
+        { header: i18next.t('field.type'), key: 'type', width: 25, type: 'string' },
+        { header: i18next.t('field.status'), key: 'status', width: 25, type: 'string' },
+        { header: i18next.t('field.created_at'), key: 'createdAt', width: 30, type: 'date' },
+        { header: i18next.t('field.started_at'), key: 'startedAt', width: 30, type: 'date' },
+        { header: i18next.t('field.ended_at'), key: 'endedAt', width: 30, type: 'date' },
+        { header: i18next.t('field.updated_at'), key: 'updatedAt', width: 30, type: 'date' },
+        { header: i18next.t('field.updater'), key: 'updaterName', width: 25, type: 'string' }
+      ]
+
+      if (this.dataGrist.selected && this.dataGrist.selected.length > 0) {
+        data = this.dataGrist.selected.map(record => {
+          return {
+            ...record,
+            orderNo: record.arrivalNotice?.name,
+            bizplaceName: record.bizplace?.name,
+            updaterName: record.updater?.name
+          }
+        })
+      } else {
+        data = (await this.fetchHandler({ page: 1, limit: 9999999 })).records.map(record => {
+          return {
+            ...record,
+            orderNo: record.arrivalNotice?.name,
+            bizplaceName: record.bizplace?.name,
+            updaterName: record.updater?.name
+          }
+        })
+      }
+
+      return { header: headerSetting, data }
+    } catch (e) {
+      this._showToast(e)
+    }
   }
 
-  _exportableData() {
-    return this.dataGrist.exportRecords()
+  _showToast({ type, message }) {
+    document.dispatchEvent(
+      new CustomEvent('notify', {
+        detail: {
+          type,
+          message
+        }
+      })
+    )
   }
 }
 

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

@@ -39,7 +39,10 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
       incompleteLocationName: Boolean,
       locations: Array,
       recommendLocationName: String,
-      _scanning: Boolean
+      _scanning: Boolean,
+      _expirationPeriod: Number,
+      _expirationDate: Number,
+      _locationType: String
     }
   }
 
@@ -330,6 +333,9 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
     this.recommendLocationName = null
     this._operationType = OPERATION_TYPE.PUTAWAY
     this._scanning = false
+    this._expirationPeriod = 0
+    this._expirationDate = 0
+    this._locationType = ''
   }
 
   get completed() {
@@ -498,6 +504,7 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
                   sku
                   name
                   description
+                  expirationPeriod
                 }
                 qty
                 status
@@ -537,7 +544,9 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
                 ...record,
                 completed: record.status === WORKSHEET_STATUS.DONE.value,
                 packingTypeSize: `${record.packingType}(${record.packingSize})`,
-                reusablePalletName: reusablePalletName
+                reusablePalletName: reusablePalletName,
+                expirationPeriod: record.product.expirationPeriod,
+                expirationDate: record.expirationDate
               }
             })
             .sort((a, b) => {
@@ -583,6 +592,7 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
                   name
                   description
                   sku
+                  expirationPeriod
                 }
                 qty
                 status
@@ -621,7 +631,9 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
                 ...record,
                 completed: record.status === WORKSHEET_STATUS.DONE.value,
                 packingTypeSize: `${record.packingType}(${record.packingSize})`,
-                reusablePalletName: reusablePalletName
+                reusablePalletName: reusablePalletName,
+                expirationPeriod: record.product.expirationPeriod,
+                expirationDate: record.expirationDate
               }
             })
             .sort((a, b) => {
@@ -786,8 +798,20 @@ 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)
+          const locationDetails = await this._fetchLocation(this.locationInput.value.trim())
+
+          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()
+            }
+          } else {
+            worksheetDetailNames.push(this._selectedOrderProduct.name)
+            if (this._selectedOrderProduct.expirationPeriod > 0 && locationDetails.type !== 'QUARANTINE') {
+              await this._expiryAlert()
+            }
+          }
 
           const response = await client.mutate({
             mutation: gql`
@@ -847,8 +871,20 @@ 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)
+          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()
+            }
+          } else {
+            worksheetDetailNames.push(this._selectedOrderProduct.name)
+            if (this._selectedOrderProduct.expirationPeriod > 0 && locationDetails.type !== 'QUARANTINE') {
+              await this._expiryAlert()
+            }
+          }
 
           const response = await client.mutate({
             mutation: gql`
@@ -995,8 +1031,23 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
+  async _expiryAlert() {
+    await CustomAlert({
+      title: i18next.t('title.location_scanned_is_not_a_quarantine_zone'),
+      confirmButton: { text: i18next.t('button.confirm') }
+    })
+  }
+
   _getSelectedOrderProducts(scannedCartonId) {
-    return this.data.records.filter(record => record.cartonId === scannedCartonId).map(record => record.name)
+    return this.data.records
+      .filter(record => record.cartonId === scannedCartonId)
+      .map(record => {
+        return {
+          name: record.name,
+          expirationDate: record.expirationDate,
+          expirationPeriod: record.product.expirationPeriod
+        }
+      })
   }
 
   async _validatePutaway() {
@@ -1101,7 +1152,7 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
     if (filters) {
       const response = await client.query({
         query: gql`
-          query locations($filters: [Filter]) {
+          query locations($filters: [Filter!]!) {
             locations(filters: $filters) {
               items {
                 id
@@ -1136,6 +1187,7 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
               row
               column
               shelf
+              type
             }
           }
         `,

package/client/pages/inbound/putaway-worksheet-generate-popup.js

@@ -1,8 +1,10 @@
-import { i18next, localize } from '@things-factory/i18n-base'
-import { client, CustomAlert } from '@things-factory/shell'
-import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
 import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit-element'
+
+import { i18next, localize } from '@things-factory/i18n-base'
+import { client, CustomAlert } from '@things-factory/shell'
+import { isMobileDevice } from '@things-factory/utils'
+
 import { INVENTORY_STATUS, ORDER_INVENTORY_STATUS } from '../constants'
 
 class PutawayWorksheetGeneratePopup extends localize(i18next)(LitElement) {
@@ -165,7 +167,18 @@ class PutawayWorksheetGeneratePopup extends localize(i18next)(LitElement) {
 
     this.inventoryGristConfig = {
       list: {
-        fields: ['batchId', 'product', 'packingType', 'palletId', 'cartonId', 'qty', 'uomValue', 'uom', 'updatedAt']
+        fields: [
+          'batchId',
+          'product',
+          'packingType',
+          'packingSize',
+          'palletId',
+          'cartonId',
+          'qty',
+          'uomValue',
+          'uom',
+          'updatedAt'
+        ]
       },
       pagination: { infinite: true },
       rows: { selectable: { multiple: true }, appendable: false },
@@ -176,6 +189,7 @@ class PutawayWorksheetGeneratePopup extends localize(i18next)(LitElement) {
           type: 'string',
           name: 'batchId',
           header: i18next.t('field.batch_id'),
+          label: true,
           sortable: true,
           width: 150
         },
@@ -183,6 +197,7 @@ class PutawayWorksheetGeneratePopup extends localize(i18next)(LitElement) {
           type: 'object',
           name: 'product',
           header: i18next.t('field.product'),
+          label: true,
           sortable: true,
           width: 200
         },
@@ -190,6 +205,7 @@ class PutawayWorksheetGeneratePopup extends localize(i18next)(LitElement) {
           type: 'string',
           name: 'packingType',
           header: i18next.t('field.packing_type'),
+          label: true,
           sortable: true,
           width: 200
         },
@@ -197,6 +213,7 @@ class PutawayWorksheetGeneratePopup extends localize(i18next)(LitElement) {
           type: 'number',
           name: 'packingSize',
           header: i18next.t('field.packing_size'),
+          label: true,
           sortable: true,
           width: 100
         },
@@ -204,36 +221,42 @@ class PutawayWorksheetGeneratePopup extends localize(i18next)(LitElement) {
           type: 'string',
           name: 'palletId',
           header: i18next.t('field.lot_id'),
+          label: true,
           width: 150
         },
         {
           type: 'string',
           name: 'cartonId',
           header: i18next.t('field.carton_id'),
+          label: true,
           width: 150
         },
         {
           type: 'number',
           name: 'qty',
           header: i18next.t('field.qty'),
+          label: true,
           width: 80
         },
         {
           type: 'number',
           name: 'uomValue',
           header: i18next.t('field.uom_value'),
+          label: true,
           width: 80
         },
         {
           type: 'string',
           name: 'uom',
           header: i18next.t('field.uom'),
+          label: true,
           width: 80
         },
         {
           type: 'datetime',
           name: 'updatedAt',
           header: i18next.t('field.updated_at'),
+          label: true,
           sortable: true,
           width: 150
         },
@@ -241,6 +264,7 @@ class PutawayWorksheetGeneratePopup extends localize(i18next)(LitElement) {
           type: 'object',
           name: 'updater',
           header: i18next.t('field.updater'),
+          label: true,
           width: 150
         }
       ]
@@ -269,7 +293,7 @@ class PutawayWorksheetGeneratePopup extends localize(i18next)(LitElement) {
     try {
       const response = await client.query({
         query: gql`
-          query inventories($filters: [Filter]) {
+          query inventories($filters: [Filter!]!) {
             inventories(filters: $filters) {
               items {
                 id

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

@@ -35,6 +35,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       _enableCartonLabel: Boolean,
       _enableInputQty: Boolean,
       _isRequiredCheckExpiry: Boolean,
+      _expirationPeriod: Number,
       customerCompanyDomainId: String,
       orderProductConfig: Object,
       orderProductData: Object,
@@ -161,8 +162,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       })
     }
 
-    if (this.orderProductData && this.orderProductData.records.length
-      && this.completable) {
+    if (this.orderProductData && this.orderProductData.records.length && this.completable) {
       actions.push({
         title: i18next.t('button.complete'),
         action: this._complete.bind(this),
@@ -219,7 +219,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
   get productBarcodeInput() {
     return this.shadowRoot
       .querySelector('barcode-scanable-input[name=productBarcode]')
-      .shadowRoot.querySelector('input')
+      ?.shadowRoot?.querySelector('input')
   }
 
   get actualQtyInput() {
@@ -403,6 +403,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     this._isQtyChecked = false
     this._enableProductScanning = false
     this._isRequiredCheckExpiry = false
+    this._expirationPeriod = 0
     this._orderNo = ''
     this._productName = ''
     this._productSku = ''
@@ -950,7 +951,6 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       if (this._enableInputQty) {
         this.actualQtyInput.value = ''
         this.cartonInput.value = ''
-        this._isRequiredCheckExpiry = false
         this._focusOnCartonInput()
       }
     } else {
@@ -1020,9 +1020,21 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
   }
 
   async _scanProductUnload() {
-    if (this._scanning === false){
+    if (this._scanning === false) {
       this._scanning = true
       try {
+        if (this._isRequiredCheckExpiry && this._expirationPeriod > 0) {
+          let date = new Date()
+          const acceptBefore = new Date(date.setDate(date.getDate() + this._expirationPeriod))
+          let expiryDate = new Date(this.expDateInput.value)
+          if (expiryDate < acceptBefore) {
+            await CustomAlert({
+              title: i18next.t('title.item_unloading_is_expiring_soon'),
+              confirmButton: { text: i18next.t('button.confirm') }
+            })
+          }
+        }
+
         const response = await client.mutate({
           mutation: gql`
             mutation scanProductUnload(
@@ -1056,15 +1068,27 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       }
 
       this._scanning = false
-    }else {
+    } else {
       this._showToast({ message: i18next.t('text.previous_scan_is_executing') })
     }
   }
 
   async _qtyUnload() {
-    if (this._scanning === false){
+    if (this._scanning === false) {
       this._scanning = true
       try {
+        if (this._isRequiredCheckExpiry && this._expirationPeriod > 0) {
+          let date = new Date()
+          const acceptBefore = new Date(date.setDate(date.getDate() + this._expirationPeriod))
+          let expiryDate = new Date(this.expDateInput.value)
+          if (expiryDate < acceptBefore) {
+            await CustomAlert({
+              title: i18next.t('title.item_unloading_is_expiring_soon'),
+              confirmButton: { text: i18next.t('button.confirm') }
+            })
+          }
+        }
+
         const response = await client.mutate({
           mutation: gql`
             mutation unload($worksheetDetailName: String!, $inventory: InventoryPatch!, $productBarcode: String) {
@@ -1090,8 +1114,40 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       }
 
       this._scanning = false
-    }else {
-      this._showToast({ message: i18next.t('text.previous_scan_is_executing')})
+    } else {
+      this._showToast({ message: i18next.t('text.previous_scan_is_executing') })
+    }
+  }
+
+  //need to enhance
+  async _checkedLotScannedProduct() {
+    const response = await client.query({
+      query: gql`
+        query productDetail($gtin: String!, $productId: String!, $customerCompanyDomainId: String!) {
+          productDetail(gtin: $gtin, productId: $productId, customerCompanyDomainId: $customerCompanyDomainId) {
+            id
+            name
+            packingType
+            packingSize
+            gtin
+            product {
+              id
+              name
+              sku
+              isRequiredCheckExpiry
+              expirationPeriod
+            }
+          }
+        }
+      `,
+      variables: {
+        gtin: '',
+        productId: this._selectedOrderProduct.product.id,
+        customerCompanyDomainId: this.customerCompanyDomainId
+      }
+    })
+    if (!response.errors) {
+      this._expirationPeriod = response.data.productDetail.product.expirationPeriod
     }
   }
 
@@ -1099,8 +1155,8 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     try {
       const response = await client.query({
         query: gql`
-          query productDetail($gtin: String!, $customerCompanyDomainId: String!) {
-            productDetail(gtin: $gtin, customerCompanyDomainId: $customerCompanyDomainId) {
+          query productDetail($gtin: String!, $productId: String!, $customerCompanyDomainId: String!) {
+            productDetail(gtin: $gtin, productId: $productId, customerCompanyDomainId: $customerCompanyDomainId) {
               id
               name
               packingType
@@ -1111,23 +1167,27 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
                 name
                 sku
                 isRequiredCheckExpiry
+                expirationPeriod
               }
             }
           }
         `,
-        variables: { gtin: this.productBarcodeInput.value, customerCompanyDomainId: this.customerCompanyDomainId }
+        variables: {
+          gtin: this.productBarcodeInput?.value || '',
+          productId: '',
+          customerCompanyDomainId: this.customerCompanyDomainId
+        }
       })
       if (!response.errors) {
         const { product, packingSize, packingType, id } = response.data.productDetail
         const foundOrderProducts = this.orderProductData.records.filter(
           orderProduct =>
-          orderProduct.product.id === product.id &&
-          orderProduct.packingType === packingType &&
-          orderProduct.packingSize === packingSize
+            orderProduct.product.id === product.id &&
+            orderProduct.packingType === packingType &&
+            orderProduct.packingSize === packingSize
         )
         const foundParentProducts = this.orderProductData.records.filter(
-          orderProduct =>
-            orderProduct.product.id === product.id 
+          orderProduct => orderProduct.product.id === product.id
         )
 
         if (!foundOrderProducts?.length) {
@@ -1140,6 +1200,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
             throw new Error(i18next.t('text.no_matching_product_found'))
           }
         }
+        this._expirationPeriod = product.expirationPeriod
         this._isRequiredCheckExpiry = product.isRequiredCheckExpiry
 
         if (this._selectedOrderProduct && this._selectedOrderProduct.product.sku !== product.sku)
@@ -1154,8 +1215,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
             this._selectedOrderProduct.product.description ? `(${this._selectedOrderProduct.product.description})` : ''
           }`
           this._fillUpForm(this.inputForm, this._selectedOrderProduct)
-
-        } else if (foundOrderProducts?.length == 0 && foundParentProducts?.length == 1 && !this._selectedOrderProduct){
+        } else if (foundOrderProducts?.length == 0 && foundParentProducts?.length == 1 && !this._selectedOrderProduct) {
           this._selectedOrderProduct = foundParentProducts[0]
 
           this._productName = `(${this._selectedOrderProduct.product.sku})${this._selectedOrderProduct.product.name} ${
@@ -1659,6 +1719,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           this._openPopupUnloading(this.palletInput.value, this.orderProductData, this.palletProductData)
         } else {
           await this._validateUnloading()
+          await this._checkedLotScannedProduct()
           this._qtyUnload()
         }
       }