@things-factory/operato-wms 5.0.13 → 6.0.0-alpha.1

package/client/pages/outbound/packing-product.js

@@ -35,6 +35,10 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       releaseGoodId: String,
       shippingProvider: String,
       trackingNo: String,
+      totalBinRO: Number,
+      binRo: String,
+      ownTransport: Boolean,
+      toggleComplete: Boolean,
       _bizplaceName: String,
       _enableProductScanning: Boolean,
       _productName: String,
@@ -78,50 +82,50 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
   }
 
   get completed() {
-    if (this.orderRemark) {
-      return this.data.records.every(record => record.completed) && Boolean(this.checkedRemarkAt)
-    } else {
-      return this.data.records.every(record => record.completed)
-    }
+    return this.orderRemark
+      ? this.data.records.every(record => record.completed) && Boolean(this.checkedRemarkAt)
+      : this.data.records.every(record => record.completed)
   }
 
   get context() {
     var actions = []
     if (this.releaseGoodNo && this.platform != 'operato' && this.completed && this.trackingNo) {
       if (this.platform === PLATFORM.LAZADA.value) {
+        actions.push({
+          title: i18next.t('button.print_airway_bill'),
+          action: this.printAirwayBill.bind(this),
+          ...CommonButtonStyles.label
+        })
+
         actions.push({
           title: i18next.t('button.print_invoice'),
           action: this.printInvoice.bind(this),
           ...CommonButtonStyles.label
         })
       }
-
-      actions.push({
-        title: i18next.t('button.print_airway_bill'),
-        action: this.printAirwayBill.bind(this),
-        ...CommonButtonStyles.label
-      })
     }
 
-    if (this.releaseGoodNo && this.platform == 'operato' && this.airwayBill && this.completed) {
-      actions.push({
-        title: i18next.t('button.print_airway_bill'),
-        action: this.printSellercraftAirwayBill.bind(this),
-        ...CommonButtonStyles.label
-      })
+    if (this.releaseGoodNo && this.platform == 'operato' && this.completed) {
+      if (!this.ownTransport) {
+        actions.push({
+          title: i18next.t('button.print_airway_bill'),
+          action: this.printSellercraftDocument.bind(this, 'awb'),
+          ...CommonButtonStyles.label
+        })
+      }
 
       actions.push({
         title: i18next.t('button.print_invoice'),
-        action: this.printSellercraftInvoice.bind(this),
+        action: this.printSellercraftDocument.bind(this, 'invoice'),
         ...CommonButtonStyles.label
       })
     }
 
     if (
       this.releaseGoodNo &&
-      (this.orderInformation.status === 'packed' ||
-        this.orderInformation.status === 'unfulfilled' ||
-        this.orderInformation.status === 'processing') &&
+      (this.orderInformation?.status === 'packed' ||
+        this.orderInformation?.status === 'unfulfilled' ||
+        this.orderInformation?.status === 'processing') &&
       !this._trackingNo &&
       !this._logisticsInitiated &&
       (this.platform === PLATFORM.LAZADA.value ||
@@ -152,7 +156,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       })
     }
 
-    if (this.completed) {
+    if (this.toggleComplete) {
       actions.push({
         title: i18next.t('button.complete'),
         action: this._complete.bind(this),
@@ -225,7 +229,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
 
   render() {
     return html`
-      <form id="info-form" class="multi-column-form">
+      <form id="info-form" class="multi-column-form" style="align-items:center">
         <fieldset>
           <label>${i18next.t('label.release_good_no')}</label>
           <barcode-scanable-input
@@ -287,11 +291,14 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     this.data = { records: [] }
     this.releaseGoodNo = ''
     this.releaseGoodId = ''
+    this.totalBinRO = 0
+    this.checkedRemarkAt = ''
     this._enableProductScanning = false
     this._productName = ''
     this._selectedOrderInventory = null
     this._selectedTaskStatus = null
     this._scanning = false
+    this.toggleComplete = false
     this._isRequireSerialNumberScanningOutbound = false
     this._isBatchPicking = false
   }
@@ -394,7 +401,10 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
                 id
                 name
                 remark
+                ownTransport
                 checkedRemarkAt
+                totalInventoriesByBin
+                isOrderInventoryBin
               }
               bizplaceName
               partnerDomainId
@@ -476,11 +486,18 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     })
 
     if (!response.errors) {
+      // @oscar a more efficient writing of this line of code would be defining a const for the response of accessing releaseGood, kindly improve this.
+      if (response.data.packingWorksheet.worksheetInfo.releaseGood.isOrderInventoryBin) {
+        this.totalBinRO = response.data.packingWorksheet.worksheetInfo.releaseGood.totalInventoriesByBin
+        this.binRo = releaseGoodNo
+      }
+
       this.releaseGoodNo = response.data.packingWorksheet.worksheetInfo.releaseGood.name
       this.releaseGoodId = response.data.packingWorksheet.worksheetInfo.releaseGood.id
       if (!response.data?.packingWorksheet) return
 
       const { worksheetInfo, worksheetDetailInfos } = response.data.packingWorksheet
+
       this.data = { records: this.formatWorksheetDetailInfos(worksheetDetailInfos) }
 
       this.trackingNo = worksheetInfo.trackingNo
@@ -491,7 +508,12 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       this.shippingProvider = worksheetInfo.shippingProvider
       this.orderInformation = worksheetInfo.marketplaceOrder
       this.orderRemark = worksheetInfo.releaseGood?.remark
+      this.ownTransport = worksheetInfo.releaseGood?.ownTransport
       this.checkedRemarkAt = worksheetInfo.releaseGood?.checkedRemarkAt
+      this.toggleComplete = Boolean(worksheetInfo.releaseGood?.remark)
+        ? worksheetDetailInfos.every(res => res.status === 'DONE') &&
+          worksheetInfo.releaseGood?.checkedRemarkAt !== null
+        : worksheetDetailInfos.every(res => res.status === 'DONE')
 
       this._isBatchPicking = worksheetDetailInfos[0].relatedOrderInv?.refWorksheetId ? true : false
 
@@ -500,7 +522,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
 
       if (this._selectedOrderInventory) {
         const record = this.data.records.find(record => record.name === this._selectedOrderInventory.name)
-        if (record.packedQty == record.releaseQty) {
+        if (record?.packedQty == record?.releaseQty) {
           this._selectedOrderInventory = null
           this._selectedTaskStatus = null
           this.inputForm.reset()
@@ -511,6 +533,10 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
           worksheetDetailInfos[0].product?.isRequireSerialNumberScanningOutbound
       }
 
+      if (this.completed && this.airwayBill) {
+        this.printBill()
+      }
+
       this._enableProductScanning = await fetchSettingRule('enable-product-scanning', worksheetInfo.partnerDomainId)
 
       if (this._enableProductScanning) {
@@ -518,6 +544,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       } else {
         this._focusOnReleaseQtyInput()
       }
+
       this.updateContext()
     }
   }
@@ -529,7 +556,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
         record.locationName = record?.binLocation?.name
         record.sku = record?.sku
         record.product = record?.product
-        record.packingProgress = `${record.packedQty} / ${record.releaseQty}`
+        record.packingProgress = `${record?.packedQty} / ${record.releaseQty}`
 
         return record
       })
@@ -543,6 +570,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     this.releaseGoodNo = ''
     this._selectedOrderInventory = null
     this._selectedTaskStatus = null
+    this.toggleComplete = false
   }
 
   checkShippingProviderAndDeliveryType() {
@@ -567,23 +595,66 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     return otherInfo.deliveryType
   }
 
-  printSellercraftInvoice() {
-    let url = new URL(window.location)
+  async printSellercraftDocument(type) {
+    try {
+      if (this.releaseGoodId == undefined) {
+        throw new Error('Unable to find order id, please rescan your order.')
+      }
 
-    var convertedPdfUrl = `${url.origin}/proxy?url=${this.invoice}`
-    this._callPrintDialog(convertedPdfUrl)
-  }
+      // get sellercraft document fetcher function
+      let fetchOrder = async id => {
+        const response = await client.mutate({
+          mutation: gql`
+            mutation fetchSellercraftDocument($releaseGoodId: String!) {
+              fetchSellercraftDocument(releaseGoodId: $releaseGoodId) {
+                airwayBill
+                invoice
+              }
+            }
+          `,
+          variables: { releaseGoodId: id }
+        })
+        if (!response.errors) {
+          this.invoice = document.invoice
+          this.airwayBill = document.airwayBill
 
-  printSellercraftAirwayBill() {
-    let convertedPdfUrl = ''
-    if (this.airwayBill.includes('partner.shopeemobile.com')) {
-      convertedPdfUrl = `/pdf/merge?urls=${this.airwayBill}`
-    } else {
-      let url = new URL(window.location)
-      convertedPdfUrl = `${url.origin}/proxy?url=${this.airwayBill}`
-    }
+          return {
+            invoice: response.data.fetchSellercraftDocument.invoice,
+            airwayBill: response.data.fetchSellercraftDocument.airwayBill
+          }
+        }
+      }
 
-    this._callPrintDialog(convertedPdfUrl)
+      let convertedPdfUrl = ''
+      if (type == 'invoice') {
+        let invoice = this.invoice
+        // fetch and set variable if invoice not found
+        if (!invoice || invoice.trim() == '') {
+          let document = await fetchOrder(this.releaseGoodId)
+          invoice = document.invoice
+        }
+        let url = new URL(window.location)
+        convertedPdfUrl = `${url.origin}/proxy?url=${invoice}`
+      } else if (type == 'awb') {
+        let airwayBill = this.airwayBill
+        // fetch and set variable if awb not found
+        if (!airwayBill || airwayBill.trim() == '') {
+          let document = await fetchOrder(this.releaseGoodId)
+          airwayBill = document.airwayBill
+        }
+        if (airwayBill.includes('partner.shopeemobile.com')) {
+          convertedPdfUrl = `/pdf/merge?urls=${airwayBill}`
+        } else {
+          let url = new URL(window.location)
+          convertedPdfUrl = `${url.origin}/proxy?url=${airwayBill}`
+        }
+      }
+
+      // print PDF document
+      this._callPrintDialog(convertedPdfUrl)
+    } catch (error) {
+      this._showToast({ message: 'Waiting for AWB from marketplace. Please retry in awhile' })
+    }
   }
 
   async printInvoice() {
@@ -607,27 +678,22 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     if (orderDocInfo?.length === 0) {
       this._showToast({ message: i18next.t('text.no_document_available') })
     } else {
-      switch (this.platform) {
-        case 'shopee':
-          const orderDocUrls = orderDocInfo.map(item => item.airwayBill)
-          for (var i = 0; i < orderDocUrls.length; i++) {
-            orderDocUrls[i] = 'urls=' + orderDocUrls[i]
-          }
-          var mergedURL = orderDocUrls.toString().replace(/,/g, '&')
-          var convertedPdfUrl = `/pdf/merge?${mergedURL}`
-          this._callPrintDialog(convertedPdfUrl)
-          break
-
-        case 'lazada':
-          var decodedHTML = atob(orderDocInfo[0].file)
-          this._callPrintDialog(decodedHTML)
-          break
-
-        default:
-          let url = new URL(window.location)
+      if (this.platform == 'shopee' && !orderDocInfo[0]?.isShopeeV2) {
+        const orderDocUrls = orderDocInfo.map(item => item.airwayBill)
+        for (var i = 0; i < orderDocUrls.length; i++) {
+          orderDocUrls[i] = 'urls=' + orderDocUrls[i]
+        }
+        var mergedURL = orderDocUrls.toString().replace(/,/g, '&')
+        var convertedPdfUrl = `/pdf/merge?${mergedURL}`
+        this._callPrintDialog(convertedPdfUrl)
+      } else if (this.platform == 'lazada') {
+        var decodedHTML = atob(orderDocInfo[0].file)
+        this._callPrintDialog(decodedHTML)
+      } else {
+        let url = new URL(window.location)
 
-          convertedPdfUrl = `${url.origin}/proxy?url=${encodeURIComponent(orderDocInfo[0].airwayBill)}`
-          this._callPrintDialog(convertedPdfUrl)
+        convertedPdfUrl = `${url.origin}/proxy?url=${encodeURIComponent(orderDocInfo[0].airwayBill)}`
+        this._callPrintDialog(convertedPdfUrl)
       }
     }
   }
@@ -643,6 +709,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
               mimeType
               file
               documentType
+              isShopeeV2
             }
           }
         `,
@@ -684,12 +751,13 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
   async packing(e) {
     if (e.keyCode === 13) {
       e.preventDefault()
+      console.time('time execution for product barcode scanning')
       try {
         await this._validatePacking()
 
-        let response
-        if (this._enableProductScanning) response = await this.productBarcodePacking()
-        else response = await this.commonPacking()
+        let response = this._enableProductScanning ? await this.productBarcodePacking() : await this.commonPacking()
+
+        console.timeLog('time execution for product barcode scanning')
 
         if (!response.errors) {
           if (this._enableProductScanning) {
@@ -710,17 +778,20 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       } catch (e) {
         if (this._isRequireSerialNumberScanningOutbound && this._isBatchPicking) this.serialInput.value = ''
         else if (this._enableProductScanning && !this._isRequireSerialNumberScanningOutbound) {
-          this.productBarcodeInput.value = ''
           this._focusOnProductBarcodeInput()
         } else {
-          this.releaseQtyInput.value = ''
           this._focusOnReleaseQtyInput()
           this._selectedTaskStatus = null
         }
         this._selectedOrderInventory = null
         this._showToast(e)
       } finally {
+        this._enableProductScanning && !this._isRequireSerialNumberScanningOutbound
+          ? (this.productBarcodeInput.value = '')
+          : (this.releaseQtyInput.value = '')
         this._scanning = false
+        // time execution for product barcode scanning (without scanning machines): 308.0390625 ms
+        console.timeEnd('time execution for product barcode scanning')
       }
     }
   }
@@ -728,7 +799,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
   async productBarcodePacking() {
     if (this._scanning) return this._showToast({ message: i18next.t('text.previous_scan_is_executing') })
     this._scanning = true
-    return await client.mutate({
+    let response = await client.mutate({
       mutation: gql`
         mutation scanProductPacking($worksheetDetailName: String!, $productBarcode: String!, $serialNumber: String) {
           scanProductPacking(
@@ -745,6 +816,8 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
           this._isRequireSerialNumberScanningOutbound && this._isBatchPicking ? this.serialInput.value.trim() : null
       }
     })
+
+    return response
   }
 
   async commonPacking() {
@@ -768,7 +841,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     })
   }
 
-  async _validatePacking() {
+  _validatePacking() {
     // validate for order selection
     if (this._enableProductScanning) {
       //if no input
@@ -780,21 +853,18 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       //find product match with input barcode
       const foundOrderInventory = this.data.records.find(
         itm =>
-          itm.product.productDetails.find(
-            detail =>
-              detail.gtin === this.productBarcodeInput.value.trim() &&
-              detail.packingType == itm.packingType &&
-              detail.packingSize == itm.packingSize
-          ) != undefined
+          itm.product.productDetails.find(detail => detail.gtin === this.productBarcodeInput.value.trim()) != undefined
       )
 
       if (foundOrderInventory) {
-        if (foundOrderInventory?.status === WORKSHEET_STATUS.EXECUTING.value) {
-          this._selectedOrderInventory = foundOrderInventory
-        } else if (foundOrderInventory?.status === WORKSHEET_STATUS.DONE.value) {
+        this._selectedOrderInventory = foundOrderInventory
+
+        if (this._selectedOrderInventory?.status === WORKSHEET_STATUS.DONE.value) {
+          this._selectedOrderInventory = null
           throw new Error(i18next.t('text.scanned_product_status_is_done'))
         }
       } else {
+        this._focusOnProductBarcodeInput()
         throw new Error(i18next.t('text.incorrect_product_barcode'))
       }
     } else {
@@ -824,6 +894,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
   }
 
   async _complete() {
+    const totalBinRO = this.totalBinRO
     const response = await client.mutate({
       mutation: gql`
         mutation completePacking($releaseGoodNo: String!) {
@@ -834,13 +905,43 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     })
 
     if (!response.errors) {
-      this._clearView()
-      this.updateContext()
-      await CustomAlert({
-        title: i18next.t('title.packing'),
-        text: i18next.t('text.packing_is_completed'),
-        confirmButton: { text: i18next.t('button.confirm') }
-      })
+      if (totalBinRO > 1) {
+        const resultNextOrder = await CustomAlert({
+          title: i18next.t('title.packing'),
+          text: i18next.t('text.packing_is_completed'),
+          confirmButton: { text: i18next.t('button.next_order') }
+        })
+
+        if (!resultNextOrder.value) {
+          this._focusOnReleaseGoodInput()
+          this._clearView()
+          this.updateContext()
+          return
+        }
+
+        this._clearView()
+        this.updateContext()
+
+        this.checkedRemarkAt = ''
+        await this._fetchInventories(this.binRo)
+        this.toggleComplete = false
+        this._focusOnProductBarcodeInput()
+      } else {
+        this.toggleComplete = false
+
+        this._clearView()
+        this.updateContext()
+
+        const result = await CustomAlert({
+          title: i18next.t('title.packing'),
+          text: i18next.t('text.packing_is_completed'),
+          timer: 1000
+        })
+
+        if (result.dismiss === 'timer' && result.isDismissed) {
+          this._focusOnReleaseGoodInput()
+        }
+      }
     }
   }
 
@@ -879,6 +980,16 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     )
   }
 
+  async printBill() {
+    if (this.releaseGoodNo && this.platform != 'operato' && this.completed && this.trackingNo) {
+      await this.printAirwayBill()
+    }
+
+    if (this.releaseGoodNo && this.platform == 'operato' && !this.ownTransport && this.airwayBill && this.completed) {
+      await this.printSellercraftDocument('awb')
+    }
+  }
+
   async openSerialNumberPopup() {
     await sleep(1010)
     openPopup(

package/client/pages/outbound/packing-worksheet-list.js

@@ -92,16 +92,10 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
 
     this._searchFields = [
       {
-        name: 'releaseGoodNo',
-        label: i18next.t('field.release_good_no'),
+        name: 'outboundOrderInfo',
+        label: i18next.t('field.order_info'),
         type: 'text',
-        props: { searchOper: 'i_like' }
-      },
-      {
-        name: 'releaseGoodRefNo',
-        label: i18next.t('field.ref_no'),
-        type: 'text',
-        props: { searchOper: 'i_like' }
+        props: { searchOper: 'eq' }
       },
       {
         label: i18next.t('field.company'),
@@ -166,6 +160,13 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
         type: 'checkbox',
         props: { searchOper: 'eq' },
         attrs: ['indeterminate']
+      },
+      {
+        label: i18next.t('field.manifested'),
+        name: 'manifest',
+        type: 'checkbox',
+        props: { searchOper: 'eq' },
+        attrs: ['indeterminate']
       }
     ]