@things-factory/operato-wms 4.3.767 → 4.3.770

package/client/pages/inbound/unloaded-inventories-popup.js

@@ -29,6 +29,8 @@ class UnloadedInventoriesPopup extends connect(store)(localize(i18next)(LitEleme
           flex-direction: column;
           flex: 1;
           overflow-y: auto;
+          --grid-record-odd-background-color: var(--theme-white-color);
+          --data-list-background-color: var(--theme-white-color);
         }
         :host {
           padding: 10px;
@@ -36,6 +38,7 @@ class UnloadedInventoriesPopup extends connect(store)(localize(i18next)(LitEleme
           flex-direction: column;
           overflow-x: overlay;
           background-color: var(--main-section-background-color);
+          --data-list-label-text-transform: capitalize;
         }
       `
     ]

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

@@ -8,6 +8,7 @@ import { connect } from 'pwa-helpers/connect-mixin'
 
 import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
+import { CONDITION_OF_GOODS } from '../constants'
 import { client, PageView, store, gqlContext } from '@things-factory/shell'
 import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
@@ -147,6 +148,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
       { column: 'qty', name: 'Quantity' },
       { column: 'uom', name: 'Uom' },
       { column: 'uomValue', name: 'UomValue' },
+      { column: 'conditionOfGoods', name: 'Inventory Quality' },
       { column: 'expirationDate', name: 'Exp. Date' },
       { column: 'manufactureDate', name: 'Mfg. Date' },
       { column: 'unitCost', name: 'Unit Cost' },
@@ -198,10 +200,18 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
               if (compareData == null) {
                 this._compareColumn.map(item => {
                   if (record[item.column]) {
+                    let updateVal =
+                      typeof record[item.column] === 'object' ? record[item.column].name : record[item.column]
+
+                    // Translate conditionOfGoods value
+                    if (item.column === 'conditionOfGoods' && updateVal) {
+                      updateVal = this._getConditionOfGoodsLabel(updateVal)
+                    }
+
                     recordDiff.push({
                       column: item.name,
                       current: '[N/A]',
-                      update: typeof record[item.column] === 'object' ? record[item.column].name : record[item.column]
+                      update: updateVal
                     })
                   }
                 })
@@ -220,6 +230,16 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
                     updatedVal = record[item.column]?.name || record[item.column] || '[N/A]'
                   }
 
+                  // Translate conditionOfGoods values
+                  if (item.column === 'conditionOfGoods') {
+                    if (currentVal && currentVal !== '[N/A]') {
+                      currentVal = this._getConditionOfGoodsLabel(currentVal)
+                    }
+                    if (updatedVal && updatedVal !== '[N/A]') {
+                      updatedVal = this._getConditionOfGoodsLabel(updatedVal)
+                    }
+                  }
+
                   recordDiff.push({
                     column: item.name,
                     current: currentVal || '[N/A]',
@@ -446,6 +466,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
               unitCost
               adjustmentCode
               adjustmentNote
+              conditionOfGoods
               sku
               bizplace {
                 id
@@ -496,6 +517,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
                 unitCost
                 adjustmentCode
                 adjustmentNote
+                conditionOfGoods
               }
               lastInventoryHistory {
                 batchId
@@ -762,6 +784,11 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
   _getDateString(date) {
     return `${date.getDate()} ${date.toLocaleString('default', { month: 'short' })} ${date.getFullYear()}`
   }
+
+  _getConditionOfGoodsLabel(value) {
+    const condition = Object.values(CONDITION_OF_GOODS).find(c => c.value === value)
+    return condition ? i18next.t(`label.${condition.name}`) : value || ''
+  }
 }
 
 window.customElements.define('inventory-adjustment-approval', InventoryAdjustmentApproval)

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

@@ -22,6 +22,7 @@ import { fetchPageSettings } from '../../util/index'
 import {
   ADJUSTMENT_CODE,
   CARTON_LABEL_SETTING_KEY,
+  CONDITION_OF_GOODS,
   INVENTORY_ITEM_CHANGE_TYPE,
   PALLET_LABEL_SETTING_KEY
 } from '../constants'
@@ -85,7 +86,8 @@ const INVENTORY_PATCH_KEYS = new Set([
   'cuFlag',
   'transferQty',
   'transferUomValue',
-  'obsolete'
+  'obsolete',
+  'conditionOfGoods'
 ])
 
 const toCamelKey = key =>
@@ -649,6 +651,32 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           sortable: true,
           width: 120
         },
+        {
+          type: 'select',
+          name: 'conditionOfGoods',
+          header: i18next.t('field.inventory_quality'),
+          record: {
+            editable: true,
+            options: [
+              { display: '', value: '' },
+              ...Object.values(CONDITION_OF_GOODS).map(c => ({
+                display: i18next.t(`label.${c.name}`),
+                value: c.value
+              }))
+            ]
+          },
+          imex: {
+            header: i18next.t('field.inventory_quality'),
+            key: 'conditionOfGoods',
+            width: 20,
+            type: 'array',
+            arrData: Object.values(CONDITION_OF_GOODS).map(c => {
+              return { name: c.value }
+            })
+          },
+          sortable: true,
+          width: 120
+        },
         {
           type: 'boolean',
           name: 'obsolete',
@@ -849,6 +877,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
                   arrivalNoticeNo
                   adjustmentCode
                   adjustmentNote
+                  conditionOfGoods
                 }
                 total
               }
@@ -881,6 +910,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
                   adjustmentNote
                   serialNumbers
                   obsolete
+                  conditionOfGoods
                   refOrderId
                   arrivalNoticeRefNo
                   partnerDomain {
@@ -1220,6 +1250,9 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
         row.transferQty = toFloatOrUndefined(row.transferQty)
         row.transferUomValue = toFloatOrUndefined(row.transferUomValue)
 
+        if (row?.batchId) row.batchId = row.batchId.trim()
+        if (row?.batchIdRef) row.batchIdRef = row.batchIdRef.trim()
+
         if (row?.inventoryItemChanges) {
           row.inventoryItemChangesJson = row.inventoryItemChanges
           delete row.inventoryItemChanges
@@ -1423,9 +1456,9 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           <import-pop-up
             .records=${records}
             .config=${{
-              rows: this.config.rows,
-              columns: columns
-            }}
+            rows: this.config.rows,
+            columns: columns
+          }}
             .importHandler="${this.importHandler.bind(this)}"
             @field-change="${this.fieldChange.bind(this)}"
           ></import-pop-up>
@@ -1604,15 +1637,15 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           .title="${i18next.t('title.inventory_remark')}"
           .value="${record.remark}"
           @submit="${async e => {
-            await this.updateRemark(record.id, e.detail.value)
+          await this.updateRemark(record.id, e.detail.value)
 
-            this.dataGrist._data = {
-              records: this.dataGrist._data.records.map(updateRecord => {
-                if (updateRecord.id === record.id) updateRecord.remark = e.detail.value
-                return updateRecord
-              })
-            }
-          }}"
+          this.dataGrist._data = {
+            records: this.dataGrist._data.records.map(updateRecord => {
+              if (updateRecord.id === record.id) updateRecord.remark = e.detail.value
+              return updateRecord
+            })
+          }
+        }}"
         ></popup-note>
       `,
       {
@@ -1626,13 +1659,13 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
   openSerialNumberPopup(inventory, rowIndex, records) {
     const removable =
       inventory?.product?.isRequireSerialNumberScanningOutbound &&
-      inventory?.product?.isRequireSerialNumberScanningInbound
+        inventory?.product?.isRequireSerialNumberScanningInbound
         ? true
         : false
 
     const updatable =
       inventory?.product?.isRequireSerialNumberScanningOutbound &&
-      inventory?.product?.isRequireSerialNumberScanningInbound
+        inventory?.product?.isRequireSerialNumberScanningInbound
         ? true
         : false
 
@@ -1645,43 +1678,43 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           .enableRemove=${removable}
           .enableUpdateBtn=${updatable}
           @confirm-serial-number-list="${e => {
-            let totalSerialNumber = 0
-            let newRecords = []
-            for (let i = 0; i < e.detail.inventoryItemChanges.length; i++) {
-              let inventoryItemChange = e.detail.inventoryItemChanges[i]
-              newRecords.push(inventoryItemChange)
+          let totalSerialNumber = 0
+          let newRecords = []
+          for (let i = 0; i < e.detail.inventoryItemChanges.length; i++) {
+            let inventoryItemChange = e.detail.inventoryItemChanges[i]
+            newRecords.push(inventoryItemChange)
 
-              if (inventoryItemChange.type == INVENTORY_ITEM_CHANGE_TYPE.NEW.value) totalSerialNumber++
+            if (inventoryItemChange.type == INVENTORY_ITEM_CHANGE_TYPE.NEW.value) totalSerialNumber++
 
-              if (inventoryItemChange.type == INVENTORY_ITEM_CHANGE_TYPE.REMOVED.value) totalSerialNumber--
-            }
+            if (inventoryItemChange.type == INVENTORY_ITEM_CHANGE_TYPE.REMOVED.value) totalSerialNumber--
+          }
 
-            let inventoryItemChangesJson = JSON.stringify(newRecords)
-            let currentInventoryItemCount = records[rowIndex]?.inventoryItemCount || 0
+          let inventoryItemChangesJson = JSON.stringify(newRecords)
+          let currentInventoryItemCount = records[rowIndex]?.inventoryItemCount || 0
 
-            this.dataGrist.dirtyData.records[rowIndex].inventoryItemChanges = inventoryItemChangesJson
-            this.dataGrist.dirtyData.records[rowIndex].inventoryItemCount =
-              currentInventoryItemCount + totalSerialNumber
-            if (!this.dataGrist?.dirtyData?.records[rowIndex]?.__dirtyfields__) {
-              this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__ = {
-                inventoryItemChanges: { before: '', after: inventoryItemChangesJson }
-              }
-            } else {
-              this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__ = {
-                ...this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__,
-                inventoryItemChanges: {
-                  before: '',
-                  after: inventoryItemChangesJson
-                }
+          this.dataGrist.dirtyData.records[rowIndex].inventoryItemChanges = inventoryItemChangesJson
+          this.dataGrist.dirtyData.records[rowIndex].inventoryItemCount =
+            currentInventoryItemCount + totalSerialNumber
+          if (!this.dataGrist?.dirtyData?.records[rowIndex]?.__dirtyfields__) {
+            this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__ = {
+              inventoryItemChanges: { before: '', after: inventoryItemChangesJson }
+            }
+          } else {
+            this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__ = {
+              ...this.dataGrist.dirtyData.records[rowIndex].__dirtyfields__,
+              inventoryItemChanges: {
+                before: '',
+                after: inventoryItemChangesJson
               }
             }
-            this.dataGrist.dirtyData.records[rowIndex].__dirty__ = 'M'
+          }
+          this.dataGrist.dirtyData.records[rowIndex].__dirty__ = 'M'
 
-            if (records[rowIndex]) {
-              records[rowIndex].inventoryItemChanges = inventoryItemChangesJson
-              records[rowIndex].inventoryItemCount = currentInventoryItemCount + totalSerialNumber
-            }
-          }}"
+          if (records[rowIndex]) {
+            records[rowIndex].inventoryItemChanges = inventoryItemChangesJson
+            records[rowIndex].inventoryItemCount = currentInventoryItemCount + totalSerialNumber
+          }
+        }}"
         ></serial-number-list-popup>
       `,
       {

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

@@ -5,6 +5,7 @@ import './inventory-history-by-pallet'
 import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit-element'
 
+import { CONDITION_OF_GOODS } from '../constants'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
 import { client } from '@things-factory/shell'
@@ -148,6 +149,19 @@ class InventoryByProductDetail extends localize(i18next)(LitElement) {
           sortable: true,
           width: 200
         },
+        {
+          type: 'string',
+          name: 'conditionOfGoods',
+          header: i18next.t('field.inventory_quality'),
+          sortable: true,
+          width: 120,
+          record: {
+            renderer: (value, column, record, rowIndex, field) => {
+              const condition = Object.values(CONDITION_OF_GOODS).find(c => c.value === value)
+              return condition ? i18next.t(`label.${condition.name}`) : value || ''
+            }
+          }
+        },
         {
           type: 'number',
           name: 'lockedQty',
@@ -229,6 +243,7 @@ class InventoryByProductDetail extends localize(i18next)(LitElement) {
                   name
                   description
                 }
+                conditionOfGoods
                 uom
                 lockedQty
                 qty

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

@@ -9,6 +9,8 @@ import { client, PageView } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
 
+import { CONDITION_OF_GOODS } from '../constants/order'
+
 class InventoryHistory extends localize(i18next)(PageView) {
   static get styles() {
     return [
@@ -311,6 +313,19 @@ class InventoryHistory extends localize(i18next)(PageView) {
           sortable: true,
           width: 150
         },
+        {
+          type: 'string',
+          name: 'conditionOfGoods',
+          header: i18next.t('field.inventory_quality'),
+          sortable: true,
+          width: 150,
+          record: {
+            renderer: (value, column, record, rowIndex, field) => {
+              const condition = Object.values(CONDITION_OF_GOODS).find(c => c.value === value)
+              return condition ? i18next.t(`label.${condition.name}`) : value || ''
+            }
+          }
+        },
         {
           type: 'string',
           name: 'batchIdRef',
@@ -497,6 +512,7 @@ class InventoryHistory extends localize(i18next)(PageView) {
                   name
                   description
                 }
+                conditionOfGoods
                 status
                 transactionType
                 createdAt
@@ -591,6 +607,7 @@ class InventoryHistory extends localize(i18next)(PageView) {
                 zone
                 orderNo
                 refNo
+                conditionOfGoods
                 status
                 transactionType
                 bizplace
@@ -678,6 +695,7 @@ class InventoryHistory extends localize(i18next)(PageView) {
         { header: i18next.t('field.uom_value'), key: 'uomValue', width: 75, type: 'number' },
         { header: i18next.t('field.uom'), key: 'uom', width: 75, type: 'string' },
         { header: i18next.t('field.location'), key: 'location', width: 75, type: 'string' },
+        { header: i18next.t('field.inventory_quality'), key: 'conditionOfGoods', width: 75, type: 'string' },
         { header: i18next.t('field.batch_id'), key: 'batchId', width: 75, type: 'string' },
         { header: i18next.t('field.batch_no_ref'), key: 'batchIdRef', width: 75, type: 'string' },
         { header: i18next.t('field.order_no'), key: 'orderNo', width: 75, type: 'string' },

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

@@ -6,6 +6,7 @@ import { css, html } from 'lit-element'
 import { connect } from 'pwa-helpers/connect-mixin'
 
 import { getCodeByName } from '@things-factory/code-base'
+import { CONDITION_OF_GOODS } from '../constants'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, PageView, store } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
@@ -264,6 +265,18 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
           sortable: true,
           width: 80
         },
+        {
+          type: 'string',
+          name: 'conditionOfGoods',
+          header: i18next.t('field.inventory_quality'),
+          width: 120,
+          record: {
+            renderer: (value, column, record, rowIndex, field) => {
+              const condition = Object.values(CONDITION_OF_GOODS).find(c => c.value === value)
+              return condition ? i18next.t(`label.${condition.name}`) : value || ''
+            }
+          }
+        },
         {
           type: 'string',
           name: 'condition',
@@ -531,6 +544,7 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
               manufactureDate
               remark
               unitCost
+              conditionOfGoods
               adjustmentNote
               condition
             }