@things-factory/operato-wms 3.7.2 → 3.7.7

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

@@ -7,10 +7,9 @@ import { css, html } from 'lit-element'
 
 import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
-import { openPopup } from '@things-factory/layout-base'
 import { client, navigate, PageView } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
-import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
+import { isMobileDevice } from '@things-factory/utils'
 
 class DeliveryOrderList extends localize(i18next)(PageView) {
   static get styles() {
@@ -126,6 +125,24 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
         ],
         props: { searchOper: 'eq' }
       },
+      {
+        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' }
+      },
       {
         name: 'status',
         label: i18next.t('label.status'),
@@ -193,6 +210,7 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'name',
           header: i18next.t('field.do_no'),
+          imex: { header: i18next.t('field.do_no'), key: 'name', width: 30, type: 'string' },
           sortable: true,
           width: 150
         },
@@ -200,6 +218,7 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
           type: 'object',
           name: 'releaseGood',
           header: i18next.t('field.ro_no'),
+          imex: { header: i18next.t('field.ro_no'), key: 'releaseGood.name', width: 30, type: 'string' },
           sortable: true,
           width: 150
         },
@@ -207,6 +226,23 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'refNo',
           header: i18next.t('field.ref_no'),
+          imex: { header: i18next.t('field.refNo'), key: 'refNo', width: 25, type: 'string' },
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'refNo2',
+          header: i18next.t('field.ref_no_2'),
+          imex: { header: i18next.t('field.ref_no_2'), key: 'refNo2', width: 25, type: 'string' },
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'refNo3',
+          header: i18next.t('field.ref_no_3'),
+          imex: { header: i18next.t('field.ref_no_3'), key: 'refNo3', width: 25, type: 'string' },
           sortable: true,
           width: 150
         },
@@ -214,6 +250,7 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
           type: 'object',
           name: 'bizplace',
           header: i18next.t('field.company'),
+          imex: { header: i18next.t('field.company'), key: 'bizplace.name', width: 30, type: 'string' },
           sortable: true,
           width: 200
         },
@@ -221,6 +258,7 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
           type: 'date',
           name: 'deliveryDate',
           header: i18next.t('field.delivery_date'),
+          imex: { header: i18next.t('field.delivery_date'), key: 'deliveryDate', width: 20, type: 'string' },
           sortable: true,
           width: 160
         },
@@ -228,6 +266,7 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
           type: 'boolean',
           name: 'ownCollection',
           header: i18next.t('field.own_collection'),
+          imex: { header: i18next.t('field.own_collection'), key: 'ownCollection', width: 20, type: 'string' },
           sortable: true,
           width: 100
         },
@@ -235,6 +274,7 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'status',
           header: i18next.t('field.status'),
+          imex: { header: i18next.t('field.status'), key: 'status', width: 20, type: 'string' },
           sortable: true,
           width: 150
         },
@@ -242,6 +282,7 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'createdAt',
           header: i18next.t('field.created_at'),
+          imex: { header: i18next.t('field.created_at'), key: 'createdAt', width: 30, type: 'datetime' },
           sortable: true,
           width: 160
         },
@@ -249,6 +290,7 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'updatedAt',
           header: i18next.t('field.updated_at'),
+          imex: { header: i18next.t('field.updated_at'), key: 'updatedAt', width: 30, type: 'datetime' },
           sortable: true,
           width: 160
         },
@@ -256,6 +298,7 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
           type: 'object',
           name: 'updater',
           header: i18next.t('field.updater'),
+          imex: { header: i18next.t('field.updater'), key: 'updater.name', width: 30, type: 'string' },
           sortable: true,
           width: 160
         }
@@ -263,31 +306,14 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
     }
   }
 
-  async fetchHandler({ page, limit, sorters = [{ name: 'createdAt', desc: true }] }) {
+  async fetchHandler({ page, limit, sorters = [] }) {
     let filters = this.searchForm.queryFilters
-    // let toDateIndex = filters.findIndex(x => x.name == 'toDate')
-
-    // if (toDateIndex >= 0) {
-    //   let toDateFilter = new Date(filters[toDateIndex].value)
-    //   filters[toDateIndex].value = new Date(toDateFilter.setDate(toDateFilter.getDate() + 1)).toISOString()
-    // }
-    // var datetime = new Date()
-    // var tzoffset = datetime.getTimezoneOffset() * 60
-
     var tzoffset = new Date().getTimezoneOffset() * 60
 
     const response = await client.query({
       query: gql`
-        query {
-          deliveryOrders(${gqlBuilder.buildArgs({
-            filters: [
-              ...filters,
-              { name: 'status', operator: 'notin', value: ['CANCELLED'] },
-              { name: 'tzoffset', operator: 'custom', value: tzoffset }
-            ],
-            pagination: { page, limit },
-            sortings: sorters
-          })}) {
+        query deliveryOrders($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+          deliveryOrders(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
               name
@@ -304,6 +330,8 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
                 name
                 description
                 refNo
+                refNo2
+                refNo3
               }
               ownCollection
               createdAt
@@ -317,13 +345,30 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
             total
           }
         }
-      `
+      `,
+      variables: {
+        filters: [
+          ...filters,
+          { name: 'status', operator: 'notin', value: ['CANCELLED'] },
+          { name: 'tzoffset', operator: 'custom', value: tzoffset }
+        ],
+        pagination: { page, limit },
+        sortings: sorters
+      }
     })
 
     if (!response.errors) {
       return {
         total: response.data.deliveryOrders.total || 0,
-        records: response.data.deliveryOrders.items
+        records:
+          response.data.deliveryOrders.items.map(dord => {
+            return {
+              ...dord,
+              refNo: dord?.releaseGood?.refNo || '',
+              refNo2: dord?.releaseGood?.refNo2 || '',
+              refNo3: dord?.releaseGood?.refNo3 || ''
+            }
+          }) || []
       }
     }
   }
@@ -348,23 +393,6 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
     if (!response.errors) {
       return response.data.partnersBizplaces.items
     }
-
-    // const response = await client.query({
-    //   query: gql`
-    //       query {
-    //         bizplaces(${gqlBuilder.buildArgs({
-    //           filters: [...bizplace]
-    //         })}) {
-    //           items{
-    //             id
-    //             name
-    //             description
-    //           }
-    //         }
-    //       }
-    //     `
-    // })
-    // return response.data.bizplaces.items
   }
 
   _compareValues(key, order = 'asc') {
@@ -386,25 +414,37 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
     }
   }
 
-  _uploadDeliveryNote(dnName, dnId) {
-    openPopup(
-      html`
-        <upload-delivery-note
-          .dnName="${dnName}"
-          .dnId="${dnId}"
-          .callback="${this.dataGrist.fetch.bind(this.dataGrist)}"
-        ></upload-delivery-note>
-      `,
-      {
-        backdrop: true,
-        size: 'large',
-        title: i18next.t('title.upload_signed_gdn')
-      }
-    )
-  }
-
   _exportableData() {
-    return this.dataGrist.exportRecords()
+    let records = []
+    if (this.dataGrist.selected && this.dataGrist.selected.length > 0) {
+      records = this.dataGrist.selected
+    } else {
+      records = this.dataGrist.data.records
+    }
+
+    var headerSetting = this.dataGrist._config.columns
+      .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+      .map(column => {
+        return column.imex
+      })
+
+    var data = records.map(item => {
+      return {
+        id: item.id,
+        ...this._columns
+          .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+          .reduce((record, column) => {
+            record[column.imex.key] = column.imex.key
+              .split('.')
+              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+            if (column.type === 'datetime') {
+              record[column.imex.key] = new Date(parseInt(record[column.imex.key])).toLocaleString()
+            }
+            return record
+          }, {})
+      }
+    })
+    return { header: headerSetting, data: data }
   }
 
   _modifyDateRange(e) {

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

@@ -510,6 +510,9 @@ class LoadingProduct extends connect(store)(localize(i18next)(PageView)) {
         query loadingWorksheet($releaseGoodNo: String!) {
           loadingWorksheet(releaseGoodNo: $releaseGoodNo) {
             worksheetInfo {
+              releaseGood {
+                name
+              }
               bizplaceName
               refNo
               startedAt
@@ -542,7 +545,7 @@ class LoadingProduct extends connect(store)(localize(i18next)(PageView)) {
     })
 
     if (!response.errors) {
-      this._releaseGoodNo = releaseGoodNo
+      this._releaseGoodNo = response.data.loadingWorksheet.worksheetInfo.releaseGood.name
       this._fillUpForm(this.infoForm, response.data.loadingWorksheet.worksheetInfo)
       this._ownCollection = response.data.loadingWorksheet.worksheetInfo.ownCollection
       this.pickedProductData = {

package/client/pages/outbound/merged-outbound-worksheet.js

@@ -189,6 +189,7 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'string',
           name: 'name',
           header: i18next.t('field.worksheet_no'),
+          imex: { header: i18next.t('field.worksheet_no'), key: 'name', width: 30, type: 'string' },
           sortable: true,
           width: 150
         },
@@ -196,6 +197,7 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'string',
           name: 'taskNo',
           header: i18next.t('field.task_no'),
+          imex: { header: i18next.t('field.task_no'), key: 'taskNo', width: 30, type: 'string' },
           sortable: true,
           width: 150
         },
@@ -203,6 +205,7 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'object',
           name: 'bizplace',
           header: i18next.t('field.company'),
+          imex: { header: i18next.t('field.company'), key: 'bizplace.name', width: 30, type: 'string' },
           sortable: true,
           width: 240
         },
@@ -210,6 +213,7 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'string',
           name: 'type',
           header: i18next.t('field.type'),
+          imex: { header: i18next.t('field.type'), key: 'type', width: 30, type: 'string' },
           sortable: true,
           width: 150
         },
@@ -217,6 +221,7 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'string',
           name: 'status',
           header: i18next.t('field.status'),
+          imex: { header: i18next.t('field.status'), key: 'status', width: 30, type: 'string' },
           sortable: true,
           width: 100
         },
@@ -224,6 +229,7 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'createdAt',
           header: i18next.t('field.created_at'),
+          imex: { header: i18next.t('field.created_at'), key: 'createdAt', width: 30, type: 'datetime' },
           sortable: true,
           width: 160
         },
@@ -231,6 +237,7 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'startedAt',
           header: i18next.t('field.started_at'),
+          imex: { header: i18next.t('field.started_at'), key: 'startedAt', width: 30, type: 'datetime' },
           sortable: true,
           width: 160
         },
@@ -238,6 +245,7 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'endedAt',
           header: i18next.t('field.ended_at'),
+          imex: { header: i18next.t('field.ended_at'), key: 'endedAt', width: 30, type: 'datetime' },
           sortable: true,
           width: 160
         },
@@ -245,6 +253,7 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'object',
           name: 'updater',
           header: i18next.t('field.updater'),
+          imex: { header: i18next.t('field.updater'), key: 'updater.name', width: 30, type: 'string' },
           sortable: true,
           width: 150
         }
@@ -396,7 +405,36 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
   }
 
   _exportableData() {
-    return this.dataGrist.exportRecords()
+    let records = []
+    if (this.dataGrist.selected && this.dataGrist.selected.length > 0) {
+      records = this.dataGrist.selected
+    } else {
+      records = this.dataGrist.data.records
+    }
+
+    var headerSetting = this.dataGrist._config.columns
+      .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+      .map(column => {
+        return column.imex
+      })
+
+    var data = records.map(item => {
+      return {
+        id: item.id,
+        ...this._columns
+          .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+          .reduce((record, column) => {
+            record[column.imex.key] = column.imex.key
+              .split('.')
+              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+            if (column.type === 'datetime') {
+              record[column.imex.key] = new Date(parseInt(record[column.imex.key])).toLocaleString()
+            }
+            return record
+          }, {})
+      }
+    })
+    return { header: headerSetting, data: data }
   }
 }
 

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

@@ -439,6 +439,9 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
         query packingWorksheet($releaseGoodNo: String!) {
           packingWorksheet(releaseGoodNo: $releaseGoodNo) {
             worksheetInfo {
+              releaseGood {
+                name
+              }
               bizplaceName
               partnerDomainId
               refNo
@@ -498,7 +501,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     })
 
     if (!response.errors) {
-      this.releaseGoodNo = releaseGoodNo
+      this.releaseGoodNo = response.data.packingWorksheet.worksheetInfo.releaseGood.name
       if (!response.data?.packingWorksheet) return
 
       const { worksheetInfo, worksheetDetailInfos } = response.data.packingWorksheet

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

@@ -184,6 +184,7 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
           type: 'object',
           name: 'releaseGood',
           header: i18next.t('field.release_good_no'),
+          imex: { header: i18next.t('field.release_good_no'), key: 'releaseGood.name', width: 30, type: 'string' },
           sortable: true,
           width: 150
         },
@@ -191,6 +192,7 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'releaseRefNo',
           header: i18next.t('field.ref_no'),
+          imex: { header: i18next.t('field.ref_no'), key: 'releaseRefNo', width: 30, type: 'string' },
           sortable: true,
           width: 180
         },
@@ -198,6 +200,7 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
           type: 'object',
           name: 'bizplace',
           header: i18next.t('field.company'),
+          imex: { header: i18next.t('field.company'), key: 'bizplace.name', width: 30, type: 'string' },
           sortable: true,
           width: 240
         },
@@ -205,6 +208,7 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'type',
           header: i18next.t('field.type'),
+          imex: { header: i18next.t('field.type'), key: 'type', width: 30, type: 'string' },
           sortable: true,
           width: 100
         },
@@ -212,6 +216,7 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'status',
           header: i18next.t('field.status'),
+          imex: { header: i18next.t('field.status'), key: 'status', width: 30, type: 'string' },
           sortable: true,
           width: 100
         },
@@ -219,6 +224,7 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'createdAt',
           header: i18next.t('field.created_at'),
+          imex: { header: i18next.t('field.created_at'), key: 'createdAt', width: 30, type: 'datetime' },
           sortable: true,
           width: 160
         },
@@ -226,6 +232,7 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'startedAt',
           header: i18next.t('field.started_at'),
+          imex: { header: i18next.t('field.started_at'), key: 'startedAt', width: 30, type: 'datetime' },
           sortable: true,
           width: 160
         },
@@ -233,6 +240,7 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'endedAt',
           header: i18next.t('field.ended_at'),
+          imex: { header: i18next.t('field.ended_at'), key: 'endedAt', width: 30, type: 'datetime' },
           sortable: true,
           width: 160
         },
@@ -240,6 +248,7 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
           type: 'object',
           name: 'updater',
           header: i18next.t('field.updater'),
+          imex: { header: i18next.t('field.updater'), key: 'updater.name', width: 30, type: 'string' },
           sortable: true,
           width: 150
         }
@@ -369,7 +378,36 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
   }
 
   _exportableData() {
-    return this.dataGrist.exportRecords()
+    let records = []
+    if (this.dataGrist.selected && this.dataGrist.selected.length > 0) {
+      records = this.dataGrist.selected
+    } else {
+      records = this.dataGrist.data.records
+    }
+
+    var headerSetting = this.dataGrist._config.columns
+      .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+      .map(column => {
+        return column.imex
+      })
+
+    var data = records.map(item => {
+      return {
+        id: item.id,
+        ...this._columns
+          .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+          .reduce((record, column) => {
+            record[column.imex.key] = column.imex.key
+              .split('.')
+              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+            if (column.type === 'datetime') {
+              record[column.imex.key] = new Date(parseInt(record[column.imex.key])).toLocaleString()
+            }
+            return record
+          }, {})
+      }
+    })
+    return { header: headerSetting, data: data }
   }
 }