@things-factory/operato-wms 5.0.0-alpha.9 → 5.0.0-y.0

package/.eslintrc.json

@@ -0,0 +1,11 @@
+{
+  "plugins": ["cypress"],
+  "rules": {
+    "cypress/no-assigning-return-values": "error",
+    "cypress/no-unnecessary-waiting": "error",
+    "cypress/assertion-before-screenshot": "warn",
+    "cypress/no-force": "warn",
+    "cypress/no-async-tests": "error",
+    "cypress/no-pause": "error"
+  }
+}

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

@@ -1,6 +1,7 @@
 export * from './cargo'
 export * from './claim'
 export * from './inventory'
+export * from './inventory-item-change'
 export * from './location'
 export * from './location-sorting-rule'
 export * from './marketplace'
@@ -15,3 +16,4 @@ export * from './worksheet'
 export * from './pallet'
 export * from './platform'
 export * from './group-type'
+export * from './tote'

package/client/pages/constants/inventory-item-change.js

@@ -0,0 +1,10 @@
+export const INVENTORY_ITEM_CHANGE_TYPE = {
+  NEW: { name: 'new', value: 'NEW' },
+  MODIFIED: { name: 'modified', value: 'MODIFIED' },
+  REMOVED: { name: 'removed', value: 'REMOVED' }
+}
+
+export const INVENTORY_ITEM_CHANGE_TRANSACTION_TYPE = {
+  ORIGINAL: { name: 'original', value: 'ORIGINAL' },
+  CHANGES: { name: 'changes', value: 'CHANGES' }
+}

package/client/pages/constants/order.js

@@ -24,6 +24,11 @@ export const ORDER_TYPES = {
   REVERSE_KITTING_ORDER
 }
 
+export const ORDER_SOURCES = {
+  PICKING: { name: 'picking', value: 'picking' },
+  PACKING: { name: 'packing', value: 'packing' }
+}
+
 export const RO_TYPES = {
   B2B: { name: 'B2B', value: 'b2b' },
   B2C: { name: 'B2C', value: 'b2c' }

package/client/pages/constants/picking-strategy.js

@@ -9,6 +9,10 @@ export const PICKING_STRATEGY = [
     name: i18next.t('label.fefo'),
     value: 'FEFO'
   },
+  {
+    name: i18next.t('label.fmfo'),
+    value: 'FMFO'
+  },
   {
     name: i18next.t('label.lifo'),
     value: 'LIFO'

package/client/pages/constants/setting.js

@@ -5,3 +5,5 @@ export const PALLET_LABEL_SETTING_KEY = 'pallet-label'
 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/inbound-worksheet.js

@@ -195,7 +195,7 @@ class InboundWorksheet extends localize(i18next)(PageView) {
         ]
       },
       rows: { appendable: false, selectable: { multiple: true } },
-      pagination: { limit: 100, pages: [20, 50, 100, 200, 500] },
+      pagination: { limit: 100, pages: [100, 200, 500] },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
         { type: 'gutter', gutterName: 'row-selector', multiple: true },

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/serial-number-list-popup.js

@@ -135,7 +135,6 @@ class SerialNumberListPopup extends localize(i18next)(LitElement) {
 
       <div class="button-container">
         <mwc-button
-          class="mobile-full-width"
           danger
           @click=${() => {
             this.dispatchEvent(new CustomEvent('close-serial-number-list', {}))

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'
@@ -372,7 +372,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
                   this.productBarcodeInput.readOnly = false
                   this.productBarcodeInput.value = ''
                 }
-                if (this.serialNumberInput) {
+                if (record.product?.isRequireSerialNumberScanningInbound) {
                   this.serialNumberInput.value = ''
                 }
                 this.cartonInput.value = ''
@@ -1090,10 +1090,14 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
         if (this._selectedOrderProduct && this._selectedOrderProduct.product.sku !== product.sku)
           this._selectedOrderProduct = null
 
-        if (foundOrderProducts?.length > 1 && !this._selectedOrderProduct) {
-          this.selectOrderProduct(foundOrderProducts)
-        } else {
-          this._selectedOrderProduct = foundParentProducts[0]
+        if (!this._selectedOrderProduct) {
+          if (foundOrderProducts?.length > 1) {
+            this.selectOrderProduct(foundOrderProducts)
+          } else if (foundOrderProducts?.length == 1) {
+            this._selectedOrderProduct = foundOrderProducts[0]
+          } else if (foundOrderProducts?.length == 0 && foundParentProducts?.length > 0) {
+            this._selectedOrderProduct = foundParentProducts[0]
+          }
         }
       }
     } catch (e) {
@@ -1206,7 +1210,8 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  _openIssueNote() {
+  async _openIssueNote() {
+    await sleep(1010)
     openPopup(
       html`
         <popup-note
@@ -1407,7 +1412,8 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  _openUndoUnloadPopup() {
+  async _openUndoUnloadPopup() {
+    await sleep(1010)
     openPopup(
       html`
         <undo-unload-popup
@@ -1443,7 +1449,9 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       }
     )
   }
-  _reusablePalletMode() {
+
+  async _reusablePalletMode() {
+    await sleep(1010)
     openPopup(
       html`
         <popup-reusable-pallet
@@ -1466,7 +1474,8 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     )
   }
 
-  _openSerialNumberList() {
+  async _openSerialNumberList() {
+    await sleep(1010)
     openPopup(
       html`
         <serial-number-list-popup
@@ -1534,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

@@ -1,5 +1,6 @@
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
+import '../inventory/serial-number-list-popup'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
@@ -7,9 +8,10 @@ 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'
 
 class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
@@ -62,7 +64,8 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
       config: Object,
       data: Object,
       _detailData: Object,
-      _compareColumn: Array
+      _compareColumn: Array,
+      _selectedInventoryChange: Object
     }
   }
 
@@ -119,6 +122,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
   }
 
   async pageInitialized() {
+    this._selectedInventoryChange = null
     this._lockedPallet = []
     const partners = await this._fetchPartners()
     const _approvalStatus = await getCodeByName('APPROVAL_STATUS')
@@ -136,7 +140,10 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
       { column: 'uomValue', name: 'UomValue' },
       { column: 'expirationDate', name: 'Exp. Date' },
       { column: 'manufactureDate', name: 'Mfg. Date' },
-      { column: 'unitCost', name: 'Unit Cost' }
+      { column: 'unitCost', name: 'Unit Cost' },
+      { column: 'inventoryItemChange', name: 'Inventory Item Changes' },
+      { column: 'status', name: 'Status' },
+
     ]
 
     this.config = {
@@ -153,6 +160,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
         handlers: {
           click: (columns, data, column, record, rowIndex) => {
             if (record) {
+              this._selectedInventoryChange = record
               let recordDiff = []
               let compareData = []
 
@@ -188,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,
@@ -272,7 +290,13 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
       pagination: { infinite: true },
       list: { fields: ['column', 'current', 'update'] },
       rows: {
-        appendable: false
+        appendable: false,
+        handlers: {
+          click: (columns, data, column, record, rowIndex) => {
+            if (record.column == 'Inventory Item Changes')
+              this._openSerialNumberPopup(this._selectedInventoryChange, rowIndex)
+          }
+        }
       },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
@@ -392,6 +416,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
                 batchIdRef
                 packingType
                 packingSize
+                status
                 bizplace {
                   id
                   name
@@ -420,6 +445,7 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
                 packingType
                 packingSize
                 batchIdRef
+                status
                 bizplace {
                   id
                   name
@@ -536,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
               }
@@ -545,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
@@ -629,6 +656,25 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
     }
   }
 
+  _openSerialNumberPopup(inventory, rowIndex) {
+    openPopup(
+      html`
+        <serial-number-list-popup
+          .title="${i18next.t('title.serial_number_list')}"
+          .inventory=${inventory}
+          .adjustmentType=${'APPROVAL'}
+          .enableRemove=${false}
+          .enableUpdateBtn=${false}
+        ></serial-number-list-popup>
+      `,
+      {
+        backdrop: false,
+        size: 'large',
+        title: i18next.t('title.serial_number_list')
+      }
+    )
+  }
+
   _showToast({ type, message, option }) {
     document.dispatchEvent(
       new CustomEvent('notify', {
@@ -646,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)