@things-factory/operato-wms 4.3.769 → 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 {

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
             }

package/client/pages/order/release-order/b2b/b2b-order-list.js

@@ -2,6 +2,7 @@ import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
 import '@things-factory/worksheet-ui'
 import '../batch-picking-popup'
+import '../packing-label-history-popup'
 import '../../../outbound/generate-worksheet-popup'
 import '../../../outbound/select-operator-popup'
 
@@ -58,6 +59,11 @@ class B2bOrderList extends localize(i18next)(PageView) {
     }
   }
 
+  constructor() {
+    super()
+    this._hasSelectionListener = false
+  }
+
   render() {
     return html`
       <search-form id="search-form" .fields=${this._searchFields} @submit=${e => this.dataGrist.fetch()}></search-form>
@@ -73,6 +79,32 @@ class B2bOrderList extends localize(i18next)(PageView) {
   get context() {
     var actions = []
 
+    actions.push({
+      title: i18next.t('title.packing_label_history'),
+      action: this._openPackingLabelHistory.bind(this),
+      icon: 'history',
+      emphasis: {
+        raised: false,
+        outlined: true,
+        dense: false,
+        danger: false
+      }
+    })
+
+    if (this._shouldShowButtonForSelection()) {
+      actions.push({
+        title: i18next.t('title.print_packing_label'),
+        action: this._openPrintPackingList.bind(this),
+        icon: 'print',
+        emphasis: {
+          raised: false,
+          outlined: true,
+          dense: false,
+          danger: false
+        }
+      })
+    }
+
     if (this.isUserBelongsDomain) {
       if (this._betaSetting) {
         actions.push({
@@ -96,6 +128,7 @@ class B2bOrderList extends localize(i18next)(PageView) {
         ...CommonButtonStyles.add
       })
     }
+
     return {
       title: i18next.t('title.release_orders'),
       actions,
@@ -501,6 +534,13 @@ class B2bOrderList extends localize(i18next)(PageView) {
         }
       ]
     }
+
+    await this.updateComplete
+    if (this.dataGrist && !this._hasSelectionListener) {
+      this.dataGrist.addEventListener('select-record-change', () => this.updateContext())
+      this.dataGrist.addEventListener('select-all-change', () => this.updateContext())
+      this._hasSelectionListener = true
+    }
   }
 
   get searchForm() {
@@ -588,6 +628,10 @@ class B2bOrderList extends localize(i18next)(PageView) {
                 id
                 name
               }
+              activeWorksheet {
+                type
+                status
+              }
             }
             total
           }
@@ -812,6 +856,61 @@ class B2bOrderList extends localize(i18next)(PageView) {
     return { header: headerSetting, data: data }
   }
 
+  _shouldShowButtonForSelection() {
+    if (!this.dataGrist) return false
+
+    const selected = this.dataGrist.selected || []
+    if (selected.length === 0) return false
+
+    const allowedWorksheetTypes = ['LOADING', 'PROCESSING', 'PARTIAL_PROCESSING']
+    const allowedWorksheetStatuses = ['EXECUTING', 'PARTIAL_EXECUTING']
+    
+    return selected.every(order => {
+      // Check if activeWorksheet exists
+      if (!order.activeWorksheet) return false
+      
+      // Check if activeWorksheet.type is one of the allowed types
+      if (!allowedWorksheetTypes.includes(order.activeWorksheet.type)) return false
+      
+      // Check if activeWorksheet.status is EXECUTING or PARTIAL_EXECUTING
+      return allowedWorksheetStatuses.includes(order.activeWorksheet.status)
+    })
+  }
+
+  _openPrintPackingList() {
+    try {
+      if (!this.dataGrist || !this.dataGrist.selected || this.dataGrist.selected.length === 0) {
+        throw new Error(i18next.t('text.please_select_one_or_more_order') || 'Please select one or more orders')
+      }
+
+      const selectedOrderNames = this.dataGrist.selected.map(order => order.name).filter(Boolean)
+      if (selectedOrderNames.length === 0) {
+        throw new Error(i18next.t('text.no_valid_orders_selected') || 'No valid orders selected')
+      }
+
+      const orderNoParam = selectedOrderNames.join(',')
+      navigate(`preview_print_packing_list?orderNo=${encodeURIComponent(orderNoParam)}`)
+    } catch (e) {
+      this._showToast({ type: 'error', message: e.message || i18next.t('text.failed_to_open_print_packing_label') })
+    }
+  }
+
+  _openPackingLabelHistory() {
+    try {
+      openPopup(
+        html` <packing-label-history-popup></packing-label-history-popup> `,
+        {
+          backdrop: true,
+          size: 'large',
+          title: i18next.t('title.packing_label_history'),
+          escapable: false
+        }
+      )
+    } catch (e) {
+      this._showToast({ type: 'error', message: e.message || i18next.t('text.failed_to_open_packing_label_history') })
+    }
+  }
+
   _showToast({ type, message }) {
     document.dispatchEvent(
       new CustomEvent('notify', {