@things-factory/operato-wms 4.3.658 → 4.3.661

package/client/pages/order/arrival-notice/edit-product-popup.js

@@ -82,7 +82,8 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
       productData: Object,
       newProductData: Object,
       strictEditable: Boolean,
-      userRole: Array
+      userRole: Array,
+      enableDirectInbound: Boolean
     }
   }
 
@@ -132,9 +133,7 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
           raised
           @click="${this._addEditProducts.bind(this, true)}"
           label="${i18next.t('button.submit')}"
-          class="${this.status !== 'PENDING'
-            ? 'hidden'
-            : ''}"
+          class="${this.status !== 'PENDING' ? 'hidden' : ''}"
         ></mwc-button>
       </div>
     `
@@ -148,286 +147,364 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
 
   async firstUpdated() {
     this.enableLotIdInput = await fetchSettingRule('enable-lot-id-input')
+    this.enableDirectInbound = await fetchSettingRule('enable-direct-gan-order')
+
+    const fields = [
+      'batchId',
+      'productSku',
+      'product',
+      'brand',
+      'packingType',
+      'uomValue',
+      'uom',
+      'packQty',
+      'totalUomValue',
+      'palletQty',
+      'palletId',
+      'expDate',
+      'manufactureDate',
+      'batchIdRef',
+      'warehouse',
+      'location',
+      'unitPrice',
+      'remark',
+      'status'
+    ]
+
+    const columns = [
+      { type: 'gutter', gutterName: 'sequence' },
+      { type: 'string', name: 'id', hidden: true },
+      {
+        type: 'string',
+        name: 'batchId',
+        header: i18next.t('field.batch_id'),
+        record: { editable: true },
+        width: 150
+      },
+      {
+        type: 'string',
+        name: 'productSku',
+        header: i18next.t('field.sku'),
+        width: 150
+      },
+      {
+        type: 'object',
+        name: 'product',
+        header: i18next.t('field.product'),
+        width: 350
+      },
+      {
+        type: 'object',
+        name: 'brand',
+        header: i18next.t('field.brand'),
+        width: 150
+      },
+      {
+        type: 'code',
+        name: 'packingType',
+        header: i18next.t('field.packing_type'),
+        record: { editable: !this.strictEditable, codeName: 'PACKING_TYPES' },
+        width: 150
+      },
+      {
+        type: 'float',
+        name: 'uomValue',
+        header: i18next.t('field.uom_value'),
+        record: { editable: !this.strictEditable, options: { min: 0 } },
+        width: 80
+      },
+      {
+        type: 'code',
+        name: 'uom',
+        header: i18next.t('field.uom'),
+        record: { editable: !this.strictEditable, codeName: 'WEIGHT_UNITS' },
+        width: 80
+      },
+      {
+        type: 'float',
+        name: 'packQty',
+        header: i18next.t('field.pack_qty'),
+        record: { editable: true, options: { min: 0 } },
+        width: 80
+      },
+      {
+        type: 'float',
+        name: 'totalUomValue',
+        header: i18next.t('field.total_uom_value'),
+        width: 120
+      },
+      {
+        type: 'integer',
+        name: 'palletQty',
+        header: i18next.t('field.pallet_qty'),
+        record: { editable: true, options: { min: 0 } },
+        width: 80
+      },
+      ...(this._enableLotIdInput
+        ? [
+            {
+              type: 'string',
+              name: 'palletId',
+              header: i18next.t('field.lot_id'),
+              imex: { header: i18next.t('field.lot_id'), key: 'palletId', width: 25, type: 'string' },
+              record: { editable: true },
+              width: 150
+            }
+          ]
+        : []),
+      {
+        type: 'date',
+        name: 'manufactureDate',
+        header: i18next.t('field.manufacture_date'),
+        record: { editable: true },
+        width: 120
+      },
+      {
+        type: 'string',
+        name: 'batchIdRef',
+        header: i18next.t('field.batch_no_ref'),
+        record: { editable: true },
+        width: 150
+      },
+      {
+        type: 'float',
+        name: 'unitPrice',
+        header: i18next.t('field.unit_price'),
+        record: { editable: true },
+        width: 80
+      },
+      {
+        type: 'string',
+        name: 'remark',
+        header: i18next.t('field.remark'),
+        record: { editable: true },
+        width: 300
+      },
+      {
+        type: 'string',
+        name: 'status',
+        header: i18next.t('field.status'),
+        width: 130
+      }
+    ]
+
+    function insertAfter(cols, anchorName, newCols) {
+      const idx = cols.findIndex(c => c.name === anchorName)
+      if (idx >= 0) cols.splice(idx + 1, 0, ...newCols)
+    }
+
+    function createExpDateColumn() {
+      return {
+        type: 'date',
+        name: 'expDate',
+        header: i18next.t('field.exp_date'),
+        record: { editable: true },
+        width: 120
+      }
+    }
+
+    function createWarehouseColumn() {
+      return {
+        type: 'object',
+        name: 'warehouse',
+        header: i18next.t('field.warehouse'),
+        width: 150
+      }
+    }
+
+    function createLocationColumn(clickHandler) {
+      return {
+        type: 'object',
+        name: 'location',
+        header: i18next.t('field.location'),
+        record: { editable: true },
+        handlers: {
+          click: (columns, data, column, record, rowIndex) => {
+            clickHandler(rowIndex)
+          }
+        },
+        width: 150
+      }
+    }
+
+    if (this.enableDirectInbound) {
+      const anchor = this.enableLotIdInput ? 'palletId' : 'palletQty'
+      insertAfter(columns, anchor, [createExpDateColumn()])
+      insertAfter(columns, 'batchIdRef', [
+        createWarehouseColumn(),
+        createLocationColumn(rowIndex => this._openLocationSelection(rowIndex))
+      ])
+    }
+
     this.editProductConfig = {
       pagination: { infinite: true },
       rows: { selectable: { multiple: true }, appendable: false },
       list: {
-        fields: [
-          'batchId',
-          'productSku',
-          'product',
-          'brand',
-          'packingType',
-          'uomValue',
-          'uom',
-          'packQty',
-          'totalUomValue',
-          'palletQty',
-          'palletId',
-          'manufactureDate',
-          'batchIdRef',
-          'unitPrice',
-          'remark',
-          'status'
-        ]
+        fields
       },
-      columns: [
-        { type: 'gutter', gutterName: 'sequence' },
-        {
-          type: 'string',
-          name: 'id',
-          hidden: true
-        },
-        {
-          type: 'string',
-          name: 'batchId',
-          header: i18next.t('field.batch_id'),
-          record: { editable: true },
-          width: 150
-        },
-        {
-          type: 'string',
-          name: 'productSku',
-          header: i18next.t('field.sku'),
-          width: 150
-        },
-        {
-          type: 'object',
-          name: 'product',
-          header: i18next.t('field.product'),
-          width: 350
-        },
-        {
-          type: 'object',
-          name: 'brand',
-          header: i18next.t('field.brand'),
-          width: 150
-        },
-        {
-          type: 'code',
-          name: 'packingType',
-          header: i18next.t('field.packing_type'),
-          record: { editable: !this.strictEditable, codeName: 'PACKING_TYPES' },
-          width: 150
-        },
-        {
-          type: 'float',
-          name: 'uomValue',
-          header: i18next.t('field.uom_value'),
-          record: { editable: !this.strictEditable, options: { min: 0 } },
-          width: 80
-        },
-        {
-          type: 'code',
-          name: 'uom',
-          header: i18next.t('field.uom'),
-          record: { editable: !this.strictEditable, codeName: 'WEIGHT_UNITS' },
-          width: 80
-        },
-        {
-          type: 'float',
-          name: 'packQty',
-          header: i18next.t('field.pack_qty'),
-          record: { editable: true, options: { min: 0 } },
-          width: 80
-        },
-        {
-          type: 'float',
-          name: 'totalUomValue',
-          header: i18next.t('field.total_uom_value'),
-          width: 120
-        },
-        {
-          type: 'integer',
-          name: 'palletQty',
-          header: i18next.t('field.pallet_qty'),
-          record: { editable: true, options: { min: 0 } },
-          width: 80
-        },
-        {
-          type: 'string',
-          name: 'palletId',
-          header: i18next.t('field.lot_id'),
-          width: 80
-        },
-        {
-          type: 'date',
-          name: 'manufactureDate',
-          header: i18next.t('field.manufacture_date'),
-          record: { editable: true },
-          width: 120
-        },
-        {
-          type: 'string',
-          name: 'batchIdRef',
-          header: i18next.t('field.batch_no_ref'),
-          record: { editable: true },
-          width: 150
-        },
-        {
-          type: 'float',
-          name: 'unitPrice',
-          header: i18next.t('field.unit_price'),
-          record: { editable: true },
-          width: 80
-        },
-        {
-          type: 'string',
-          name: 'remark',
-          header: i18next.t('field.remark'),
-          record: { editable: true },
-          width: 300
-        },
-        {
-          type: 'string',
-          name: 'status',
-          header: i18next.t('field.status'),
-          width: 130
+      columns
+    }
+
+    const addFields = [
+      'batchId',
+      'productName',
+      'packingType',
+      'uomValue',
+      'uom',
+      'packQty',
+      'totalUomValue',
+      'palletQty',
+      'palletId',
+      'expDate',
+      'manufactureDate',
+      'batchIdRef',
+      'warehouse',
+      'location',
+      'unitPrice',
+      'remark'
+    ]
+
+    const addColumns = [
+      { type: 'gutter', gutterName: 'sequence' },
+      {
+        type: 'gutter',
+        gutterName: 'button',
+        icon: 'close',
+        handlers: {
+          click: (columns, data, column, record, rowIndex) => {
+            const newData = data.records.filter((_, idx) => idx !== rowIndex)
+            this.newProductData = { ...this.newProductData, records: newData }
+            this.addProductGrist.dirtyData.records = newData
+          }
         }
-      ]
+      },
+      {
+        type: 'string',
+        name: 'batchId',
+        header: i18next.t('field.batch_id'),
+        record: { editable: true },
+        width: 150
+      },
+      {
+        type: 'string',
+        name: 'productName',
+        header: i18next.t('field.product'),
+        imex: { header: i18next.t('field.product'), key: 'productName', width: 50, type: 'string' },
+        handlers: {
+          click: (columns, data, column, record, rowIndex) => {
+            this._openProductSelection(rowIndex)
+          }
+        },
+        width: 350
+      },
+      {
+        type: 'object',
+        name: 'product',
+        hidden: true
+      },
+      {
+        type: 'object',
+        name: 'brand',
+        header: i18next.t('field.brand'),
+        width: 150
+      },
+      {
+        type: 'code',
+        name: 'packingType',
+        header: i18next.t('field.packing_type'),
+        record: { editable: !this.strictEditable, codeName: 'PACKING_TYPES' },
+        width: 150
+      },
+      {
+        type: 'float',
+        name: 'uomValue',
+        header: i18next.t('field.uom_value'),
+        record: { editable: !this.strictEditable, options: { min: 0 } },
+        width: 80
+      },
+      {
+        type: 'code',
+        name: 'uom',
+        header: i18next.t('field.uom'),
+        record: { editable: !this.strictEditable, codeName: 'WEIGHT_UNITS' },
+        width: 80
+      },
+      {
+        type: 'float',
+        name: 'packQty',
+        header: i18next.t('field.pack_qty'),
+        record: { editable: true, options: { min: 0 } },
+        width: 80
+      },
+      {
+        type: 'float',
+        name: 'totalUomValue',
+        header: i18next.t('field.total_uom_value'),
+        width: 120
+      },
+      {
+        type: 'integer',
+        name: 'palletQty',
+        header: i18next.t('field.pallet_qty'),
+        record: { editable: true, options: { min: 0 } },
+        width: 80
+      },
+      ...(this.enableLotIdInput
+        ? [
+            {
+              type: 'string',
+              name: 'palletId',
+              header: i18next.t('field.lot_id'),
+              width: 80
+            }
+          ]
+        : []),
+      {
+        type: 'date',
+        name: 'manufactureDate',
+        header: i18next.t('field.manufacture_date'),
+        record: { editable: true },
+        width: 120
+      },
+      {
+        type: 'string',
+        name: 'batchIdRef',
+        header: i18next.t('field.batch_no_ref'),
+        record: { editable: true },
+        width: 150
+      },
+      {
+        type: 'float',
+        name: 'unitPrice',
+        header: i18next.t('field.unit_price'),
+        record: { editable: true },
+        width: 80
+      },
+      {
+        type: 'string',
+        name: 'remark',
+        header: i18next.t('field.remark'),
+        record: { editable: true },
+        width: 300
+      }
+    ]
+
+    if (this.enableDirectInbound) {
+      const anchor = this.enableLotIdInput ? 'palletId' : 'palletQty'
+      insertAfter(addColumns, anchor, [createExpDateColumn()])
+      insertAfter(addColumns, 'batchIdRef', [
+        createWarehouseColumn(),
+        createLocationColumn(rowIndex => this._openAddLocationSelection(rowIndex))
+      ])
     }
 
     this.addProductConfig = {
       pagination: { infinite: true },
       rows: { selectable: { multiple: true } },
       list: {
-        fields: [
-          'batchId',
-          'productName',
-          'packingType',
-          'uomValue',
-          'uom',
-          'packQty',
-          'totalUomValue',
-          'palletQty',
-          'palletId',
-          'manufactureDate',
-          'batchIdRef',
-          'unitPrice',
-          'remark'
-        ]
+        fields: addFields
       },
-      columns: [
-        { type: 'gutter', gutterName: 'sequence' },
-        {
-          type: 'gutter',
-          gutterName: 'button',
-          icon: 'close',
-          handlers: {
-            click: (columns, data, column, record, rowIndex) => {
-              const newData = data.records.filter((_, idx) => idx !== rowIndex)
-              this.newProductData = { ...this.newProductData, records: newData }
-              this.addProductGrist.dirtyData.records = newData
-            }
-          }
-        },
-        {
-          type: 'string',
-          name: 'batchId',
-          header: i18next.t('field.batch_id'),
-          record: { editable: true },
-          width: 150
-        },
-        {
-          type: 'string',
-          name: 'productName',
-          header: i18next.t('field.product'),
-          imex: { header: i18next.t('field.product'), key: 'productName', width: 50, type: 'string' },
-          handlers: {
-            click: (columns, data, column, record, rowIndex) => {
-              this._openProductSelection(rowIndex)
-            }
-          },
-          width: 350
-        },
-        {
-          type: 'object',
-          name: 'product',
-          hidden: true
-        },
-        {
-          type: 'object',
-          name: 'brand',
-          header: i18next.t('field.brand'),
-          width: 150
-        },
-        {
-          type: 'code',
-          name: 'packingType',
-          header: i18next.t('field.packing_type'),
-          record: { editable: !this.strictEditable, codeName: 'PACKING_TYPES' },
-          width: 150
-        },
-        {
-          type: 'float',
-          name: 'uomValue',
-          header: i18next.t('field.uom_value'),
-          record: { editable: !this.strictEditable, options: { min: 0 } },
-          width: 80
-        },
-        {
-          type: 'code',
-          name: 'uom',
-          header: i18next.t('field.uom'),
-          record: { editable: !this.strictEditable, codeName: 'WEIGHT_UNITS' },
-          width: 80
-        },
-        {
-          type: 'float',
-          name: 'packQty',
-          header: i18next.t('field.pack_qty'),
-          record: { editable: true, options: { min: 0 } },
-          width: 80
-        },
-        {
-          type: 'float',
-          name: 'totalUomValue',
-          header: i18next.t('field.total_uom_value'),
-          width: 120
-        },
-        {
-          type: 'integer',
-          name: 'palletQty',
-          header: i18next.t('field.pallet_qty'),
-          record: { editable: true, options: { min: 0 } },
-          width: 80
-        },
-        {
-          type: 'string',
-          name: 'palletId',
-          header: i18next.t('field.lot_id'),
-          record: { editable: true },
-          width: 120
-        },
-        {
-          type: 'date',
-          name: 'manufactureDate',
-          header: i18next.t('field.manufacture_date'),
-          record: { editable: true },
-          width: 120
-        },
-        {
-          type: 'string',
-          name: 'batchIdRef',
-          header: i18next.t('field.batch_no_ref'),
-          record: { editable: true },
-          width: 150
-        },
-        {
-          type: 'float',
-          name: 'unitPrice',
-          header: i18next.t('field.unit_price'),
-          record: { editable: true },
-          width: 80
-        },
-        {
-          type: 'string',
-          name: 'remark',
-          header: i18next.t('field.remark'),
-          record: { editable: true },
-          width: 300
-        }
-      ]
+      columns: addColumns
     }
 
     this.userRole = await this.fetchUserRoleHandler()
@@ -443,7 +520,10 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
 
   async _onProductChangeHandler(event) {
     try {
-      this._checkProductDuplication()
+      if (!this.enableDirectInbound) {
+        this._checkProductDuplication()
+      }
+
       let changeRecord = event.detail.after
       const changedColumn = event.detail.column.name
 
@@ -478,6 +558,17 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
           throw new Error(i18next.t('text.invalid_x', { state: { x: i18next.t('label.pallet_qty') } }))
         }
       }
+
+      if (changedColumn === 'expDate') {
+        if (!changeRecord.product?.isRequiredCheckExpiry) {
+          delete changeRecord.expDate
+          throw new Error(
+            i18next.t('text.exp_date_not_required_for_this_product', {
+              defaultValue: `Expiry date is not required for this product`
+            })
+          )
+        }
+      }
     } catch (e) {
       const beforeValue = event.detail.before && event.detail.before[event.detail.column.name]
       if (beforeValue) {
@@ -581,7 +672,7 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
       if (matchingRow?.length > 0) isDuplicated = true
 
       if (isDuplicated) {
-        throw new Error(i18next.t('text.duplicated_lot_id'))
+        throw new Error(i18next.t('text.duplicated_batch_id'))
       }
     } else if (this.enableLotIdInput) {
       const addedNewRows = this.addProductGrist.dirtyData.records
@@ -613,6 +704,102 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
     }
   }
 
+  _openLocationSelection(rowIndex) {
+    openPopup(
+      html`
+        <buffer-location-selector
+          .bizplaceId="${this._bizplaceId}"
+          .data="${this.productData}"
+          .enableDirectInbound="${this.enableDirectInbound}"
+          @selected="${async e => {
+            this.editProductGrist.dirtyData.records[rowIndex].location = { id: e.detail.id, name: e.detail.name }
+            this.editProductGrist.dirtyData.records[rowIndex].warehouse = {
+              id: e.detail.warehouse.id,
+              name: e.detail.warehouse.name
+            }
+            this.editProductGrist.dirtyData.records[rowIndex].__dirty__ = true
+
+            if (this.editProductGrist.dirtyData.records.length !== rowIndex) {
+              // update existing product data records
+              this.editProductGrist.dirtyData.records.splice(rowIndex, 1, {
+                ...this.editProductGrist.dirtyData.records[rowIndex]
+              })
+
+              this.productData = {
+                ...this.productData,
+                records: [...this.editProductGrist.dirtyData.records]
+              }
+
+              this.editProductGrist.data.records = this.editProductGrist.dirtyData.records
+            } else {
+              this.productData = {
+                ...this.productData,
+                records: [...this.editProductGrist.dirtyData.records]
+              }
+            }
+          }}"
+        ></buffer-location-selector>
+      `,
+      {
+        backdrop: true,
+        size: 'large',
+        title: i18next.t('title.select_location', 'Select Location')
+      }
+    )
+  }
+
+  _openAddLocationSelection(rowIndex) {
+    openPopup(
+      html`
+        <buffer-location-selector
+          .bizplaceId="${this._bizplaceId}"
+          .data="${this.newProductData}"
+          .enableDirectInbound="${this.enableDirectInbound}"
+          @selected="${async e => {
+            this.addProductGrist.dirtyData.records[rowIndex].location = { id: e.detail.id, name: e.detail.name }
+            this.addProductGrist.dirtyData.records[rowIndex].warehouse = {
+              id: e.detail.warehouse.id,
+              name: e.detail.warehouse.name
+            }
+            this.addProductGrist.dirtyData.records[rowIndex].__dirty__ = true
+
+            if (this.addProductGrist.dirtyData.records.length !== rowIndex) {
+              // update existing product data records
+              this.addProductGrist.dirtyData.records.splice(rowIndex, 1, {
+                ...this.addProductGrist.dirtyData.records[rowIndex]
+              })
+
+              this.newProductData = {
+                ...this.newProductData,
+                records: [...this.addProductGrist.dirtyData.records]
+              }
+
+              this.addProductGrist.data.records = this.addProductGrist.dirtyData.records
+            } else {
+              this.newProductData = {
+                ...this.newProductData,
+                records: [...this.addProductGrist.dirtyData.records]
+              }
+            }
+          }}"
+        ></buffer-location-selector>
+      `,
+      {
+        backdrop: true,
+        size: 'large',
+        title: i18next.t('title.select_location', 'Select Location')
+      }
+    )
+  }
+
+  async pageUpdated(changes, lifecycle) {
+    if (this.active) {
+      await this.updateComplete
+
+      this.editProductGrist.config = this.editProductConfig
+    }
+  }
+
   _openProductSelection(rowIndex) {
     if (this.bizplace?.id) {
       openPopup(
@@ -656,6 +843,10 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
 
   async _addEditProducts(approveAdminAddEditProducts) {
     try {
+      if (this.enableDirectInbound) {
+        approveAdminAddEditProducts = false
+      }
+
       this._validateProducts()
 
       let existingOrderProducts = []
@@ -715,7 +906,7 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
   }
 
   _getNewOrderProducts() {
-    const isStatusPending = this.status === 'PENDING' ? true : false
+    const isStatusPending = this.status === 'PENDING' && !this.enableDirectInbound
     return this.addProductGrist.dirtyData.records.map(record => {
       record.unitPrice = parseFloat(record.unitPrice) || 0
 
@@ -734,7 +925,7 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
         adjustedUomValue: !isStatusPending ? (record?.uomValue ? record.uomValue : 0) : null,
         uom: isStatusPending ? record.uom : 'N/A',
         adjustedUom: !isStatusPending ? record.uom : null,
-        packQty: isStatusPending ? (record.packQty ? parseFloat(record.packQty).toFixed(3) : 0) : 0,
+        packQty: isStatusPending ? (record.packQty ? parseFloat(parseFloat(record.packQty).toFixed(3)) : 0) : 0,
         adjustedPackQty: !isStatusPending ? record.packQty : null,
         totalUomValue: isStatusPending ? record.totalUomValue : 'N/A',
         adjustedTotalUomValue: record?.totalUomValue && !isStatusPending ? record.totalUomValue : 'N/A',
@@ -744,14 +935,17 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
         unitPrice: isStatusPending ? record.unitPrice : 0,
         adjustedUnitPrice: record?.unitPrice && !isStatusPending ? record.unitPrice : null,
         remark: record?.remark ? record.remark : null,
-        packingSize: record.packingSize || record.product.packingSize
+        packingSize: record.packingSize || record.product.packingSize,
+        expDate: record?.expDate ? record.expDate : null,
+        location: record?.location ? record.location : null,
+        warehouse: record?.warehouse ? record.warehouse : null
       }
     })
   }
 
   _getExistingOrderProducts() {
     let editedOrderProducts = []
-    const isStatusPending = this.status === 'PENDING' ? true : false
+    const isStatusPending = this.status === 'PENDING' && !this.enableDirectInbound
     if (this.editProductGrist.dirtyData.records.some(record => record.__dirty__)) {
       this.editProductGrist.dirtyData.records.map(record => {
         record.unitPrice = parseFloat(record.unitPrice)
@@ -796,6 +990,21 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
               ? null
               : record.totalUomValue
             : null,
+          adjustedExpDate: !isStatusPending
+            ? record.expDate == record.__origin__.expDate
+              ? null
+              : record.expDate
+            : null,
+          adjustedWarehouse: !isStatusPending
+            ? record.warehouse == record.__origin__?.__origin__?.warehouse
+              ? null
+              : record.warehouse
+            : null,
+          adjustedLocation: !isStatusPending
+            ? record.location == record.__origin__?.__origin__?.location
+              ? null
+              : record.location
+            : null,
           manufactureDate: record?.manufactureDate ? record.manufactureDate : null,
           palletId: record?.palletId ? record.palletId : null,
           adjustedUnitPrice: record?.unitPrice && !isStatusPending ? record.unitPrice : null,
@@ -809,7 +1018,10 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
             uomValue: record.uomValue,
             uom: record.uom,
             batchId: record.batchId,
-            totalUomValue: record.totalUomValue
+            totalUomValue: record.totalUomValue,
+            expDate: record.__origin__.expDate,
+            location: record.__origin__.location,
+            warehouse: record.__origin__.warehouse
           })
         })
       })
@@ -832,6 +1044,29 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
     ) {
       throw new Error(i18next.t('text.empty_value_in_add_product_list'))
     }
+
+    this.addProductGrist.dirtyData.records.forEach((record, index) => {
+      if (this.enableDirectInbound && record?.product?.isRequiredCheckExpiry && !record.expDate) {
+        throw new Error(
+          i18next.t('text.exp_date_required_for_product', {
+            defaultValue: `Add Product Row ${index + 1}: Expiry date is required for product "${record.product.name}"`,
+            product: record.product.name,
+            row: index + 1
+          })
+        )
+      }
+
+      if (!record.location || !record.location.id) {
+        throw new Error(
+          i18next.t('text.location_required_for_product', {
+            defaultValue: `Add Product Row ${index + 1}: Location is missing for product "${record.product.name}"`,
+            product: record.product.name,
+            row: index + 1
+          })
+        )
+      }
+    })
+
     this.editProductGrist.dirtyData.records.forEach(record => {
       if (record.packQty === 0 && !record.remark) {
         throw new Error(i18next.t('text.remark_is_empty_kindly_fill_in_to_proceed'))