@things-factory/operato-wms 3.7.12 → 3.8.0

package/client/pages/inbound/worksheet-putaway-return.js

@@ -15,6 +15,7 @@ class WorksheetPutawayReturn extends localize(i18next)(PageView) {
       _worksheetNo: String,
       _worksheetStatus: String,
       _returnOrderNo: String,
+      _statusList: Array,
       config: Object,
       data: Object
     }
@@ -107,6 +108,13 @@ class WorksheetPutawayReturn extends localize(i18next)(PageView) {
     }
   }
 
+  constructor() {
+    super()
+    this._statusList = Object.keys(WORKSHEET_STATUS).map(key => {
+      return { value: WORKSHEET_STATUS[key].value, display: WORKSHEET_STATUS[key].name }
+    })
+  }
+
   render() {
     return html`
       <div class="form-container">
@@ -126,11 +134,12 @@ class WorksheetPutawayReturn extends localize(i18next)(PageView) {
             <input name="refNo" readonly />
 
             <label>${i18next.t('label.status')}</label>
-            <select name="status" disabled>
-              ${Object.keys(WORKSHEET_STATUS).map(
-                key => html` <option value="${WORKSHEET_STATUS[key].value}">${WORKSHEET_STATUS[key].name}</option> `
-              )}
-            </select>
+            <input
+              name="status"
+              value="${this._statusList.find(x => x.value == this._worksheetStatus)?.display || ''}"
+              readonly
+              disabled
+            />
           </fieldset>
         </form>
 
@@ -192,6 +201,12 @@ class WorksheetPutawayReturn extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 350
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          width: 120
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -250,6 +265,7 @@ class WorksheetPutawayReturn extends localize(i18next)(PageView) {
                   cartonId
                   product {
                     name
+                    brand
                     description
                   }
                   packingType
@@ -285,6 +301,7 @@ class WorksheetPutawayReturn extends localize(i18next)(PageView) {
           return {
             ...worksheetDetail.targetInventory.inventory,
             name: worksheetDetail.name,
+            brand: worksheetDetail.targetInventory.inventory.product.brand,
             description: worksheetDetail.description,
             status: worksheetDetail.status
           }

package/client/pages/inbound/worksheet-putaway.js

@@ -1,13 +1,16 @@
 import '@things-factory/barcode-ui'
-import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import '@things-factory/grist-ui'
+
+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 { 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 {
   VAS_BATCH_AND_PRODUCT_TYPE,
   VAS_BATCH_NO_TYPE,
@@ -231,6 +234,12 @@ class WorksheetPutaway extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 300
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -404,6 +413,7 @@ class WorksheetPutaway extends localize(i18next)(PageView) {
                   product {
                     sku
                     name
+                    brand
                     description
                   }
                   packingType
@@ -443,6 +453,7 @@ class WorksheetPutaway extends localize(i18next)(PageView) {
             name: worksheetDetail.name,
             description: worksheetDetail.description,
             productSku: worksheetDetail.targetInventory.inventory.product.sku,
+            productBrand: worksheetDetail.targetInventory.inventory.product.brand,
             status: worksheetDetail.status
           }
         })
@@ -505,17 +516,19 @@ class WorksheetPutaway extends localize(i18next)(PageView) {
       !this.preConfig.columns.some(e => e.name === 'status') &&
       this._worksheetStatus !== WORKSHEET_STATUS.DEACTIVATED.value
     ) {
-      this.preConfig.columns = [...this.preConfig.columns, currentLocationColumn, statusColumnConfig]
+      this.preConfig.columns = [
+        ...this.preConfig.columns,
+        currentLocationColumn,
+        statusColumnConfig,
+        batchIdRefColumnConfig
+      ]
     } else if (
       this.preConfig.columns.some(e => e.name === 'status') &&
       this._worksheetStatus === WORKSHEET_STATUS.DEACTIVATED.value
     ) {
       this.preConfig.columns.splice(this.preConfig.columns.map(e => e.name).indexOf('location'))
       this.preConfig.columns.splice(this.preConfig.columns.map(e => e.name).indexOf('status'))
-    }
-
-    if (this.data.records.some(e => e.batchIdRef)) {
-      this.preConfig.columns = [...this.preConfig.columns, batchIdRefColumnConfig]
+      this.preConfig.columns.splice(this.preConfig.columns.map(e => e.name).indexOf('batchIdRef'))
     }
 
     this.config = { ...this.preConfig }

package/client/pages/inbound/worksheet-unloading-return.js

@@ -19,6 +19,7 @@ class WorksheetUnloadingReturn extends localize(i18next)(PageView) {
     return {
       _worksheetNo: String,
       _worksheetStatus: String,
+      _statusList: Array,
       _returnOrderNo: String,
       _enableCartonLabel: Boolean,
       config: Object,
@@ -143,6 +144,13 @@ class WorksheetUnloadingReturn extends localize(i18next)(PageView) {
     }
   }
 
+  constructor() {
+    super()
+    this._statusList = Object.keys(WORKSHEET_STATUS).map(key => {
+      return { value: WORKSHEET_STATUS[key].value, display: WORKSHEET_STATUS[key].name }
+    })
+  }
+
   render() {
     return html`
       <div class="form-container">
@@ -159,11 +167,12 @@ class WorksheetUnloadingReturn extends localize(i18next)(PageView) {
             <input name="refNo" readonly />
 
             <label>${i18next.t('label.status')}</label>
-            <select name="status" disabled>
-              ${Object.keys(WORKSHEET_STATUS).map(
-                key => html` <option value="${WORKSHEET_STATUS[key].value}">${WORKSHEET_STATUS[key].name}</option> `
-              )}
-            </select>
+            <input
+              name="status"
+              value="${this._statusList.find(x => x.value == this._worksheetStatus)?.display || ''}"
+              readonly
+              disabled
+            />
           </fieldset>
         </form>
 
@@ -230,6 +239,12 @@ class WorksheetUnloadingReturn extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 350
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -302,6 +317,7 @@ class WorksheetUnloadingReturn extends localize(i18next)(PageView) {
                   cartonId
                   product {
                     name
+                    brand
                     description
                   }
                   packingType
@@ -345,6 +361,7 @@ class WorksheetUnloadingReturn extends localize(i18next)(PageView) {
             id: worksheetDetail.id,
             name: worksheetDetail.name,
             description: worksheetDetail.description,
+            brand: worksheetDetail.targetInventory.inventory.product.brand,
             returnQty: worksheetDetail.targetInventory.returnQty,
             remark: worksheetDetail.targetInventory.remark,
             status: worksheetDetail.status,

package/client/pages/inbound/worksheet-unloading.js

@@ -287,6 +287,12 @@ class WorksheetUnloading extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 300
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -514,6 +520,7 @@ class WorksheetUnloading extends localize(i18next)(PageView) {
                 product {
                   id
                   sku
+                  brand
                   name
                   type
                   description
@@ -571,6 +578,7 @@ class WorksheetUnloading extends localize(i18next)(PageView) {
             issue: worksheetDetail.issue,
             initialBatchId: worksheetDetail.targetProduct.batchId,
             productSku: worksheetDetail.targetProduct.product.sku,
+            productBrand: worksheetDetail.targetProduct.product.brand,
             hasBatchChanges:
               worksheetDetail.targetProduct &&
               worksheetDetail.targetProduct.batchId !== worksheetDetail.targetProduct.initialBatchId

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

@@ -353,7 +353,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
     const filters = await this.searchForm.getQueryFilters()
     const response = await client.query({
       query: gql`
-        query inventoryChanges($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+        query inventoryChanges($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
           inventoryChanges(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
@@ -464,11 +464,16 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
       total: response.data.inventoryChanges.total || 0,
       records:
         response.data.inventoryChanges.items.map(item => {
-          let inventoryChangesExpDate = item?.expirationDate ? item?.expirationDate : null
+          let inventoryChangesExpDate = item?.expirationDate
+            ? this._convertUnixTimestampToDate(item?.expirationDate)
+            : null
           let lastInventoryChangesExpDate = item?.lastInventoryHistory?.expirationDate
-            ? item?.lastInventoryHistory?.expirationDate
+            ? this._convertUnixTimestampToDate(item?.lastInventoryHistory?.expirationDate)
+            : null
+
+          let inventoryExpDate = item?.inventory?.expirationDate
+            ? this._convertUnixTimestampToDate(item?.inventory?.expirationDate)
             : null
-          let inventoryExpDate = item?.inventory?.expirationDate ? item?.inventory?.expirationDate : null
 
           return {
             ...item,
@@ -518,7 +523,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
     if (patches && patches.length) {
       const response = await client.mutate({
         mutation: gql`
-          mutation approveInventoryChanges($patches: [InventoryChangePatch]!) {
+          mutation approveInventoryChanges($patches: [InventoryChangePatch!]!) {
             approveInventoryChanges(patches: $patches) {
               items {
                 id
@@ -552,7 +557,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
     if (patches && patches.length) {
       const response = await client.mutate({
         mutation: gql`
-          mutation rejectInventoryChanges($patches: [InventoryChangePatch]!) {
+          mutation rejectInventoryChanges($patches: [InventoryChangePatch!]!) {
             rejectInventoryChanges(patches: $patches)
           }
         `,
@@ -573,7 +578,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
   async fetchProduct(bizplace = []) {
     const response = await client.query({
       query: gql`
-        query productsByBizplace($filters: [Filter]) {
+        query productsByBizplace($filters: [Filter!]) {
           productsByBizplace(filters: $filters) {
             items {
               id
@@ -590,7 +595,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
   async fetchLocation() {
     const response = await client.query({
       query: gql`
-        query locations($filters: [Filter]) {
+        query locations($filters: [Filter!]) {
           locations(filters: $filters) {
             items {
               id
@@ -604,6 +609,11 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
     return response.data.locations.items
   }
 
+  _convertUnixTimestampToDate(unixTimestampValue) {
+    let convertedUnix = new Date(unixTimestampValue)
+    return `${convertedUnix.getDate()}/${convertedUnix.getMonth() + 1}/${convertedUnix.getFullYear()}`
+  }
+
   _compareValues(key, order = 'asc') {
     return function innerSort(a, b) {
       if (!a.hasOwnProperty(key) || !b.hasOwnProperty(key)) {