@things-factory/operato-wms 4.3.656 → 4.3.660

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

@@ -1,6 +1,7 @@
 import '@things-factory/biz-ui'
 import '@things-factory/grist-ui'
 import '@things-factory/import-ui'
+import '@things-factory/warehouse-ui'
 import '../../components/select-product-popup'
 import '../../components/select-transport-vehicle-popup'
 import '../../order/vas-order/popup/vas-create-popup'
@@ -55,7 +56,8 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       _bizplaceName: String,
       _showAddProducts: Boolean,
       _vasExpanded: Boolean,
-      _transportVehicle: String
+      _transportVehicle: String,
+      enableDirectInbound: Boolean
     }
   }
 
@@ -421,6 +423,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
     this._showAddProducts = false
     this._vasExpanded = false
     this._transportVehicle = ''
+    this.enableDirectInbound = false
   }
 
   get arrivalNoticeForm() {
@@ -470,6 +473,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
     this._disableCrossDockingSetting = await fetchSettingRule('disable-cross-dock')
     this._hideCrossDockingSetting = await fetchSettingRule('hide-cross-dock')
     this._bizplaces = await this.fetchBizplaces()
+    this.enableDirectInbound = await fetchSettingRule('enable-direct-gan-order')
 
     this._validateTransport()
 
@@ -767,6 +771,49 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       productGristColumns.splice(packQtyColumnIdx + 1, 0, ...crossDockingColumns)
     }
 
+    const expDateColumn = {
+      type: 'date',
+      name: 'expDate',
+      header: i18next.t('field.exp_date'),
+      imex: { key: 'expDate', width: 25, type: 'string' },
+      record: { editable: editable },
+      width: 150
+    }
+
+    const locationColumn = {
+      type: 'object',
+      name: 'location',
+      header: i18next.t('field.location'),
+      imex: { header: i18next.t('field.location'), key: 'location', width: 30, type: 'object' },
+      handlers: {
+        click: (columns, data, column, record, rowIndex) => {
+          this._openLocationSelection(rowIndex)
+        }
+      },
+      width: 150
+    }
+
+    const warehouseColumn = {
+      type: 'object',
+      name: 'warehouse',
+      header: i18next.t('field.warehouse'),
+      imex: { key: 'warehouse', width: 30, type: 'string' },
+      width: 150,
+      recordFormatter: (warehouse, updatedRecords) => warehouse?.name || ''
+    }
+
+    function insertAfter(cols, anchorName, newCols) {
+      const idx = cols.findIndex(c => c.name === anchorName)
+      if (idx >= 0) cols.splice(idx + 1, 0, ...newCols)
+    }
+
+    if (this.enableDirectInbound) {
+      const anchor = this._enableLotIdInput ? 'palletId' : 'palletQty'
+      insertAfter(productGristColumns, anchor, [expDateColumn])
+
+      insertAfter(productGristColumns, 'batchIdRef', [warehouseColumn, locationColumn])
+    }
+
     this.productGristConfig = {
       pagination: { infinite: true },
       list: { fields: ['batch_no', 'product', 'packingType', 'totalUomValue'] },
@@ -843,7 +890,8 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
                 // update existing product data records
                 this.productGrist.dirtyData.records.splice(rowIndex, 1, {
                   ...this.productGrist.dirtyData.records[rowIndex],
-                  ...e.detail
+                  ...e.detail,
+                  isRequiredCheckExpiry: e.detail.product.isRequiredCheckExpiry
                 })
 
                 this.productGrist.dirtyData.records = this.productGrist.dirtyData.records.map(item => {
@@ -882,9 +930,57 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
     }
   }
 
+  _openLocationSelection(rowIndex) {
+    if (this._bizplaceId) {
+      openPopup(
+        html`
+          <buffer-location-selector
+            .bizplaceId="${this._bizplaceId}"
+            .enableDirectInbound="${this.enableDirectInbound}"
+            @selected="${async e => {
+              this.productGrist.dirtyData.records[rowIndex].location = { id: e.detail.id, name: e.detail.name }
+              this.productGrist.dirtyData.records[rowIndex].warehouse = {
+                id: e.detail.warehouse.id,
+                name: e.detail.warehouse.name
+              }
+              this.productGrist.dirtyData.records[rowIndex].__dirty__ = true
+
+              if (this.productGrist.dirtyData.records.length !== rowIndex) {
+                this.productGrist.dirtyData.records.splice(rowIndex, 1, {
+                  ...this.productGrist.dirtyData.records[rowIndex]
+                })
+
+                this.productData = {
+                  ...this.productData,
+                  records: [...this.productGrist.dirtyData.records]
+                }
+
+                this.productGrist.data.records = this.productGrist.dirtyData.records
+              } else {
+                this.productData = {
+                  ...this.productData,
+                  records: [...this.productGrist.dirtyData.records]
+                }
+              }
+            }}"
+          ></buffer-location-selector>
+        `,
+        {
+          backdrop: true,
+          size: 'large',
+          title: i18next.t('title.select_location', 'Select Location')
+        }
+      )
+    } else {
+      this._showToast({ message: i18next.t('text.company_selection_is_empty') })
+    }
+  }
+
   _onProductChangeHandler(event) {
     try {
-      this._checkProductDuplication()
+      if (!this.enableDirectInbound) {
+        this._checkProductDuplication
+      }
       let changeRecord = event.detail.after
       const changedColumn = event.detail.column.name
 
@@ -936,6 +1032,17 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
         }
       }
 
+      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'
+            })
+          )
+        }
+      }
+
       this._updateVasTargets(true)
     } catch (e) {
       const beforeValue = event.detail.before && event.detail.before[event.detail.column.name]
@@ -1047,6 +1154,34 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
     return calcedRecord
   }
 
+  async fetchLocation() {
+    const filter = []
+    if (this.enableDirectInbound) {
+      filter.push({
+        name: 'type',
+        operator: 'noteq',
+        value: 'BIN'
+      })
+    }
+    const response = await client.query({
+      query: gql`
+        query locations($filters: [Filter!]!) {
+          locations(filters: $filters) {
+            items {
+              id
+              name
+              warehouse {
+                name
+              }
+            }
+          }
+        }
+      `,
+      variables: { filters: filter }
+    })
+    return response.data.locations.items
+  }
+
   async fetchBizplaces() {
     const filters = []
     const response = await client.query({
@@ -1116,16 +1251,28 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       delete arrivalNotice.bizplaceId
       delete arrivalNotice.bizplaceName
 
-      const response = await client.mutate({
-        mutation: gql`
-          mutation generateArrivalNotice($arrivalNotice: NewArrivalNotice!, $files: [Upload!]) {
-            generateArrivalNotice(arrivalNotice: $arrivalNotice, files: $files) {
-              id
-              name
-              crossDocking
+      const mutation = this.enableDirectInbound
+        ? gql`
+            mutation submitDirectInboundArrivalNotice($arrivalNotice: NewArrivalNotice!, $files: [Upload!]) {
+              submitDirectInboundArrivalNotice(arrivalNotice: $arrivalNotice, files: $files) {
+                id
+                name
+                crossDocking
+              }
             }
-          }
-        `,
+          `
+        : gql`
+            mutation generateArrivalNotice($arrivalNotice: NewArrivalNotice!, $files: [Upload!]) {
+              generateArrivalNotice(arrivalNotice: $arrivalNotice, files: $files) {
+                id
+                name
+                crossDocking
+              }
+            }
+          `
+
+      const response = await client.mutate({
+        mutation,
         variables: {
           arrivalNotice: {
             ...arrivalNotice,
@@ -1139,8 +1286,13 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
 
       if (!response.errors) {
         this._clearView()
-        const ganNo = response.data.generateArrivalNotice.name
-        const isCrossDocking = response.data.generateArrivalNotice.crossDocking
+
+        const resultData = this.enableDirectInbound
+          ? response.data.submitDirectInboundArrivalNotice
+          : response.data.generateArrivalNotice
+
+        const ganNo = resultData.name
+        const isCrossDocking = resultData.crossDocking
         if (!isCrossDocking) {
           navigate(`arrival_notice_detail/${ganNo}`)
         } else {
@@ -1260,7 +1412,9 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
     if (!records?.length) records = this.productGrist.dirtyData.records
     if (!records?.length) throw new Error(i18next.t('text.no_products'))
 
-    this._checkProductDuplication()
+    if (!this.enableDirectInbound) {
+      this._checkProductDuplication()
+    }
 
     const checkRequiredFields = ({ batchId, packQty }) => !batchId || !packQty
 
@@ -1309,6 +1463,30 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
         })
       )
     }
+
+    if (this.enableDirectInbound) {
+      records.forEach((record, index) => {
+        if (this.enableDirectInbound && record?.product?.isRequiredCheckExpiry && !record.expDate) {
+          throw new Error(
+            i18next.t('text.exp_date_required_for_product', {
+              defaultValue: `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: `Row ${index + 1}: Location is missing for product "${record.product?.name}"`,
+              product: record.product.name,
+              row: index + 1
+            })
+          )
+        }
+      })
+    }
   }
 
   _validateVas() {
@@ -1409,7 +1587,10 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
         totalUomValue: record?.totalUomValue ? record?.totalUomValue : 0,
         unitPrice: record?.unitPrice ? record.unitPrice : 0,
         remark: record?.remark ? record.remark : null,
+        expDate: record?.expDate ? record.expDate : null,
         manufactureDate: record?.manufactureDate ? record.manufactureDate : null,
+        warehouse: record?.warehouse ? record.warehouse : null,
+        location: record?.location ? record.location : null,
         palletId: record?.palletId ? record.palletId : null
       }
 
@@ -1692,6 +1873,23 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
         imex: { header: i18next.t('field.batch_id_ref'), key: 'batchIdRef', width: 25, type: 'string' },
         width: 100
       },
+      ...(this.enableDirectInbound
+        ? [
+            {
+              type: 'object',
+              name: 'location',
+              header: i18next.t('field.location'),
+              imex: {
+                header: i18next.t('field.location'),
+                key: 'location.name',
+                width: 30,
+                type: 'array',
+                arrData: []
+              },
+              width: 120
+            }
+          ]
+        : []),
       {
         type: 'float',
         name: 'unitPrice',
@@ -1705,18 +1903,41 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
         header: i18next.t('field.remark'),
         imex: { header: i18next.t('field.remark'), key: 'remark', width: 25, type: 'string' },
         width: 100
-      }
+      },
+      ...(this.enableDirectInbound
+        ? [
+            {
+              type: 'string',
+              name: 'errMsg',
+              header: i18next.t('field.error_message'),
+              imex: { header: i18next.t('field.error_message'), key: 'errMsg', width: 25, type: 'string' },
+              width: 350
+            }
+          ]
+        : [])
     ]
 
     return productColumns
   }
 
   async _exportableData() {
+    let location = await this.fetchLocation()
     try {
       var headerSetting = [
         ...this.excelColumns()
           .filter(column => column.type !== 'gutter' && column.imex !== undefined)
           .map(column => {
+            if (this.enableDirectInbound && column.header == 'location') {
+              location = location.map(item => {
+                let newName = `${item.name} (${item.warehouse.name})`
+                return {
+                  ...item,
+                  name: newName
+                }
+              })
+
+              column.imex.arrData = location
+            }
             return column.imex
           })
       ]
@@ -1750,6 +1971,14 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
             productName
             productBrand
             isError
+            warehouse {
+              id
+              name
+            }
+            location {
+              id
+              name
+            }
             product {
               id
               name
@@ -1787,6 +2016,8 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       }
     }
 
+    // Validate for location
+
     if (!foundErrors) {
       if (!response.errors) {
         const data = response.data.bulkUploadValidateOrderProducts.map(item => {
@@ -1828,14 +2059,13 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
     try {
       const orderProducts = patches.map(patch => {
         if (patch.manufactureDate) {
-          const mdt = new Date(patch.manufactureDate);
-          patch.manufactureDate = mdt < new Date()
-            ? `${mdt.getFullYear()}-${mdt.getMonth() + 1}-${mdt.getDate()}`
-            : ''
+          const mdt = new Date(patch.manufactureDate)
+          patch.manufactureDate = mdt < new Date() ? `${mdt.getFullYear()}-${mdt.getMonth() + 1}-${mdt.getDate()}` : ''
         } else {
           delete patch.manufactureDate
         }
         delete patch.cuFlag
+        delete patch.errMsg
         return {
           ...patch,
           uomValue: Math.round(parseFloat(patch.uomValue) * 1000) / 1000 || 0,
@@ -1844,10 +2074,6 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
           unitPrice: patch.unitPrice ? parseFloat(patch.unitPrice) : null
         }
       })
-      // redundant as records also patched during bulkUploadValidateOrderProducts and we don't need it to write on grist before validation
-      // this.productData = {
-      //   records: [...patches]
-      // }
       await this.bulkUploadValidateOrderProducts(orderProducts)
       history.back()
     } catch (e) {
@@ -1858,10 +2084,26 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
 
   async _importableData(records) {
     try {
+      if (!this.enableDirectInbound && records.some(record => record.location)) {
+        throw new Error(
+          'Location-based assignment is not allowed. Please delete the' +
+            ' location ' +
+            'column or enable Direct GAN Order in settings.'
+        )
+      }
       if (this._bizplaceId) {
         records = records
           .filter(record => record.productSKU)
           .map(record => {
+            let warehouseName
+            if (this.enableDirectInbound) {
+              const match = record.location.name.match(/(.*) \((.*)\)/)
+              if (match && match.length === 3) {
+                record.location.name = match[1].trim()
+                warehouseName = match[2].trim()
+                record = { ...record, warehouseName: warehouseName }
+              }
+            }
             return {
               ...record,
               unitPrice:
@@ -1869,24 +2111,24 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
                   ? '0.00'
                   : record.unitPrice === undefined
                   ? null
-                  : parseFloat(record.unitPrice).toFixed(2),
+                  : parseFloat(parseFloat(record.unitPrice).toFixed(2)),
               packQty:
                 record.packQty == null && record.packQty !== undefined
                   ? '0'
                   : record.packQty === undefined
                   ? null
-                  : parseFloat(record.packQty).toFixed(3),
+                  : parseFloat(parseFloat(record.packQty).toFixed(3)),
               palletQty:
                 record.palletQty == null && record.palletQty !== undefined
-                  ? '0'
+                  ? parseInt('0')
                   : record.palletQty === undefined
                   ? null
-                  : parseInt(record.palletQty)
+                  : parseInt(record.palletQty),
+              uomValue: record.uomValue !== null && record.uomValue !== undefined ? parseFloat(record.uomValue) : ''
             }
           })
 
         this._validateProducts(records)
-
         openPopup(
           html`
             <import-pop-up
@@ -1896,6 +2138,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
                 columns: [...this.excelColumns().filter(column => column.imex !== undefined)]
               }}
               .importHandler="${await this.importHandler.bind(this)}"
+              .enableDirectInbound=${this.enableDirectInbound}
             ></import-pop-up>
           `,
           {