@things-factory/operato-wms 3.7.15 → 3.8.0

package/client/pages/inventory-check/create-cycle-count.js

@@ -16,11 +16,6 @@ import { isMobileDevice } from '@things-factory/utils'
 import { fetchLocationSortingRule } from '../../fetch-location-sorting-rule'
 import { LOCATION_SORTING_RULE } from '../constants'
 
-// import { openPopup } from '@things-factory/layout-base'
-// import { fetchLocationSortingRule } from '../../fetch-location-sorting-rule'
-// import { INVENTORY_STATUS, LOCATION_SORTING_RULE } from '../constants'
-// import { fetchSettingRule } from '../../../fetch-setting-value'
-
 const _ = require('lodash')
 
 class CreateCycleCount extends localize(i18next)(PageView) {
@@ -166,7 +161,7 @@ class CreateCycleCount extends localize(i18next)(PageView) {
               basicArgs: {
                 filters: [
                   { name: 'bizplace_id', operator: 'eq', value: this._bizplaceId },
-                  { name: 'groupType', operator: 'noteq', value: 'BUNDLE' }
+                  { name: 'hideBundle', operator: 'eq', value: true }
                 ]
               },
               nameField: 'batchId',

package/client/pages/master/location-list.js

@@ -1,18 +1,21 @@
-import { DirectPrinter } from '@things-factory/barcode-base'
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
-import { i18next, localize } from '@things-factory/i18n-base'
 import '@things-factory/import-ui'
-import { openPopup } from '@things-factory/layout-base'
-import { client, CustomAlert, PageView, store } from '@things-factory/shell'
-import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
-import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
+import './generate-location-list'
+import './print-location-label'
+
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
 import { connect } from 'pwa-helpers/connect-mixin'
-import { LOCATION_LABEL_SETTING_KEY } from '../constants'
-import './generate-location-list'
-import './print-location-label'
+
+import { DirectPrinter } from '@things-factory/barcode-base'
+import { i18next, localize } from '@things-factory/i18n-base'
+import { openPopup } from '@things-factory/layout-base'
+import { client, CustomAlert, PageView, store } from '@things-factory/shell'
+import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
+import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
+
+import { LOCATION_LABEL_SETTING_KEY, LOCATION_STATUS, LOCATION_TYPE } from '../constants'
 
 class LocationList extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
@@ -130,8 +133,19 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
       {
         label: i18next.t('field.type'),
         name: 'type',
-        type: 'text',
-        props: { searchOper: 'i_like' }
+        type: 'select',
+        options: [
+          { value: '' },
+          ...Object.values(LOCATION_TYPE)
+            .map(type => {
+              return {
+                name: type.name,
+                value: type.value
+              }
+            })
+            .sort((a, b) => (a.name > b.name ? 1 : -1))
+        ],
+        props: { searchOper: 'eq' }
       },
       {
         label: i18next.t('field.zone'),
@@ -160,8 +174,19 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
       {
         label: i18next.t('field.status'),
         name: 'status',
-        type: 'text',
-        props: { searchOper: 'i_like' }
+        type: 'select',
+        options: [
+          { value: '' },
+          ...Object.values(LOCATION_STATUS)
+            .map(status => {
+              return {
+                name: status.name,
+                value: status.value
+              }
+            })
+            .sort((a, b) => (a.name > b.name ? 1 : -1))
+        ],
+        props: { searchOper: 'eq' }
       }
     ]
 
@@ -185,10 +210,18 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
           width: 150
         },
         {
-          type: 'string',
+          type: 'select',
           name: 'type',
           header: i18next.t('field.type'),
-          record: { editable: true },
+          record: {
+            editable: true,
+            options: [
+              '',
+              ...Object.values(LOCATION_TYPE)
+                .map(type => type.value)
+                .sort()
+            ]
+          },
           imex: { header: i18next.t('field.type'), key: 'type', width: 50, type: 'string' },
           sortable: true,
           width: 150
@@ -231,10 +264,18 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
           width: 80
         },
         {
-          type: 'string',
+          type: 'select',
           name: 'status',
           header: i18next.t('field.status'),
-          record: { editable: true },
+          record: {
+            editable: true,
+            options: [
+              '',
+              ...Object.values(LOCATION_STATUS)
+                .map(status => status.value)
+                .sort()
+            ]
+          },
           imex: { header: i18next.t('field.status'), key: 'status', width: 50, type: 'string' },
           sortable: true,
           width: 80

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

@@ -1,15 +1,21 @@
-import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import '@things-factory/grist-ui'
+import '../../components/attachment-viewer'
+import '../../components/vas-templates'
+import './edit-product-popup'
+import './proceed-edit-product-popup'
+import './view-product-changes-popup'
+
+import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+
+import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { getRenderer } from '@things-factory/grist-ui'
 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 { isMobileDevice } from '@things-factory/utils'
-import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
-import '../../components/attachment-viewer'
-import '../../components/vas-templates'
+
 import {
   ORDER_PRODUCT_STATUS,
   ORDER_STATUS,
@@ -18,9 +24,6 @@ import {
   VAS_ETC_TYPE,
   VAS_PRODUCT_TYPE
 } from '../../constants'
-import './edit-product-popup'
-import './proceed-edit-product-popup'
-import './view-product-changes-popup'
 
 class ArrivalNoticeDetail extends localize(i18next)(PageView) {
   static get properties() {
@@ -927,6 +930,10 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
   }
 
   openEditProductPopup() {
+    this.productData.records = this.productData.records.filter(
+      orderProduct => orderProduct.status !== ORDER_PRODUCT_STATUS.UNLOADED.value
+    )
+
     openPopup(
       html`
         <edit-product-popup

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

@@ -204,12 +204,29 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
     ]
 
     this.config = {
-      list: { fields: ['name', 'etaDate', 'importCargo', 'ownTransport', 'crossDocking', 'updatedAt', 'updater'] },
+      list: {
+        fields: [
+          'name',
+          'bizplace',
+          'refNo',
+          'refNo2',
+          'refNo3',
+          'etaDate',
+          'container',
+          'importCargo',
+          'ownTransport',
+          'crossDocking',
+          'status',
+          'createdAt',
+          'updatedAt',
+          'creator'
+        ]
+      },
       rows: { appendable: false, selectable: { multiple: true } },
       pagination: { limit: 100, pages: [20, 50, 100, 200, 500] },
       columns: [
-        { type: 'gutter', gutterName: 'dirty' },
         { type: 'gutter', gutterName: 'sequence' },
+        { type: 'gutter', gutterName: 'row-selector', multiple: true },
         {
           type: 'gutter',
           gutterName: 'button',
@@ -229,6 +246,7 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'name',
           header: i18next.t('field.gan'),
+          label: true,
           sortable: true,
           width: 180
         },
@@ -236,6 +254,7 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
           type: 'object',
           name: 'bizplace',
           header: i18next.t('field.company'),
+          label: true,
           sortable: true,
           width: 250
         },
@@ -243,6 +262,7 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'refNo',
           header: i18next.t('field.ref_no'),
+          label: true,
           sortable: true,
           width: 150
         },
@@ -250,6 +270,7 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'refNo2',
           header: i18next.t('field.ref_no_2'),
+          label: true,
           sortable: true,
           width: 150
         },
@@ -257,6 +278,7 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'refNo3',
           header: i18next.t('field.ref_no_3'),
+          label: true,
           sortable: true,
           width: 150
         },
@@ -264,6 +286,7 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
           type: 'date',
           name: 'etaDate',
           header: i18next.t('field.eta'),
+          label: true,
           sortable: true,
           width: 120
         },
@@ -271,6 +294,7 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
           type: 'boolean',
           name: 'container',
           header: i18next.t('field.container'),
+          label: true,
           sortable: true,
           width: 60
         },
@@ -278,6 +302,7 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
           type: 'boolean',
           name: 'importCargo',
           header: i18next.t('field.import_cargo'),
+          label: true,
           sortable: true,
           width: 60
         },
@@ -285,6 +310,7 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
           type: 'boolean',
           name: 'ownTransport',
           header: i18next.t('field.own_transport'),
+          label: true,
           sortable: true,
           width: 60
         },
@@ -292,18 +318,23 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
           type: 'boolean',
           name: 'crossDocking',
           header: i18next.t('field.cross_docking'),
+          label: true,
+          sortable: true,
           width: 60
         },
         {
           type: 'object',
           name: 'releaseGood',
           header: i18next.t('field.ro'),
+          label: true,
+          sortable: true,
           width: 160
         },
         {
           type: 'string',
           name: 'status',
           header: i18next.t('field.status'),
+          label: true,
           sortable: true,
           width: 120
         },
@@ -311,6 +342,7 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'createdAt',
           header: i18next.t('field.created_at'),
+          label: true,
           sortable: true,
           width: 160
         },
@@ -318,6 +350,7 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'updatedAt',
           header: i18next.t('field.updated_at'),
+          label: true,
           sortable: true,
           width: 160
         },
@@ -325,6 +358,7 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
           type: 'object',
           name: 'creator',
           header: i18next.t('field.created_by'),
+          label: true,
           sortable: true,
           width: 200
         }
@@ -447,12 +481,59 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
     }
   }
 
-  get _columns() {
-    return this.config.columns
+  async _exportableData() {
+    try {
+      let data = []
+
+      var headerSetting = [
+        { header: i18next.t('field.order_no'), key: 'name', width: 25, type: 'string' },
+        { header: i18next.t('field.company'), key: 'bizplaceName', width: 25, type: 'string' },
+        { header: i18next.t('field.ref_no'), key: 'refNo', width: 25, type: 'string' },
+        { header: i18next.t('field.ref_no_2'), key: 'refNo2', width: 25, type: 'string' },
+        { header: i18next.t('field.ref_no_3'), key: 'refNo3', width: 25, type: 'string' },
+        { header: i18next.t('field.eta_date'), key: 'etaDate', width: 30, type: 'string' },
+        { header: i18next.t('field.container'), key: 'container', width: 30, type: 'string' },
+        { header: i18next.t('field.import_cargo'), key: 'importCargo', width: 30, type: 'string' },
+        { header: i18next.t('field.cross_docking'), key: 'crossDocking', width: 30, type: 'string' },
+        { header: i18next.t('field.status'), key: 'status', width: 25, type: 'string' },
+        { header: i18next.t('field.created_at'), key: 'createdAt', width: 30, type: 'date' },
+        { header: i18next.t('field.updated_at'), key: 'updatedAt', width: 30, type: 'date' },
+        { header: i18next.t('field.created_by'), key: 'creatorName', width: 25, type: 'string' }
+      ]
+
+      if (this.dataGrist.selected && this.dataGrist.selected.length > 0) {
+        data = this.dataGrist.selected.map(record => {
+          return {
+            ...record,
+            bizplaceName: record.bizplace?.name,
+            creatorName: record.creator?.name
+          }
+        })
+      } else {
+        data = (await this.fetchHandler({ page: 1, limit: 9999999 })).records.map(record => {
+          return {
+            ...record,
+            bizplaceName: record.bizplace?.name,
+            creatorName: record.creator?.name
+          }
+        })
+      }
+
+      return { header: headerSetting, data }
+    } catch (e) {
+      this._showToast(e)
+    }
   }
 
-  _exportableData() {
-    return this.dataGrist.exportRecords()
+  _showToast({ type, message }) {
+    document.dispatchEvent(
+      new CustomEvent('notify', {
+        detail: {
+          type,
+          message
+        }
+      })
+    )
   }
 }
 

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

@@ -216,12 +216,27 @@ class ArrivalNoticeRequests extends localize(i18next)(PageView) {
     this.config = {
       rows: { appendable: false, selectable: { multiple: true } },
       list: {
-        fields: ['bizplace', 'status', 'updatedAt']
+        fields: [
+          'name',
+          'bizplace',
+          'refNo',
+          'refNo2',
+          'refNo3',
+          'etaDate',
+          'container',
+          'importCargo',
+          'ownTransport',
+          'crossDocking',
+          'status',
+          'createdAt',
+          'updatedAt',
+          'acceptedBy'
+        ]
       },
       pagination: { limit: 100, pages: [20, 50, 100, 200, 500] },
       columns: [
-        { type: 'gutter', gutterName: 'dirty' },
         { type: 'gutter', gutterName: 'sequence' },
+        { type: 'gutter', gutterName: 'row-selector', multiple: true },
         {
           type: 'gutter',
           gutterName: 'button',
@@ -245,6 +260,7 @@ class ArrivalNoticeRequests extends localize(i18next)(PageView) {
           type: 'string',
           name: 'name',
           header: i18next.t('field.gan'),
+          label: true,
           sortable: true,
           width: 180
         },
@@ -252,6 +268,7 @@ class ArrivalNoticeRequests extends localize(i18next)(PageView) {
           type: 'object',
           name: 'bizplace',
           header: i18next.t('field.company'),
+          label: true,
           sortable: true,
           width: 250
         },
@@ -259,6 +276,7 @@ class ArrivalNoticeRequests extends localize(i18next)(PageView) {
           type: 'string',
           name: 'refNo',
           header: i18next.t('field.ref_no'),
+          label: true,
           sortable: true,
           width: 150
         },
@@ -266,6 +284,7 @@ class ArrivalNoticeRequests extends localize(i18next)(PageView) {
           type: 'string',
           name: 'refNo2',
           header: i18next.t('field.ref_no_2'),
+          label: true,
           sortable: true,
           width: 150
         },
@@ -273,6 +292,7 @@ class ArrivalNoticeRequests extends localize(i18next)(PageView) {
           type: 'string',
           name: 'refNo3',
           header: i18next.t('field.ref_no_3'),
+          label: true,
           sortable: true,
           width: 150
         },
@@ -280,6 +300,7 @@ class ArrivalNoticeRequests extends localize(i18next)(PageView) {
           type: 'date',
           name: 'etaDate',
           header: i18next.t('field.eta'),
+          label: true,
           sortable: true,
           width: 120
         },
@@ -287,6 +308,7 @@ class ArrivalNoticeRequests extends localize(i18next)(PageView) {
           type: 'boolean',
           name: 'container',
           header: i18next.t('field.container'),
+          label: true,
           sortable: true,
           width: 60
         },
@@ -294,6 +316,7 @@ class ArrivalNoticeRequests extends localize(i18next)(PageView) {
           type: 'boolean',
           name: 'importCargo',
           header: i18next.t('field.import_cargo'),
+          label: true,
           sortable: true,
           width: 60
         },
@@ -301,6 +324,7 @@ class ArrivalNoticeRequests extends localize(i18next)(PageView) {
           type: 'boolean',
           name: 'ownTransport',
           header: i18next.t('field.own_transport'),
+          label: true,
           sortable: true,
           width: 60
         },
@@ -308,18 +332,21 @@ class ArrivalNoticeRequests extends localize(i18next)(PageView) {
           type: 'boolean',
           name: 'crossDocking',
           header: i18next.t('field.cross_docking'),
+          label: true,
           width: 60
         },
         {
           type: 'object',
           name: 'releaseGood',
           header: i18next.t('field.ro'),
+          label: true,
           width: 160
         },
         {
           type: 'string',
           name: 'status',
           header: i18next.t('field.status'),
+          label: true,
           sortable: true,
           width: 120
         },
@@ -327,6 +354,7 @@ class ArrivalNoticeRequests extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'createdAt',
           header: i18next.t('field.created_at'),
+          label: true,
           sortable: true,
           width: 160
         },
@@ -334,6 +362,7 @@ class ArrivalNoticeRequests extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'updatedAt',
           header: i18next.t('field.updated_at'),
+          label: true,
           sortable: true,
           width: 160
         },
@@ -341,6 +370,7 @@ class ArrivalNoticeRequests extends localize(i18next)(PageView) {
           type: 'object',
           name: 'acceptedBy',
           header: i18next.t('field.accepted_by'),
+          label: true,
           sortable: true,
           width: 200
         }
@@ -458,12 +488,59 @@ class ArrivalNoticeRequests extends localize(i18next)(PageView) {
     }
   }
 
-  get _columns() {
-    return this.config.columns
+  async _exportableData() {
+    try {
+      let data = []
+
+      var headerSetting = [
+        { header: i18next.t('field.order_no'), key: 'name', width: 25, type: 'string' },
+        { header: i18next.t('field.company'), key: 'bizplaceName', width: 25, type: 'string' },
+        { header: i18next.t('field.ref_no'), key: 'refNo', width: 25, type: 'string' },
+        { header: i18next.t('field.ref_no_2'), key: 'refNo2', width: 25, type: 'string' },
+        { header: i18next.t('field.ref_no_3'), key: 'refNo3', width: 25, type: 'string' },
+        { header: i18next.t('field.eta_date'), key: 'etaDate', width: 30, type: 'string' },
+        { header: i18next.t('field.container'), key: 'container', width: 30, type: 'string' },
+        { header: i18next.t('field.import_cargo'), key: 'importCargo', width: 30, type: 'string' },
+        { header: i18next.t('field.cross_docking'), key: 'crossDocking', width: 30, type: 'string' },
+        { header: i18next.t('field.status'), key: 'status', width: 25, type: 'string' },
+        { header: i18next.t('field.created_at'), key: 'createdAt', width: 30, type: 'date' },
+        { header: i18next.t('field.updated_at'), key: 'updatedAt', width: 30, type: 'date' },
+        { header: i18next.t('field.accepted_by'), key: 'acceptedByName', width: 25, type: 'string' }
+      ]
+
+      if (this.dataGrist.selected && this.dataGrist.selected.length > 0) {
+        data = this.dataGrist.selected.map(record => {
+          return {
+            ...record,
+            bizplaceName: record.bizplace?.name,
+            acceptedByName: record.acceptedBy?.name
+          }
+        })
+      } else {
+        data = (await this.fetchHandler({ page: 1, limit: 9999999 })).records.map(record => {
+          return {
+            ...record,
+            bizplaceName: record.bizplace?.name,
+            acceptedByName: record.acceptedBy?.name
+          }
+        })
+      }
+
+      return { header: headerSetting, data }
+    } catch (e) {
+      this._showToast(e)
+    }
   }
 
-  _exportableData() {
-    return this.dataGrist.exportRecords()
+  _showToast({ type, message }) {
+    document.dispatchEvent(
+      new CustomEvent('notify', {
+        detail: {
+          type,
+          message
+        }
+      })
+    )
   }
 }
 

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

@@ -660,7 +660,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
         name: 'manufactureYear',
         header: i18next.t('field.manufacture_year'),
         imex: { header: i18next.t('field.manufacture_year'), key: 'manufactureYear', width: 25, type: 'float' },
-        record: { editable: editable, options: { min: 1500, max: 2200 } },
+        record: { editable: editable },
         width: 100
       },
       {
@@ -786,6 +786,26 @@ class CreateArrivalNotice 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]
@@ -917,7 +937,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
 
     const response = await client.query({
       query: gql`
-        query productDetails($filters: [Filter]) {
+        query productDetails($filters: [Filter!]!) {
           productDetails(filters: $filters) {
             items {
               id
@@ -1461,6 +1481,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
             this.vasGrist.reset()
             this._strictProductSelection = await fetchSettingRule('strict-product-selection', e.detail.domain.id)
             this._configureProductGrist()
+            this._clearView()
           }}"
         ></popup-partner-bizplaces-selector>
       `,