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

package/client/pages/order/goods-received-note/received-note-detail.js

@@ -11,7 +11,8 @@ class ReceivedNoteDetail extends localize(i18next)(PageView) {
     return {
       _grnNo: String,
       _status: String,
-      _domainName: String
+      _domainName: String,
+      _data: Object
     }
   }
 
@@ -54,6 +55,10 @@ class ReceivedNoteDetail extends localize(i18next)(PageView) {
     return {
       title: i18next.t('title.goods_received_note_details'),
       actions,
+      exportable: {
+        name: i18next.t('title.goods_received_note_details'),
+        data: this._exportableData.bind(this)
+      },
       help: 'operato-wms/goods-received-note/received-note-detail'
     }
   }
@@ -69,8 +74,7 @@ class ReceivedNoteDetail extends localize(i18next)(PageView) {
       }
 
       if (this._grnNo) {
-        await this._fetchGRN()
-        await this._fetchGRNTemplate()
+        this._fetchGRNTemplate()
       }
 
       this.updateContext()
@@ -105,30 +109,48 @@ class ReceivedNoteDetail extends localize(i18next)(PageView) {
   }
 
   async _fetchGRN() {
+    var timezoneOffSet = new Date().getTimezoneOffset().toString()
+
     if (!this._grnNo) return
     const response = await client.query({
       query: gql`
-        query goodsReceivalNote($name: String!) {
-          goodsReceivalNote(name: $name) {
-            id
-            name
-            status
-            domain {
-              id
-              name
+        query goodsReceivalNote($name: String!, $timezoneOffSet: String!) {
+          goodsReceivalNote(name: $name, timezoneOffSet: $timezoneOffSet) {
+            grnNo
+            ganNo
+            refGANNo
+            refGANNo2
+            refGANNo3
+            companyDomain
+            supplier
+            date
+            productLists {
+              po
+              productSKU
+              productName
+              productType
+              productBatch
+              expectedQty
+              actualQty
+              actualUomValue
+              productUom
+              expiryDate
+              manufactureDate
+              remark
+              batchNo
+              unitPrice
             }
           }
         }
       `,
       variables: {
-        name: this._grnNo
+        name: this._grnNo,
+        timezoneOffSet: timezoneOffSet
       }
     })
 
     if (!response.errors) {
-      const grn = response.data.goodsReceivalNote
-      this._status = grn.status
-      this._domainName = grn.domain.name
+      return response.data.goodsReceivalNote
     }
   }
 
@@ -166,6 +188,156 @@ class ReceivedNoteDetail extends localize(i18next)(PageView) {
   //   }
   // }
 
+  async _exportableData() {
+    const { grnNo, ganNo, refGANNo, refGANNo2, refGANNo3, companyDomain, supplier, date, productLists } =
+      await this._fetchGRN()
+
+    const exportData = productLists.map(res => {
+      return {
+        grnNo,
+        ganNo,
+        refGANNo,
+        refGANNo2,
+        refGANNo3,
+        companyDomain,
+        supplier,
+        date,
+        ...res
+      }
+    })
+
+    const headerSetting = [
+      {
+        header: i18next.t('field.grn'),
+        key: 'grnNo',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.gan'),
+        key: 'ganNo',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.po'),
+        key: 'po',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.ref_no'),
+        key: 'refGANNo',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.ref_no_2'),
+        key: 'refGANNo2',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.ref_no_3'),
+        key: 'refGANNo3',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.company'),
+        key: 'companyDomain',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.supplier'),
+        key: 'supplier',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.date'),
+        key: 'date',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.batch_no'),
+        key: 'batchNo',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.batch_no'),
+        key: 'productSKU',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.product_name'),
+        key: 'productName',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.packing_type'),
+        key: 'productType',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.expected_qty'),
+        key: 'expectedQty',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.actual_qty'),
+        key: 'actualQty',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.actual_uom_value'),
+        key: 'actualUomValue',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.uom'),
+        key: 'productUom',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.expiry_date'),
+        key: 'expiryDate',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.manufacture_date'),
+        key: 'manufactureDate',
+        width: 25,
+        type: 'string'
+      },
+      {
+        header: i18next.t('field.unit_price'),
+        key: 'unitPrice',
+        width: 25,
+        type: 'number'
+      },
+      {
+        header: i18next.t('field.remark_issues'),
+        key: 'remark',
+        width: 25,
+        type: 'string'
+      }
+    ]
+
+    return { header: headerSetting, data: exportData }
+  }
+
   _showToast({ type, message }) {
     document.dispatchEvent(
       new CustomEvent('notify', {

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

@@ -1,6 +1,7 @@
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
 import '../batch-picking-popup'
+import '../../../outbound/generate-worksheet-popup'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
@@ -10,7 +11,7 @@ import { i18next, localize } from '@things-factory/i18n-base'
 import { client, navigate, PageView, CustomAlert } from '@things-factory/shell'
 import { openPopup } from '@things-factory/layout-base'
 import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
-import { isMobileDevice } from '@things-factory/utils'
+import { isMobileDevice, sleep } from '@things-factory/utils'
 
 import { ORDER_STATUS } from '../../../constants'
 
@@ -65,18 +66,11 @@ class B2bOrderList extends localize(i18next)(PageView) {
     var actions = []
 
     if (this.isUserBelongsDomain) {
-      actions.push(
-        {
-          title: i18next.t('button.batch_picking'),
-          action: this._openBatchPickingPopup.bind(this),
-          ...CommonButtonStyles.activate
-        },
-        {
-          title: i18next.t('button.generate_worksheet'),
-          action: this._generatePickingWorksheet.bind(this),
-          ...CommonButtonStyles.activate
-        }
-      )
+      actions.push({
+        title: i18next.t('button.generate_worksheet'),
+        action: this._openGenerateWorksheetPopup.bind(this),
+        ...CommonButtonStyles.activate
+      })
     }
     return {
       title: i18next.t('title.release_orders'),
@@ -114,7 +108,7 @@ class B2bOrderList extends localize(i18next)(PageView) {
     const _bizplaces = _bizplacesReq.status == 'fulfilled' ? _bizplacesReq.value : []
     this._searchFields = [
       {
-        label: i18next.t('field.ro'),
+        label: i18next.t('field.order_info'),
         name: 'name',
         type: 'text',
         props: { searchOper: 'i_like' }
@@ -142,24 +136,6 @@ class B2bOrderList extends localize(i18next)(PageView) {
         type: 'date',
         props: { searchOper: 'i_like' }
       },
-      {
-        label: i18next.t('field.ref_no'),
-        name: 'refNo',
-        type: 'text',
-        props: { searchOper: 'i_like' }
-      },
-      {
-        label: i18next.t('field.ref_no_2'),
-        name: 'refNo2',
-        type: 'text',
-        props: { searchOper: 'i_like' }
-      },
-      {
-        label: i18next.t('field.ref_no_3'),
-        name: 'refNo3',
-        type: 'text',
-        props: { searchOper: 'i_like' }
-      },
       {
         label: i18next.t('field.status'),
         name: 'status',
@@ -177,7 +153,7 @@ class B2bOrderList extends localize(i18next)(PageView) {
         name: 'fromDate',
         type: 'date',
         props: {
-          searchOper: 'eq'
+          searchOper: 'gte'
         },
         value: (() => {
           let date = new Date()
@@ -191,7 +167,7 @@ class B2bOrderList extends localize(i18next)(PageView) {
         name: 'toDate',
         type: 'date',
         props: {
-          searchOper: 'eq',
+          searchOper: 'lte',
           min: (() => {
             let date = new Date()
             date.setMonth(date.getMonth() - 6)
@@ -220,6 +196,13 @@ class B2bOrderList extends localize(i18next)(PageView) {
         type: 'checkbox',
         props: { searchOper: 'noteq' },
         attrs: ['indeterminate']
+      },
+      {
+        label: i18next.t('field.recall'),
+        name: 'recall',
+        type: 'checkbox',
+        props: { searchOper: 'eq' },
+        attrs: ['indeterminate']
       }
     ]
 
@@ -336,6 +319,13 @@ class B2bOrderList extends localize(i18next)(PageView) {
           imex: { header: i18next.t('field.route'), key: 'routeId', width: 20, type: 'string' },
           width: 60
         },
+        {
+          type: 'boolean',
+          name: 'recall',
+          header: i18next.t('field.recall'),
+          imex: { header: i18next.t('field.recall'), key: 'recall', width: 20, type: 'string' },
+          width: 60
+        },
         {
           type: 'object',
           name: 'arrivalNotice',
@@ -359,6 +349,14 @@ class B2bOrderList extends localize(i18next)(PageView) {
           sortable: true,
           width: 160
         },
+        {
+          type: 'datetime',
+          name: 'acceptedAt',
+          header: i18next.t('field.accepted_at'),
+          imex: { header: i18next.t('field.accepted_at'), key: 'acceptedAt', width: 30, type: 'datetime' },
+          sortable: true,
+          width: 160
+        },
         {
           type: 'datetime',
           name: 'updatedAt',
@@ -382,6 +380,14 @@ class B2bOrderList extends localize(i18next)(PageView) {
           imex: { header: i18next.t('field.accepted_by'), key: 'acceptedBy.name', width: 30, type: 'string' },
           sortable: true,
           width: 200
+        },
+        {
+          type: 'object',
+          name: 'updater',
+          header: i18next.t('field.updated_by'),
+          imex: { header: i18next.t('field.updated_by'), key: 'updater.name', width: 30, type: 'string' },
+          sortable: true,
+          width: 200
         }
       ]
     }
@@ -400,6 +406,25 @@ class B2bOrderList extends localize(i18next)(PageView) {
   }
 
   async fetchHandler({ page, limit, sorters = [] }) {
+    let filters = this.searchForm.queryFilters.map(filter => {
+      switch (filter.name) {
+        case 'fromDate':
+          let fromDt = new Date(filter.value)
+          fromDt.setHours(0)
+          filter.value = fromDt.toISOString()
+          filter.name = 'createdAt'
+          break
+        case 'toDate':
+          let toDt = new Date(filter.value)
+          toDt.setHours(23, 59, 59)
+          filter.value = toDt.toISOString()
+          filter.name = 'createdAt'
+          break
+        default:
+          break
+      }
+      return filter
+    })
     const response = await client.query({
       query: gql`
         query releaseGoodRequests($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
@@ -425,26 +450,32 @@ class B2bOrderList extends localize(i18next)(PageView) {
               exportOption
               routeId
               releaseDate
+              recall
               status
               createdAt
-              updatedAt
               creator {
                 id
                 name
                 description
               }
+              acceptedAt
               acceptedBy {
                 id
                 name
                 description
               }
+              updatedAt
+              updater {
+                id
+                name
+              }
             }
             total
           }
         }
       `,
       variables: {
-        filters: [...(await this.searchForm.getQueryFilters()), { name: 'type', operator: 'eq', value: 'b2b' }],
+        filters: [...filters, { name: 'type', operator: 'eq', value: 'b2b' }],
         pagination: { page, limit },
         sortings: sorters
       }
@@ -507,60 +538,25 @@ class B2bOrderList extends localize(i18next)(PageView) {
     }
   }
 
-  _openBatchPickingPopup() {
-    openPopup(
-      html`
-        <batch-picking-popup
-          @generated="${() => {
-            navigate('merged_outbound_worksheets')
-            this._showToast({ message: i18next.t('text.worksheet_has_been_generated') })
-          }}"
-        ></batch-picking-popup>
-      `,
-      {
-        backdrop: true,
-        size: 'large',
-        title: i18next.t('title.generate_batch_picking')
-      }
-    )
-  }
-
-  async _generatePickingWorksheet() {
+  async _openGenerateWorksheetPopup() {
     try {
-      let releaseGoodNos = []
       if (this.dataGrist.selected.length <= 0)
         throw new Error(i18next.t('text.please_select_one_or_more_order_to_generate_worksheet'))
 
+      let releaseGoodNos = []
+
       let readyToPick = this.dataGrist.selected.filter(itm => itm.status === ORDER_STATUS.PENDING_WORKSHEET.value)
       releaseGoodNos = readyToPick.map(record => record.name)
 
       if (releaseGoodNos.length <= 0)
-        throw new Error(i18next.t('text.selected_release_order(s)_has_existing_worksheet'))
-
-      let result = await CustomAlert({
-        title: i18next.t('title.are_you_sure'),
-        text: i18next.t('text.generate_worksheet'),
-        confirmButton: { text: i18next.t('button.submit') },
-        cancelButton: { text: i18next.t('button.cancel') }
-      })
+        throw new Error(i18next.t('text.selected_release_order(s)_is_not_in_pending_worksheet_status'))
 
-      if (!result.value) return
-
-      const response = await client.mutate({
-        mutation: gql`
-          mutation generateMultipleReleaseGoodWorksheet($releaseGoodNos: [String!]) {
-            generateMultipleReleaseGoodWorksheet(releaseGoodNos: $releaseGoodNos)
-          }
-        `,
-        variables: {
-          releaseGoodNos
-        }
+      await sleep(1010)
+      openPopup(html` <generate-worksheet-popup .gristData=${this.dataGrist}></generate-worksheet-popup> `, {
+        backdrop: true,
+        size: 'medium',
+        title: i18next.t('title.generate_picking_worksheet')
       })
-
-      if (!response.errors) {
-        navigate('single_outbound_worksheets')
-        this._showToast({ message: i18next.t('text.worksheet(s)_has_been_generated') })
-      }
     } catch (e) {
       this._showToast(e)
     }