@things-factory/operato-wms 3.7.15 → 3.8.0

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

@@ -1,5 +1,6 @@
 import '@things-factory/grist-ui'
 import '@things-factory/biz-ui'
+import '@things-factory/import-ui'
 import '../../components/select-product-popup'
 import '../../order/vas-order/popup/vas-create-popup'
 
@@ -12,7 +13,7 @@ import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
 import { client, CustomAlert, navigate, PageView } from '@things-factory/shell'
 import { CommonButtonStyles } from '@things-factory/styles'
-import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
+import { isMobileDevice } from '@things-factory/utils'
 
 import { fetchSettingRule } from '../../../fetch-setting-value'
 import { VAS_BATCH_AND_PRODUCT_TYPE, VAS_BATCH_NO_TYPE, VAS_PRODUCT_TYPE } from '../../constants'
@@ -353,6 +354,8 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
     super()
     this.productData = { records: [] }
     this.vasData = { records: [] }
+    this._bizplaceId = ''
+    this._bizplaceName = ''
     this.containerSizes = []
     this._importedOrder = false
     this._hasContainer = false
@@ -365,6 +368,7 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
     this._enableTransportationServiceSetting = false
     this._enableTransportForCustomClearanceSetting = false
     this._disableTransport = false
+    this._strictProductSelection = false
   }
 
   get arrivalNoticeForm() {
@@ -515,6 +519,7 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
    */
   _configureProductGrist() {
     let editable = this._bizplaceId ? true : false
+    let strictEditable = this._bizplaceId ? !this._strictProductSelection : false
 
     const crossDockingColumns = [
       {
@@ -567,6 +572,13 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
         },
         width: 350
       },
+      {
+        type: 'string',
+        name: 'productBrand',
+        header: i18next.t('field.brand'),
+        imex: { header: i18next.t('field.brand'), key: 'productBrand', width: 25, type: 'string' },
+        width: 150
+      },
       {
         type: 'object',
         name: 'product',
@@ -576,8 +588,15 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
         type: 'select',
         name: 'packingType',
         header: i18next.t('field.packing_type'),
+        imex: {
+          header: i18next.t('field.packing_type'),
+          key: 'packingType',
+          width: 20,
+          type: 'array',
+          arrData: this.packingTypes
+        },
         record: {
-          editable: editable,
+          editable: strictEditable,
           options: [
             {
               display: '',
@@ -594,8 +613,15 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
         type: 'select',
         name: 'uom',
         header: i18next.t('field.uom'),
+        imex: {
+          header: i18next.t('field.uom'),
+          key: 'uom',
+          width: 20,
+          type: 'array',
+          arrData: this.uomValueUnits
+        },
         record: {
-          editable: editable,
+          editable: strictEditable,
           options: [
             {
               display: '',
@@ -696,6 +722,18 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
                   ...e.detail
                 })
 
+                this.productGrist.dirtyData.records = this.productGrist.dirtyData.records.map(item => {
+                  return {
+                    ...item,
+                    totalUomValue:
+                      item?.packQty > 0
+                        ? item?.totalUomValue
+                          ? item.totalUomValue
+                          : `${parseFloat(item.packQty * e.detail.uomValue).toFixed(2)} ${e.detail.uom}`
+                        : null
+                  }
+                })
+
                 this.productData = {
                   ...this.productData,
                   records: [...this.productGrist.dirtyData.records]
@@ -743,6 +781,26 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
         }
       }
 
+      if (changedColumn === 'manufactureYear') {
+        let manufactureYear = changeRecord.manufactureYear
+        const regExp = /^(181[2-9]|18[2-9]\d|19\d\d|2\d{3}|30[0-3]\d|304[0-8])$/
+
+        if (typeof manufactureYear === undefined || !regExp.test(manufactureYear)) {
+          if (manufactureYear === 0) {
+            delete event.detail.after[event.detail.column.name]
+          } else {
+            throw new Error(i18next.t('text.invalid_x', { state: { x: i18next.t('label.manufacture_year') } }))
+          }
+        }
+      }
+
+      if (changedColumn === 'unitPrice') {
+        let unitPrice = changeRecord.unitPrice
+        if (typeof unitPrice === undefined || unitPrice < 0) {
+          throw new Error(i18next.t('text.x_should_be_positive', { state: { x: i18next.t('label.unit_price') } }))
+        }
+      }
+
       this._updateVasTargets(true)
     } catch (e) {
       const beforeValue = event.detail.before && event.detail.before[event.detail.column.name]
@@ -1021,7 +1079,7 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
       let arrivalNotice = this._getFormInfo()
       delete arrivalNotice.warehouseTransport
       arrivalNotice.orderProducts = this._getOrderProducts()
-      const attachments = this._document?.files ? this._document.files : undefined
+      const fileUploader = this._document?.files ? this._document.files : undefined
 
       if (arrivalNotice.orderProducts.some(orderProduct => !orderProduct.palletQty)) {
         const result = await CustomAlert({
@@ -1039,30 +1097,25 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
       delete arrivalNotice.bizplaceId
       delete arrivalNotice.bizplaceName
 
-      const args = {
-        arrivalNotice: {
-          ...arrivalNotice,
-          partnerBizplaceId: this._bizplaceId,
-          ownTransport: this._importedOrder ? true : this._ownTransport
-        }
-      }
-
-      const response = await client.query({
-        query: gql`
-            mutation ($attachments: Upload) {
-              generateArrivalNotice(${gqlBuilder.buildArgs(args)}, file:$attachments) {
-                id
-                name
-                crossDocking
-              }
+      const response = await client.mutate({
+        mutation: gql`
+          mutation generateArrivalNotice($arrivalNotice: NewArrivalNotice!, $files: [Upload!]) {
+            generateArrivalNotice(arrivalNotice: $arrivalNotice, files: $files) {
+              id
+              name
+              crossDocking
             }
-          `,
+          }
+        `,
         variables: {
-          attachments
+          arrivalNotice: {
+            ...arrivalNotice,
+            partnerBizplaceId: this._bizplaceId,
+            ownTransport: this._importedOrder ? true : this._ownTransport
+          },
+          files: fileUploader
         },
-        context: {
-          hasUpload: true
-        }
+        context: { hasUpload: true }
       })
 
       if (!response.errors) {
@@ -1506,6 +1559,218 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
     )
   }
 
+  excelColumns() {
+    const productColumns = [
+      {
+        type: 'string',
+        name: 'batchId',
+        header: i18next.t('field.batch_id'),
+        imex: { header: i18next.t('field.batch_id'), key: 'batchId', width: 25, type: 'string' },
+        width: 100
+      },
+      {
+        type: 'string',
+        name: 'productSKU',
+        header: i18next.t('field.sku'),
+        imex: { header: i18next.t('field.sku'), key: 'productSKU', width: 25, type: 'string' },
+        width: 100
+      },
+      {
+        type: 'string',
+        name: 'packingType',
+        header: i18next.t('field.packing_type'),
+        imex: { header: i18next.t('field.packing_type'), key: 'packingType', width: 25, type: 'string' },
+        width: 100
+      },
+      {
+        type: 'integer',
+        name: 'packQty',
+        header: i18next.t('field.pack_qty'),
+        imex: { header: i18next.t('field.pack_qty'), key: 'packQty', width: 25, type: 'float' },
+        width: 100
+      },
+      {
+        type: 'integer',
+        name: 'palletQty',
+        header: i18next.t('field.pallet_qty'),
+        imex: { header: i18next.t('field.pallet_qty'), key: 'palletQty', width: 25, type: 'float' },
+        width: 100
+      },
+      {
+        type: 'integer',
+        name: 'manufactureYear',
+        header: i18next.t('field.manufacture_year'),
+        imex: { header: i18next.t('field.manufacture_year'), key: 'manufactureYear', width: 25, type: 'float' },
+        width: 100
+      },
+      {
+        type: 'string',
+        name: 'batchIdRef',
+        header: i18next.t('field.batch_id_ref'),
+        imex: { header: i18next.t('field.batch_id_ref'), key: 'batchIdRef', width: 25, type: 'string' },
+        width: 100
+      },
+      {
+        type: 'float',
+        name: 'unitPrice',
+        header: i18next.t('field.unit_price'),
+        imex: { header: i18next.t('field.unit_price'), key: 'unitPrice', width: 25, type: 'float' },
+        width: 100
+      },
+      {
+        type: 'string',
+        name: 'remark',
+        header: i18next.t('field.remark'),
+        imex: { header: i18next.t('field.remark'), key: 'remark', width: 25, type: 'string' },
+        width: 100
+      }
+    ]
+
+    return productColumns
+  }
+
+  async _exportableData() {
+    try {
+      var headerSetting = [
+        ...this.excelColumns()
+          .filter(column => column.type !== 'gutter' && column.imex !== undefined)
+          .map(column => {
+            return column.imex
+          })
+      ]
+
+      return { header: headerSetting, data: [] }
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
+  async bulkUploadValidateOrderProducts(patches) {
+    const response = await client.query({
+      query: gql`
+        query bulkUploadValidateOrderProducts($orderProducts: [NewOrderProduct], $partnerBizplaceId: String!) {
+          bulkUploadValidateOrderProducts(orderProducts: $orderProducts, partnerBizplaceId: $partnerBizplaceId) {
+            id
+            packingType
+            packingSize
+            uom
+            uomValue
+            totalUomValue
+            packQty
+            palletQty
+            manufactureYear
+            batchId
+            batchIdRef
+            unitPrice
+            remark
+            productSKU
+            productName
+            isError
+            product {
+              id
+              name
+              sku
+              description
+              type
+              primaryUnit
+              primaryValue
+            }
+          }
+        }
+      `,
+      variables: { orderProducts: patches, partnerBizplaceId: this._bizplaceId }
+    })
+
+    if (!response.errors) {
+      const data = response.data.bulkUploadValidateOrderProducts.map(item => {
+        return {
+          ...item,
+          productName: item?.productName,
+          unitPrice: parseFloat(item.unitPrice) || '',
+          manufactureYear: parseFloat(item.manufactureYear) || '',
+          packQty: parseFloat(item.packQty) || '',
+          palletQty: parseFloat(item.palletQty) || ''
+        }
+      })
+      this.productData = {
+        ...this.productData,
+        records: data.map((dt, idx) => {
+          return {
+            ...dt,
+            id: idx,
+            name: idx,
+            __dirty__: '+'
+          }
+        })
+      }
+
+      this.productGrist.fetch()
+    }
+  }
+
+  async importHandler(patches) {
+    patches.map(itm => {
+      itm.unitPrice = parseFloat(itm.unitPrice) || ''
+      itm.manufactureYear = parseFloat(itm.manufactureYear) || ''
+      itm.packQty = parseFloat(itm.packQty) || ''
+      itm.palletQty = parseFloat(itm.palletQty) || ''
+    })
+
+    this.productData = {
+      records: [...patches]
+    }
+
+    const orderProducts = patches.map(patch => {
+      delete patch.cuFlag
+      return {
+        ...patch,
+        unitPrice: parseFloat(patch.unitPrice) || 0,
+        manufactureYear: parseFloat(patch.manufactureYear) || 0,
+        packQty: parseFloat(patch.packQty) || 0,
+        palletQty: parseFloat(patch.palletQty) || 0
+      }
+    })
+    await this.bulkUploadValidateOrderProducts(orderProducts)
+    history.back()
+  }
+
+  async _importableData(records) {
+    try {
+      if (this._bizplaceId) {
+        records = records
+          .filter(record => record.productSKU)
+          .map(record => {
+            return {
+              ...record
+            }
+          })
+
+        openPopup(
+          html`
+            <import-pop-up
+              .records=${records}
+              .config=${{
+                rows: this.productGristConfig.rows,
+                columns: [...this.excelColumns().filter(column => column.imex !== undefined)]
+              }}
+              .importHandler="${await this.importHandler.bind(this)}"
+            ></import-pop-up>
+          `,
+          {
+            backdrop: true,
+            escapable: false,
+            size: 'large',
+            title: i18next.t('title.import')
+          }
+        )
+      } else {
+        throw new Error(i18next.t('text.please_select_a_company'))
+      }
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
   _showToast({ type, message }) {
     document.dispatchEvent(
       new CustomEvent('notify', {

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

@@ -1,12 +1,15 @@
 import '@things-factory/grist-ui'
+import '../../components/select-product-popup'
+
+import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit-element'
+
 import { i18next, localize } from '@things-factory/i18n-base'
+import { openPopup } from '@things-factory/layout-base'
 import { client, CustomAlert } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
-import { openPopup } from '@things-factory/layout-base'
-import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit-element'
-import '../../components/select-product-popup'
+
 import { ORDER_PRODUCT_STATUS } from '../../constants'
 
 export class EditProductPopup extends localize(i18next)(LitElement) {
@@ -411,6 +414,33 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
           changeRecord[key] = calcedAmount[key]
         }
       }
+
+      if (changedColumn === 'manufactureYear') {
+        let manufactureYear = changeRecord.manufactureYear
+        const regExp = /^(181[2-9]|18[2-9]\d|19\d\d|2\d{3}|30[0-3]\d|304[0-8])$/
+
+        if (typeof manufactureYear === undefined || !regExp.test(manufactureYear)) {
+          if (manufactureYear === 0) {
+            delete event.detail.after[event.detail.column.name]
+          } else {
+            throw new Error(i18next.t('text.invalid_x', { state: { x: i18next.t('label.manufacture_year') } }))
+          }
+        }
+      }
+
+      if (changedColumn === 'unitPrice') {
+        let unitPrice = changeRecord.unitPrice
+        if (typeof unitPrice === undefined || unitPrice < 0) {
+          throw new Error(i18next.t('text.x_should_be_positive', { state: { x: i18next.t('label.unit_price') } }))
+        }
+      }
+
+      if (changedColumn === 'palletQty') {
+        let palletQty = changeRecord.palletQty
+        if (typeof palletQty === undefined || palletQty < 0 || isNaN(palletQty)) {
+          throw new Error(i18next.t('text.invalid_x', { state: { x: i18next.t('label.pallet_qty') } }))
+        }
+      }
     } catch (e) {
       const beforeValue = event.detail.before && event.detail.before[event.detail.column.name]
       if (beforeValue) {
@@ -635,7 +665,8 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
         adjustedBatchIdRef: record?.batchIdRef ? record.batchIdRef : null,
         unitPrice: 0,
         adjustedUnitPrice: record?.unitPrice ? record.unitPrice : null,
-        remark: record?.remark ? record.remark : null
+        remark: record?.remark ? record.remark : null,
+        packingSize: record.packingSize || record.product.packingSize
       }
     })
   }

package/client/pages/order/release-order/b2b/b2b-order-requests.js

@@ -60,13 +60,13 @@ class B2bOrderRequests extends localize(i18next)(PageView) {
   get context() {
     return {
       title: i18next.t('title.release_order_requests'),
-      actions: [
-        {
-          title: i18next.t('button.batch_picking'),
-          action: this._openBatchPickingPopup.bind(this),
-          ...CommonButtonStyles.activate
-        }
-      ],
+      // actions: [
+      //   {
+      //     title: i18next.t('button.batch_picking'),
+      //     action: this._openBatchPickingPopup.bind(this),
+      //     ...CommonButtonStyles.activate
+      //   }
+      // ],
       exportable: {
         name: i18next.t('title.release_order_requests'),
         data: this._exportableData.bind(this)

package/client/pages/order/release-order/b2c/b2c-order-requests.js

@@ -65,12 +65,12 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
           title: i18next.t('button.generate_packing_list'),
           action: this._generatePackingList.bind(this),
           ...CommonButtonStyles.label
-        },
-        {
-          title: i18next.t('button.batch_picking'),
-          action: this._openBatchPickingPopup.bind(this),
-          ...CommonButtonStyles.activate
         }
+        // {
+        //   title: i18next.t('button.batch_picking'),
+        //   action: this._openBatchPickingPopup.bind(this),
+        //   ...CommonButtonStyles.activate
+        // }
       ],
       exportable: {
         name: i18next.t('title.release_order_requests'),
@@ -88,6 +88,7 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
   async pageInitialized() {
     const _orderStatus = await getCodeByName('RO_REQUESTS_STATUS')
     const _partners = await this._fetchPartners()
+    const _shippingProviders = await this._fetchShippingProviders()
 
     this._searchFields = [
       {
@@ -170,6 +171,38 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
           })()
         },
         value: new Date().toISOString().split('T')[0]
+      },
+      {
+        label: i18next.t('field.shipping_provider'),
+        name: 'transporter',
+        type: 'select',
+        props: {
+          searchOper: 'eq'
+        },
+        options: [
+          { value: '' },
+          ..._shippingProviders.map(item => {
+            return {
+              name: item.transporter,
+              value: item.transporter
+            }
+          })
+        ]
+      },
+      {
+        label: i18next.t('field.no_of_items'),
+        name: 'noOfItems',
+        type: 'select',
+        props: {
+          searchOper: 'gte'
+        },
+        options: [{ value: '' }, { name: 'Single Item', value: 1 }, { name: 'Multiple Item', value: 2 }]
+      },
+      {
+        label: i18next.t('field.sku'),
+        name: 'sku',
+        type: 'text',
+        props: { searchOper: 'i_like' }
       }
     ]
 
@@ -275,6 +308,14 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
           sortable: true,
           width: 120
         },
+        {
+          type: 'integer',
+          name: 'noOfItems',
+          header: i18next.t('field.no_of_items'),
+          imex: { header: i18next.t('field.no_of_items'), key: 'noOfItems', width: 25, type: 'integer' },
+          sortable: true,
+          width: 120
+        },
         {
           type: 'datetime',
           name: 'updatedAt',
@@ -327,6 +368,7 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
               refNo
               refNo2
               refNo3
+              noOfItems
               updatedAt
               acceptedBy {
                 id
@@ -380,6 +422,24 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
     }
   }
 
+  async _fetchShippingProviders() {
+    const response = await client.query({
+      query: gql`
+        query shippingProviders {
+          shippingProviders {
+            items {
+              transporter
+            }
+          }
+        }
+      `
+    })
+
+    if (!response.errors) {
+      return response.data.shippingProviders.items
+    }
+  }
+
   _generatePackingList() {
     try {
       if (this.dataGrist.selected?.length == 0) {

package/client/pages/order/release-order/release-extra-product-popup.js

@@ -620,9 +620,17 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
         }
 
         if (columnName === 'releaseQty') {
-          releaseQty = afterValue || 0
-        } else {
-          releaseQty = Math.round(afterValue / packageUom)
+          if (afterValue - originQty <= originAddableQty) {
+            releaseQty = afterValue || 0
+          } else {
+            releaseQty = originQty
+          }
+        } else if (columnName === 'releaseUomValue') {
+          if (afterValue - originUom <= originAddableUom) {
+            releaseQty = Math.round(afterValue / packageUom)
+          } else {
+            releaseQty = Math.round(originUom / packageUom)
+          }
         }
 
         roundedUom = releaseQty * packageUom
@@ -718,7 +726,7 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
       if (beforeValue) {
         event.detail.after[event.detail.column.name] = beforeValue
       } else {
-        delete event.detail.after[event.detail.column.name]
+        event.detail.after[event.detail.column.name] = 0
       }
       this._showToast(e)
     }

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

@@ -1186,7 +1186,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
   _serializeForm(form) {
     let obj = {}
     Array.from(form.querySelectorAll('input, select')).forEach(field => {
-      if (!field.hasAttribute('hidden') && field.value) {
+      if (!field.hasAttribute('hidden')) {
         obj[field.name] = field.type === 'checkbox' ? field.checked : field.value
       }
     })

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

@@ -644,7 +644,7 @@ class CreateReturnOrder extends localize(i18next)(PageView) {
     if (releaseQty === undefined) throw new Error(i18next.t('text.there_is_no_selected_items'))
     if (returnQty > releaseQty) {
       throw new Error(i18next.t('text.available_quantity_insufficient'))
-    } else if (releaseQty <= 0) {
+    } else if (returnQty <= 0 || isNaN(returnQty)) {
       throw new Error(i18next.t('text.invalid_quantity_input'))
     }
   }

package/client/pages/order/return-order/return-order-detail.js

@@ -227,11 +227,12 @@ class ReturnOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     ]
     if (this._status === ORDER_STATUS.PENDING.value) {
       actions.push(
-        {
-          title: i18next.t('button.delete'),
-          action: this._deleteReturnOrder.bind(this),
-          ...CommonButtonStyles.delete
-        },
+        // Issue with deletion, temporarily disable this feature
+        // {
+        //   title: i18next.t('button.delete'),
+        //   action: this._deleteReturnOrder.bind(this),
+        //   ...CommonButtonStyles.delete
+        // },
         {
           title: i18next.t('button.confirm'),
           action: this._confirmReturnOrder.bind(this),

package/client/pages/order/transport-order/delivery-order-list.js

@@ -432,7 +432,7 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
       return {
         id: item.id,
         ...this._columns
-          .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+          .filter(column => column.type !== 'gutter' && column.imex !== undefined)
           .reduce((record, column) => {
             record[column.imex.key] = column.imex.key
               .split('.')
@@ -440,6 +440,9 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
             if (column.type === 'datetime') {
               record[column.imex.key] = new Date(parseInt(record[column.imex.key])).toLocaleString()
             }
+            if (record[column.imex.key] === 'Invalid Date') {
+              record[column.imex.key] = ''
+            }
             return record
           }, {})
       }