@things-factory/operato-wms 5.0.0-alpha.50 → 5.0.0-alpha.53

package/client/constants/index.js

@@ -0,0 +1 @@
+export * from './order'

package/client/constants/order.js

@@ -0,0 +1,14 @@
+export const DRAFT_RELEASE_ORDER_STATUS = {
+  DRAFT: 'DRAFT',
+  INSUFFICIENT: 'INSUFFICIENT',
+  SUBMITTED: 'SUBMITTED',
+  CANCELLED: 'CANCELLED'
+}
+
+/**
+ * To identify Product Type Single or Bundle
+ */
+export const PRODUCT_GROUP_TYPES = {
+  SINGLE: 'SINGLE',
+  BUNDLE: 'BUNDLE'
+}

package/client/pages/constants/index.js

@@ -16,3 +16,4 @@ export * from './worksheet'
 export * from './pallet'
 export * from './platform'
 export * from './group-type'
+export * from './tote'

package/client/pages/constants/setting.js

@@ -6,3 +6,4 @@ export const PRODUCT_LABEL_SETTING_KEY = 'product-label'
 export const REUSABLE_PALLET_LABEL_SETTING_KEY = 'reusable-pallet-label'
 export const INTENALIZED_AWB_SETTING_KEY = 'internalized-awb-label'
 export const ROUTE_LABEL_SETTING_KEY = 'route-label'
+export const TOTE_LABEL_SETTING_KEY = 'tote-label'

package/client/pages/constants/tote.js

@@ -0,0 +1,14 @@
+export const TOTE_STATUS = {
+  ACTIVE: {
+    name: 'active',
+    value: 'ACTIVE'
+  },
+  DISPATCHED: {
+    name: 'dispatched',
+    value: 'DISPATCHED'
+  },
+  DAMAGED: {
+    name: 'damaged',
+    value: 'DAMAGED'
+  }
+}

package/client/pages/inbound/pallet-label-popup.js

@@ -154,6 +154,9 @@ class PalletLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
               packingType
               palletId
               remark
+              orderProductRemark
+              purchaseOrderNo
+              arrivalNoticeRefNo
             }
           }
         `,
@@ -188,6 +191,9 @@ class PalletLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
           searchParams.append('remark', results[i].remark)
           searchParams.append('batchRef', results[i].batchIdRef)
           searchParams.append('expirationDate', '')
+          searchParams.append('orderProductRemark', results[i].orderProductRemark)
+          searchParams.append('purchaseOrderNo', results[i].purchaseOrderNo)
+          searchParams.append('refNo', results[i].arrivalNoticeRefNo)
           try {
             const response = await fetch(`label-command/${labelId}?${searchParams.toString()}`, {
               method: 'GET'

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

@@ -9,6 +9,7 @@ import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
 import { connect } from 'pwa-helpers/connect-mixin.js'
 
+import { sleep } from '@operato/utils'
 import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
@@ -1251,7 +1252,8 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
     )
   }
 
-  _openUndoPopup() {
+  async _openUndoPopup() {
+    await sleep(1010)
     openPopup(
       html`
         <undo-putaway-popup

package/client/pages/inbound/unload-product.js

@@ -19,7 +19,7 @@ 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 } from '@things-factory/styles'
-import { isMobileDevice } from '@things-factory/utils'
+import { isMobileDevice, sleep } from '@things-factory/utils'
 
 import { fetchSettingRule } from '../../fetch-setting-value'
 import { ARRIVAL_NOTICE, RETURN_ORDER, VAS_TYPE } from '../constants'
@@ -1210,7 +1210,8 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  _openIssueNote() {
+  async _openIssueNote() {
+    await sleep(1010)
     openPopup(
       html`
         <popup-note
@@ -1411,7 +1412,8 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  _openUndoUnloadPopup() {
+  async _openUndoUnloadPopup() {
+    await sleep(1010)
     openPopup(
       html`
         <undo-unload-popup
@@ -1447,7 +1449,9 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       }
     )
   }
-  _reusablePalletMode() {
+
+  async _reusablePalletMode() {
+    await sleep(1010)
     openPopup(
       html`
         <popup-reusable-pallet
@@ -1470,7 +1474,8 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     )
   }
 
-  _openSerialNumberList() {
+  async _openSerialNumberList() {
+    await sleep(1010)
     openPopup(
       html`
         <serial-number-list-popup
@@ -1538,7 +1543,8 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     })
   }
 
-  _openVasPopup() {
+  async _openVasPopup() {
+    await sleep(1010)
     openPopup(
       html`
         <palletizing-pallet-popup

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

@@ -8,7 +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 { client, PageView, store } from '@things-factory/shell'
+import { client, PageView, store,gqlContext } from '@things-factory/shell'
 import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
 import { openPopup } from '@things-factory/layout-base'
@@ -141,7 +141,9 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
       { column: 'expirationDate', name: 'Exp. Date' },
       { column: 'manufactureDate', name: 'Mfg. Date' },
       { column: 'unitCost', name: 'Unit Cost' },
-      { column: 'inventoryItemChange', name: 'Inventory Item Changes' }
+      { column: 'inventoryItemChange', name: 'Inventory Item Changes' },
+      { column: 'status', name: 'Status' },
+
     ]
 
     this.config = {
@@ -194,7 +196,17 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
               } else {
                 this._compareColumn.map(item => {
                   let currentVal = compareData[item.column]?.name || compareData[item.column] || '[N/A]'
-                  let updatedVal = record[item.column]?.name || record[item.column] || '[N/A]'
+                  let updatedVal
+
+                  if (item.column == 'status' && record.transactionType == 'MISSING') {
+                    updatedVal = record.transactionType || '[N/A]'
+                  }else if(item.column == 'status'){
+                    updatedVal = '[N/A]'
+                  }
+
+                  if (item.column !== 'status') {
+                    updatedVal = record[item.column]?.name || record[item.column] || '[N/A]'
+                  }
 
                   recordDiff.push({
                     column: item.name,
@@ -404,6 +416,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
                 batchIdRef
                 packingType
                 packingSize
+                status
                 bizplace {
                   id
                   name
@@ -432,6 +445,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
                 packingType
                 packingSize
                 batchIdRef
+                status
                 bizplace {
                   id
                   name
@@ -548,8 +562,8 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
     if (patches && patches.length) {
       const response = await client.mutate({
         mutation: gql`
-          mutation approveInventoryChanges($patches: [InventoryChangePatch!]!) {
-            approveInventoryChanges(patches: $patches) {
+          mutation warehouseInventoryAdjustment($patches: [InventoryChangePatch!]!) {
+            warehouseInventoryAdjustment(patches: $patches) {
               items {
                 id
               }
@@ -557,13 +571,14 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
             }
           }
         `,
-        variables: { patches }
+        variables: { patches },
+        context: gqlContext()
       })
       if (!response.errors) {
-        this._lockedPallet = response.data.approveInventoryChanges.items
+        this._lockedPallet = response.data.warehouseInventoryAdjustment.items
         this._showToast({
           message:
-            response.data.approveInventoryChanges.total > 0
+            response.data.warehouseInventoryAdjustment.total > 0
               ? 'Highlighted pallet could not be approved due to ongoing process.'
               : i18next.t('text.data_approved'),
           option: 7000
@@ -677,4 +692,4 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
   }
 }
 
-window.customElements.define('inventory-adjustment-approval', InventoryAdjustmentApproval)
+window.customElements.define('inventory-adjustment-approval', InventoryAdjustmentApproval)

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

@@ -13,7 +13,7 @@ import { DirectPrinter } from '@things-factory/barcode-base'
 import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
-import { client, PageView, store } from '@things-factory/shell'
+import { client, CustomAlert, PageView, store } from '@things-factory/shell'
 import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
 
@@ -75,6 +75,11 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           action: this.printCartonLabel.bind(this),
           ...CommonButtonStyles.label
         },
+        {
+          title: i18next.t('button.missing_stock'),
+          action: this.missingStock.bind(this),
+          ...CommonButtonStyles.save
+        },
         {
           title: i18next.t('button.save'),
           action: this.saveInventories.bind(this),
@@ -577,6 +582,9 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
               expirationDate
               unitCost
               inventoryItemCount
+              purchaseOrderNo
+              orderProductRemark
+              arrivalNoticeRefNo
             }
             total
           }
@@ -704,15 +712,17 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     const record = event.detail
     const columnName = event.detail.column.name
 
-    if (columnName === 'bizplace' && record.before?.bizplace?.id != record.after?.bizplace?.id) {
+    if (
+      columnName === 'bizplace' &&
+      record.before?.bizplace?.id != record.after?.bizplace?.id &&
+      this.dataGrist._data.records[record.row].lockedQty <= 0
+    ) {
       delete this.dataGrist._data.records[event.detail.row].product
       delete this.dataGrist._data.records[event.detail.row].sku
       delete this.dataGrist._data.records[event.detail.row].brand
       delete this.dataGrist._data.records[event.detail.row].packingType
       delete this.dataGrist._data.records[event.detail.row].packingSize
       delete this.dataGrist._data.records[event.detail.row].uom
-      delete this.dataGrist._data.records[event.detail.row].qty
-      delete this.dataGrist._data.records[event.detail.row].uomValue
     }
   }
 
@@ -721,13 +731,26 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
 
     let item = e.target.localName == 'import-pop-up' ? popUpDataGrist : this.dataGrist
 
+    if (
+      item._data.records[e.detail.row].lockedQty > 0 &&
+      (e.detail.column.name == 'batchId' || e.detail.column.name == 'product' || e.detail.column.name == 'bizplace')
+    ) {
+      this._showToast({ level: 'error', message: i18next.t('text.there_is_release_qty_no_amendment_is_allowed') })
+      item._data.records[e.detail.row][e.detail.column.name] = e.detail.before
+      return
+    }
+
     switch (e.detail.column.name) {
       case 'uomValue':
-        if (e.detail.after < 0) item._data.records[e.detail.row].uomValue = 0
+        if (e.detail.after < 0 || e.detail.after.toString() == NaN.toString()) {
+          item._data.records[e.detail.row].uomValue = 0
+          this._showToast({ level: 'error', message: i18next.t('text.invalid_uom_value') })
+        }
         break
       case 'qty':
-        if (e.detail.after < 0 || !Number.isInteger(e.detail.after))
-          item._data.records[e.detail.row].qty = e.detail.before
+        if (e.detail.after < 0 || !Number.isInteger(e.detail.after)) {
+          this._showToast({ level: 'error', message: i18next.t('text.invalid_qty') })
+        }
         break
       case 'unitCost':
         if (e.detail.after < 0) item._data.records[e.detail.row].unitCost = e.detail.before
@@ -746,6 +769,21 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
 
         item._data.records[e.detail.row].sku = e.detail.after?.sku ? e.detail.after.sku : ''
         break
+      case 'bizplace':
+        item._data.records[e.detail.row].uom = ''
+
+        item._data.records[e.detail.row].packingType = ''
+
+        item._data.records[e.detail.row].packingSize = 1
+
+        item._data.records[e.detail.row].brand = ''
+
+        item._data.records[e.detail.row].sku = ''
+
+        item._data.records[e.detail.row].qty = e.detail.record.qty
+
+        item._data.records[e.detail.row].uomValue = e.detail.record.uomValue
+        break
       default:
         break
     }
@@ -761,6 +799,46 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
+  async missingStock() {
+    const selectOrderInventory = this.dataGrist.selected
+
+    const patchesArr = [...selectOrderInventory]
+
+    const patches = patchesArr.map(p => {
+      return {
+        palletId: p.palletId,
+        transactionType: 'MISSING'
+      }
+    })
+
+    const result = await CustomAlert({
+      title: i18next.t('title.are_you_sure'),
+      text: i18next.t('text.do_you_want_to_mark_it_as_missing'),
+      confirmButton: { text: i18next.t('button.confirm') },
+      cancelButton: { text: i18next.t('button.cancel') }
+    })
+
+    if (result.isConfirmed) {
+      try {
+        const response = await client.mutate({
+          mutation: gql`
+            mutation submitInventoryChanges($patches: [InventoryPatch!]!) {
+              submitInventoryChanges(patches: $patches)
+            }
+          `,
+          variables: { patches }
+        })
+
+        if (!response.error) {
+          this._showToast({ message: i18next.t('text.data_inventory_adjustment_has_been_submitted_for_approval') })
+          this.updateContext()
+        }
+      } catch (error) {
+        throw new Error(error)
+      }
+    }
+  }
+
   async saveInventories() {
     try {
       var patches = this.dataGrist.exportPatchList({ flagName: 'cuFlag' })
@@ -772,6 +850,13 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
             throw new Error(i18next.t('text.empty_value_in_list'))
           }
         }
+
+        if (row.cuFlag == 'M' && row.bizplace) {
+          if (!row.product) {
+            throw new Error(i18next.t('text.empty_value_in_list'))
+          }
+        }
+
         if (row.bizplace) {
           row.bizplace = { id: row.bizplace.id }
         }
@@ -793,18 +878,34 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
       })
 
       if (patches && patches.length) {
-        const response = await client.mutate({
-          mutation: gql`
-            mutation submitInventoryChanges($patches: [InventoryPatch!]!) {
-              submitInventoryChanges(patches: $patches)
+        const validateInventoryChanges = await client.query({
+          query: gql`
+            query validateOrderInventory($patches: [InventoryPatch!]!) {
+              validateOrderInventory(patches: $patches)
             }
           `,
           variables: { patches }
         })
 
-        if (!response.errors) {
-          this.dataGrist.fetch()
-          this._showToast({ message: i18next.t('text.data_submitted_for_approval') })
+        if (validateInventoryChanges.data.validateOrderInventory) {
+          const response = await client.mutate({
+            mutation: gql`
+              mutation submitInventoryChanges($patches: [InventoryPatch!]!) {
+                submitInventoryChanges(patches: $patches)
+              }
+            `,
+            variables: { patches }
+          })
+
+          if (!response.errors) {
+            this.dataGrist.fetch()
+            this._showToast({ message: i18next.t('text.data_inventory_adjustment_has_been_submitted_for_approval') })
+          }
+        } else {
+          this._showToast({
+            type: 'error',
+            message: `${i18next.t('text.complete_the_picking_process_before_adjust_the_batch_number')}`
+          })
         }
       }
     } catch (e) {
@@ -893,7 +994,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
       if (!response.errors) {
         history.back()
         this.dataGrist.fetch()
-        this._showToast({ message: i18next.t('text.data_submitted_for_approval') })
+        this._showToast({ message: i18next.t('text.data_inventory_adjustment_has_been_submitted_for_approval') })
       }
     } catch (e) {
       this._showToast(e)
@@ -1226,6 +1327,9 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
         searchParams.append('remark', record.remark)
         searchParams.append('batchRef', record.batchIdRef)
         searchParams.append('expirationDate', record.expirationDate)
+        searchParams.append('purchaseOrderNo', record.purchaseOrderNo)
+        searchParams.append('orderProductRemark', record.orderProductRemark)
+        searchParams.append('refNo', record.arrivalNoticeRefNo)
 
         try {
           const response = await fetch(`label-command/${labelId}?${searchParams.toString()}`, {
@@ -1327,10 +1431,11 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  _showToast({ type, message }) {
+  _showToast({ level, type, message }) {
     document.dispatchEvent(
       new CustomEvent('notify', {
         detail: {
+          level,
           type,
           message
         }

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

@@ -237,7 +237,7 @@ class InventoryByProductDetail extends localize(i18next)(LitElement) {
           filters: [
             ...filters,
             { name: 'product_id', operator: 'eq', value: this.productId },
-            { name: 'status', operator: 'in', value: ['STORED', 'TERMINATED'] }
+            { name: 'status', operator: 'in', value: ['STORED', 'TERMINATED','MISSING'] }
           ],
           pagination: { page, limit },
           sortings: sorters

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

@@ -94,6 +94,8 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
           'location',
           'remainQty',
           'expirationDate',
+          'nonLoadedQty',
+          'nonLoadedUomValue',
           'uomValue',
           'uom'
         ]
@@ -184,6 +186,18 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
           header: i18next.t('field.uom'),
           width: 80
         },
+        {
+          type: 'number',
+          name: 'nonLoadedQty',
+          header: i18next.t('field.non_loaded_qty'),
+          width: 110
+        },
+        {
+          type: 'float',
+          name: 'nonLoadedUomValue',
+          header: i18next.t('field.non_loaded_uom_value'),
+          width: 110
+        },
         {
           type: 'string',
           name: 'location_name',
@@ -197,6 +211,14 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
           header: i18next.t('field.exp_date'),
           width: 150
         },
+        {
+          type: 'date',
+          name: 'manufactureDate',
+          header: i18next.t('field.manufacture_date'),
+          imex: { header: i18next.t('field.manufacture_date'), key: 'manufactureDate', width: 40, type: 'date' },
+          sortable: true,
+          width: 120
+        },
         {
           type: 'string',
           name: 'batchIdRef',
@@ -385,6 +407,8 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
               packingType
               uom
               uomValue
+              nonLoadedQty
+              nonLoadedUomValue
               bizplace {
                 id
                 name
@@ -417,6 +441,7 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
               }
               initialInboundAt
               expirationDate
+              manufactureDate
               remark
               unitCost
             }
@@ -502,6 +527,8 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
         { header: i18next.t('field.qty'), key: 'remainQty', width: 15, type: 'string' },
         { header: i18next.t('field.total_uom_value'), key: 'uomValue', width: 25, type: 'string' },
         { header: i18next.t('field.uom'), key: 'uom', width: 15, type: 'string' },
+        { header: i18next.t('field.non_loaded_qty'), key: 'nonLoadedQty', width: 25, type: 'string' },
+        { header: i18next.t('field.non_loaded_uom_value'), key: 'nonLoadedUomValue', width: 25, type: 'string' },
         { header: i18next.t('field.location'), key: 'location_name', width: 25, type: 'string' },
         { header: i18next.t('field.remark'), key: 'remark', width: 40, type: 'string' },
         { header: i18next.t('field.exp_date'), key: 'expirationDate', width: 30, type: 'date' },

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

@@ -619,6 +619,7 @@ class CreateCycleCount extends localize(i18next)(PageView) {
       return {
         batchId: record?.inventory?.batchId,
         packingType: record?.inventory?.packingType,
+        packingSize: record?.inventory?.packingSize,
         productId: record?.inventory?.productId,
         groupType: record?.inventory?.groupType
       }

package/client/pages/manifest/create-loading-manifest.js

@@ -192,6 +192,7 @@ class CreateLoadingManifest extends localize(i18next)(PageView) {
       const filters = [
         { name: 'trackingNo', operator: 'eq', value: this.trackingNoInput.value.trim() },
         { name: 'manifest_id', operator: 'is_null', value: '' },
+        { name: 'releaseGoodOnly', operator: '', value: '' },
         { name: 'status', operator: 'in', value: ['PACKING', 'DONE'] }
       ]
       const response = await client.query({

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

@@ -653,7 +653,7 @@ class ProductList extends localize(i18next)(PageView) {
 
     const response = await client.query({
       query: gql`
-        query productsByBizplace($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+        query productsByBizplace($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
           productsByBizplace(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               sku