@things-factory/operato-wms 3.7.12 → 3.8.0

package/client/pages/inventory/inventory-adjustment.js

@@ -50,18 +50,12 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  render() {
-    return html`
-      <search-form id="search-form" .fields=${this._searchFields} @submit=${e => this.dataGrist.fetch()}></search-form>
+  get dataGrist() {
+    return this.shadowRoot.querySelector('data-grist')
+  }
 
-      <data-grist
-        .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
-        .config=${this.config}
-        .fetchHandler="${this.fetchHandler.bind(this)}"
-        @record-change="${this._customerChange.bind(this)}"
-        @field-change="${this._fieldChange.bind(this)}"
-      ></data-grist>
-    `
+  get searchForm() {
+    return this.shadowRoot.querySelector('search-form')
   }
 
   get context() {
@@ -70,17 +64,17 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
       actions: [
         {
           title: i18next.t('button.lot_label_print'),
-          action: this._printLotLabel.bind(this),
+          action: this.printLotLabel.bind(this),
           ...CommonButtonStyles.label
         },
         {
           title: i18next.t('button.carton_label_print'),
-          action: this._printCartonLabel.bind(this),
+          action: this.printCartonLabel.bind(this),
           ...CommonButtonStyles.label
         },
         {
           title: i18next.t('button.save'),
-          action: this._saveInventories.bind(this),
+          action: this.saveInventories.bind(this),
           ...CommonButtonStyles.save
         }
       ],
@@ -90,23 +84,35 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
       },
       exportable: {
         name: i18next.t('title.inventory_adjustment'),
-        data: this._exportableData.bind(this)
+        data: this.exportableData.bind(this)
       },
       importable: {
-        handler: this._importableData.bind(this)
+        handler: this.importableData.bind(this)
       },
       help: 'operato-wms/inventory/inventory-adjustment'
     }
   }
 
+  render() {
+    return html`
+      <search-form id="search-form" .fields=${this._searchFields} @submit=${e => this.dataGrist.fetch()}></search-form>
+
+      <data-grist
+        .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
+        .config=${this.config}
+        .fetchHandler="${this.fetchHandler.bind(this)}"
+        @record-change="${this.customerChange.bind(this)}"
+        @field-change="${this.fieldChange.bind(this)}"
+      ></data-grist>
+    `
+  }
+
   async pageInitialized() {
-    let [locations, partners, _packingType, _uom] = await Promise.all([
-      this.fetchLocation(),
+    let [partners, packingType, uom] = await Promise.all([
       this._fetchPartners(),
       getCodeByName('PACKING_TYPES'),
       getCodeByName('UOM')
     ])
-    this.location = locations
 
     this._searchFields = [
       {
@@ -122,7 +128,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
                 value: partner.id
               }
             })
-            .sort(this._compareValues('name', 'asc'))
+            .sort(this.compareValues('name', 'asc'))
         ],
         handlers: {
           change: () => {
@@ -167,7 +173,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
         type: 'select',
         options: [
           { value: '' },
-          ..._packingType.map(packingType => {
+          ...packingType.map(packingType => {
             return {
               name: packingType.name,
               value: packingType.name
@@ -200,7 +206,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
         ]
       },
       rows: {
-        handlers: { click: this._setProductRefCondition.bind(this) },
+        handlers: { click: this.setProductRefCondition.bind(this) },
         selectable: { multiple: true }
       },
       columns: [
@@ -210,7 +216,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           type: 'gutter',
           gutterName: 'button',
           icon: 'reorder',
-          handlers: { click: this._showInventoryMovement.bind(this) }
+          handlers: { click: this.showInventoryMovement.bind(this) }
         },
         {
           type: 'string',
@@ -277,6 +283,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
                 { name: 'productId', hidden: true },
                 { name: 'sku', header: i18next.t('field.sku'), width: 150 },
                 { name: 'name', header: i18next.t('field.name'), width: 250 },
+                { name: 'brand', header: i18next.t('field.brand'), width: 150 },
                 { name: 'description', header: i18next.t('field.description'), width: 450 },
                 { name: 'type', header: i18next.t('field.type'), width: 200 },
                 { name: 'packingType', header: i18next.t('field.packing_type'), width: 200 },
@@ -295,6 +302,12 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           sortable: true,
           width: 500
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          width: 120
+        },
         {
           type: 'code',
           name: 'packingType',
@@ -305,7 +318,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
             key: 'packingType',
             width: 50,
             type: 'array',
-            arrData: _packingType
+            arrData: packingType
           },
           width: 150
         },
@@ -369,7 +382,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           name: 'uom',
           header: i18next.t('field.uom'),
           record: { editable: true, codeName: 'WEIGHT_UNITS' },
-          imex: { header: i18next.t('field.uom'), key: 'uom', width: 25, type: 'array', arrData: _uom },
+          imex: { header: i18next.t('field.uom'), key: 'uom', width: 25, type: 'array', arrData: uom },
           sortable: true,
           width: 80
         },
@@ -397,7 +410,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
             key: 'location.name',
             width: 15,
             type: 'array',
-            arrData: this.location
+            arrData: []
           },
           sortable: true,
           width: 120
@@ -428,7 +441,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           sortable: true,
           width: 200,
           handlers: {
-            click: this._openRemarkNote.bind(this)
+            click: this.openRemarkNote.bind(this)
           }
         },
         {
@@ -472,25 +485,11 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async pageUpdated(changes, lifecycle) {
-    if (this.active) {
-      this.dataGrist.fetch()
-    }
-  }
-
-  get dataGrist() {
-    return this.shadowRoot.querySelector('data-grist')
-  }
-
-  get searchForm() {
-    return this.shadowRoot.querySelector('search-form')
-  }
-
   async fetchHandler({ page, limit, sorters = [] }) {
     const filters = await this.searchForm.getQueryFilters()
     const response = await client.query({
       query: gql`
-        query inventories($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+        query inventories($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
           inventories(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
@@ -512,6 +511,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
                 id
                 name
                 sku
+                brand
                 auxUnit1
                 auxValue1
                 description
@@ -555,6 +555,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
       return {
         ...item,
         sku: item.product.sku,
+        brand: item.product.brand,
         lockedQty: item.qty - item.remainQty,
         remainingQty: item.remainQty
       }
@@ -570,7 +571,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     const filters = await this.searchForm.getQueryFilters()
     const response = await client.query({
       query: gql`
-        query inventories($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+        query inventories($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
           inventories(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
@@ -594,6 +595,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
               product {
                 id
                 sku
+                brand
                 name
                 description
               }
@@ -650,7 +652,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  _setProductRefCondition(columns, data, column, record, rowIndex) {
+  setProductRefCondition(columns, data, column, record, rowIndex) {
     this.config.columns.map(column => {
       if (column.name === 'product') {
         if (record && record.bizplace && record.bizplace.id) {
@@ -662,7 +664,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     })
   }
 
-  _customerChange(event) {
+  customerChange(event) {
     const record = event.detail
     const columnName = event.detail.column.name
 
@@ -671,13 +673,17 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  _fieldChange(e) {
+  fieldChange(e) {
     switch (e.detail.column.name) {
       case 'uomValue':
         if (e.detail.after < 0) this.dataGrist._data.records[e.detail.row].uomValue = 0
         break
       case 'qty':
-        if (e.detail.after < 0) this.dataGrist._data.records[e.detail.row].qty = 0
+        if (e.detail.after < 0 || !Number.isInteger(e.detail.after))
+          this.dataGrist._data.records[e.detail.row].qty = e.detail.before
+        break
+      case 'unitCost':
+        if (e.detail.after < 0) this.dataGrist._data.records[e.detail.row].unitCost = e.detail.before
         break
       case 'manufactureYear':
         if (
@@ -710,7 +716,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async _saveInventories() {
+  async saveInventories() {
     var patches = this.dataGrist.exportPatchList({ flagName: 'cuFlag' })
     patches = patches.map(row => {
       delete row.productUomValue
@@ -732,7 +738,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     if (patches && patches.length) {
       const response = await client.mutate({
         mutation: gql`
-          mutation submitInventoryChanges($patches: [InventoryPatch]!) {
+          mutation submitInventoryChanges($patches: [InventoryPatch!]!) {
             submitInventoryChanges(patches: $patches)
           }
         `,
@@ -746,7 +752,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  get _columns() {
+  get columns() {
     return this.config.columns
   }
 
@@ -776,7 +782,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  _importableData(records) {
+  importableData(records) {
     setTimeout(() => {
       openPopup(
         html`
@@ -798,7 +804,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     }, 500)
   }
 
-  async _exportableData() {
+  async exportableData() {
     try {
       let data = []
 
@@ -827,6 +833,8 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
         this.fetchBizplaces([{ ...bizplaceFilters[0], name: 'bizplace' }])
       ])
 
+      let location = this.fetchLocation()
+
       headerSetting = headerSetting.map(column => {
         switch (column.key) {
           case 'bizplace.name':
@@ -837,6 +845,9 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
               return { ...itm, name: `(${itm.sku}) ${itm.name} - ${itm.description}` }
             })
             break
+          case 'location':
+            column.arrData = location
+            break
           default:
             break
         }
@@ -851,7 +862,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
         item.product.name = `(${item.product.sku}) ${item.product.name} - ${item.product.description}`
         return {
           id: item.id,
-          ...this._columns
+          ...this.columns
             .filter(column => column.type !== 'gutter' && column.imex !== undefined)
             .reduce((record, column) => {
               record[column.imex.key] = column.imex.key.split('.').reduce((obj, key) => {
@@ -896,29 +907,33 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
   }
 
   async fetchProduct(bizplace = []) {
-    bizplace[0].name = 'bizplace'
-    const response = await client.query({
-      query: gql`
-        query productsByBizplace($filters: [Filter]) {
-          productsByBizplace(filters: $filters) {
-            items {
-              id
-              sku
-              name
-              description
+    try {
+      bizplace[0].name = 'bizplace'
+      const response = await client.query({
+        query: gql`
+          query productsByBizplace($filters: [Filter!]) {
+            productsByBizplace(filters: $filters) {
+              items {
+                id
+                sku
+                name
+                description
+              }
             }
           }
-        }
-      `,
-      variables: { filters: [...bizplace] }
-    })
-    return response.data.productsByBizplace.items
+        `,
+        variables: { filters: [...bizplace] }
+      })
+      return response.data.productsByBizplace.items
+    } catch (ex) {
+      throw ex
+    }
   }
 
   async fetchLocation() {
     const response = await client.query({
       query: gql`
-        query locations($filters: [Filter]) {
+        query locations($filters: [Filter!]) {
           locations(filters: $filters) {
             items {
               id
@@ -949,7 +964,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  _showInventoryMovement(columns, data, column, record, rowIndex) {
+  showInventoryMovement(columns, data, column, record, rowIndex) {
     openPopup(html` <inventory-history-by-pallet .palletId="${record.palletId}"></inventory-history-by-pallet> `, {
       backdrop: true,
       size: 'large',
@@ -957,7 +972,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     })
   }
 
-  _openRemarkNote(columns, data, column, record, rowIndex) {
+  openRemarkNote(columns, data, column, record, rowIndex) {
     openPopup(
       html`
         <popup-note
@@ -983,7 +998,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     )
   }
 
-  async _printLotLabel() {
+  async printLotLabel() {
     const records = this.dataGrist.selected
     var labelId = this._palletLabel && this._palletLabel.id
 
@@ -994,7 +1009,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
       })
     } else {
       for (var record of records) {
-        let dateIn = this._getDateStr(record.createdAt)
+        let dateIn = this.getDateStr(record.createdAt)
         var searchParams = new URLSearchParams()
 
         /* for pallet record mapping */
@@ -1039,7 +1054,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async _printCartonLabel() {
+  async printCartonLabel() {
     const records = this.dataGrist.selected
     const labelId = this._cartonLabel && this._cartonLabel.id
 
@@ -1083,7 +1098,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  _getDateStr(date) {
+  getDateStr(date) {
     const newDate = new Date(parseInt(date))
 
     const month = String(newDate.getMonth() + 1).padStart(2, '0')
@@ -1094,7 +1109,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     return date
   }
 
-  _compareValues(key, order = 'asc') {
+  compareValues(key, order = 'asc') {
     return function innerSort(a, b) {
       if (!a.hasOwnProperty(key) || !b.hasOwnProperty(key)) {
         return 0

package/client/pages/inventory/inventory-by-product-detail.js

@@ -202,7 +202,7 @@ class InventoryByProductDetail extends localize(i18next)(LitElement) {
       const filters = await this.searchForm.getQueryFilters()
       const response = await client.query({
         query: gql`
-          query inventories($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+          query inventories($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
             inventories(filters: $filters, pagination: $pagination, sortings: $sortings) {
               items {
                 packingType

package/client/pages/inventory/inventory-by-product.js

@@ -193,6 +193,13 @@ class InventoryByProduct extends localize(i18next)(PageView) {
           header: i18next.t('field.name'),
           width: 200
         },
+        {
+          type: 'string',
+          name: 'brand',
+          imex: { header: i18next.t('field.brand'), key: 'brand', width: 30, type: 'string' },
+          header: i18next.t('field.brand'),
+          width: 100
+        },
         {
           type: 'string',
           name: 'description',
@@ -250,12 +257,13 @@ class InventoryByProduct extends localize(i18next)(PageView) {
   async fetchHandler({ page, limit, sorters = [] }) {
     const response = await client.query({
       query: gql`
-        query inventoriesByProduct($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+        query inventoriesByProduct($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
           inventoriesByProduct(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               product {
                 id
                 sku
+                brand
                 name
                 description
                 type

package/client/pages/inventory/inventory-history-by-pallet.js

@@ -101,6 +101,13 @@ class InventoryHistoryByPallet extends localize(i18next)(LitElement) {
           sortable: true,
           width: 500
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          sortable: true,
+          width: 150
+        },
         {
           type: 'string',
           name: 'batchId',
@@ -205,7 +212,7 @@ class InventoryHistoryByPallet extends localize(i18next)(LitElement) {
       if (!this.palletId) return
       const response = await client.query({
         query: gql`
-          query inventoryHistories($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+          query inventoryHistories($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
             inventoryHistories(filters: $filters, pagination: $pagination, sortings: $sortings) {
               items {
                 palletId
@@ -225,6 +232,7 @@ class InventoryHistoryByPallet extends localize(i18next)(LitElement) {
                 transactionType
                 product {
                   sku
+                  brand
                   name
                   description
                 }
@@ -262,6 +270,7 @@ class InventoryHistoryByPallet extends localize(i18next)(LitElement) {
               return {
                 ...itm,
                 productSku: itm.product.sku,
+                productBrand: itm.product.brand,
                 uomValue: `${itm.uomValue} ${itm.uom}`,
                 openingUomValue: `${itm.openingUomValue} ${itm.uom}`
               }

package/client/pages/inventory/inventory-history.js

@@ -197,6 +197,7 @@ class InventoryHistory extends localize(i18next)(PageView) {
         fields: [
           'productSku',
           'product',
+          'productBrand',
           'seq',
           'palletId',
           'cartonId',
@@ -226,6 +227,13 @@ class InventoryHistory extends localize(i18next)(PageView) {
           sortable: true,
           width: 200
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          sortable: true,
+          width: 200
+        },
         {
           type: 'number',
           name: 'seq',
@@ -434,9 +442,9 @@ class InventoryHistory extends localize(i18next)(PageView) {
         query: gql`
           query bizplaceInventoryHistories(
             $inventoryHistory: InventoryHistoryPatch
-            $filters: [Filter]
+            $filters: [Filter!]
             $pagination: Pagination
-            $sortings: [Sorting]
+            $sortings: [Sorting!]
           ) {
             bizplaceInventoryHistories(
               inventoryHistory: $inventoryHistory
@@ -460,6 +468,7 @@ class InventoryHistory extends localize(i18next)(PageView) {
                 product {
                   id
                   sku
+                  brand
                   name
                   description
                 }
@@ -502,6 +511,7 @@ class InventoryHistory extends localize(i18next)(PageView) {
           return {
             ...item,
             productSku: item.product.sku,
+            productBrand: item.product.brand,
             productName: item.product.name,
             locationName: item.location.name,
             updaterName: item?.updater?.name ? item.updater.name : ''

package/client/pages/inventory/onhand-inventory.js

@@ -89,6 +89,7 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
           'initialInboundAt',
           'productSku',
           'productName',
+          'productBrand',
           'packingType',
           'location',
           'remainQty',
@@ -151,6 +152,13 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
           sortable: true,
           width: 500
         },
+        {
+          type: 'string',
+          name: 'product_brand',
+          header: i18next.t('field.brand'),
+          sortable: true,
+          width: 150
+        },
         {
           type: 'code',
           name: 'packingType',
@@ -353,10 +361,9 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
     const expFilters = (await this.searchExpForm?.getQueryFilters()) || []
     const response = await client.query({
       query: gql`
-        query onhandInventories($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+        query onhandInventories($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
           onhandInventories(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
-              id
               palletId
               cartonId
               batchId
@@ -373,6 +380,7 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
                 id
                 sku
                 name
+                brand
                 description
               }
               qty
@@ -423,7 +431,8 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
               ...item,
               product: {
                 ...item.product,
-                name: `${item.product.name} ${item.product.description}`
+                name: `${item.product.name} ${item.product.description}`,
+                productBrand: `${item.product.brand}`
               }
             },
             '_'

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',
@@ -187,6 +182,11 @@ class CreateCycleCount extends localize(i18next)(PageView) {
                   header: i18next.t('field.product_info'),
                   width: 280
                 },
+                {
+                  name: 'productBrand',
+                  header: i18next.t('field.brand'),
+                  width: 150
+                },
                 { name: 'packingType', header: i18next.t('field.packing_type') },
                 { name: 'packingSize', header: i18next.t('field.packing_size') },
                 {
@@ -232,6 +232,12 @@ class CreateCycleCount extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 100
+        },
         {
           type: 'code',
           name: 'packingType',