@things-factory/operato-wms 5.0.13 → 6.0.0-alpha.1

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

@@ -94,8 +94,6 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
           'location',
           'remainQty',
           'expirationDate',
-          'nonLoadedQty',
-          'nonLoadedUomValue',
           'uomValue',
           'uom'
         ]
@@ -180,17 +178,11 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
           header: i18next.t('field.total_uom_value'),
           width: 110
         },
-        {
-          type: 'string',
-          name: 'uom',
-          header: i18next.t('field.uom'),
-          width: 80
-        },
         {
           type: 'number',
           name: 'nonLoadedQty',
           header: i18next.t('field.non_loaded_qty'),
-          width: 110
+          width: 80
         },
         {
           type: 'float',
@@ -198,6 +190,12 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
           header: i18next.t('field.non_loaded_uom_value'),
           width: 110
         },
+        {
+          type: 'string',
+          name: 'uom',
+          header: i18next.t('field.uom'),
+          width: 80
+        },
         {
           type: 'string',
           name: 'location_name',
@@ -407,8 +405,6 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
               packingType
               uom
               uomValue
-              nonLoadedQty
-              nonLoadedUomValue
               bizplace {
                 id
                 name
@@ -424,6 +420,8 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
               }
               qty
               remainQty
+              nonLoadedQty
+              nonLoadedUomValue
               warehouse {
                 id
                 name
@@ -526,9 +524,9 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
         { header: i18next.t('field.packing_type'), key: 'packingType', width: 20, type: 'string' },
         { 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.uom'), key: 'uom', width: 15, 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/serial-number-list-popup.js

@@ -63,7 +63,8 @@ class SerialNumberListPopup extends localize(i18next)(LitElement) {
       _currentSerialNumber: String,
       adjustmentType: String,
       enableRemove: Boolean,
-      enableUpdateBtn: Boolean
+      enableUpdateBtn: Boolean,
+      checkDuplicate: Boolean
     }
   }
 
@@ -85,6 +86,7 @@ class SerialNumberListPopup extends localize(i18next)(LitElement) {
     super()
     this.enableRemove = true
     this.enableUpdateBtn = true
+    this.checkDuplicate = false
   }
 
   render() {
@@ -212,9 +214,20 @@ class SerialNumberListPopup extends localize(i18next)(LitElement) {
                   }
                 } else {
                   this._selectedInventoryItem = record
-                  this.createInventoryItemChange(INVENTORY_ITEM_CHANGE_TYPE.REMOVED.value)
 
-                  this.data.total -= 1
+                  let dt = this.data
+                  dt.records[rowIndex].type =
+                    record.type == INVENTORY_ITEM_CHANGE_TYPE.REMOVED.value
+                      ? ''
+                      : INVENTORY_ITEM_CHANGE_TYPE.REMOVED.value
+
+                  this.data = { ...dt }
+
+                  this.checkDuplicate === false
+                    ? (this.data.total = dt.records.filter(
+                        x => x.type != INVENTORY_ITEM_CHANGE_TYPE.REMOVED.value
+                      ).length)
+                    : ''
                 }
 
                 this.clearView()
@@ -260,6 +273,7 @@ class SerialNumberListPopup extends localize(i18next)(LitElement) {
     this._selectedInventoryItem = null
     if (this.serialNumberInput) this.serialNumberInput.value = ''
     this._currentSerialNumber = ''
+    this._checkDuplicated = false
   }
 
   async fetchInventoryItems() {
@@ -312,9 +326,10 @@ class SerialNumberListPopup extends localize(i18next)(LitElement) {
 
         if (this.inventory?.inventoryItemChanges) {
           let existingInventoryItemChanges = JSON.parse(this.inventory.inventoryItemChanges)
+
           records.push(...existingInventoryItemChanges)
 
-          total += existingInventoryItemChanges.length
+          total = records.length
         }
 
         this.data = {
@@ -396,6 +411,20 @@ class SerialNumberListPopup extends localize(i18next)(LitElement) {
         }
       }
 
+      const duplicated = this.data.records.findIndex(
+        res =>
+          res.transactionType == 'CHANGES' &&
+          res.type == 'REMOVED' &&
+          res.serialNumber == inventoryItemChange.serialNumber
+      )
+
+      if (duplicated > 0) {
+        this.checkDuplicate = true
+        throw new Error(i18next.t('text.duplicated_romoval_on_same_sn'))
+      }
+
+      this.checkDuplicate = false
+
       if (type == INVENTORY_ITEM_CHANGE_TYPE.NEW.value) this.data.total += 1
       this.data = {
         ...this.data,
@@ -430,7 +459,9 @@ class SerialNumberListPopup extends localize(i18next)(LitElement) {
             detail: {
               inventoryItemChanges:
                 this.data.records.filter(
-                  itm => itm.transactionType == INVENTORY_ITEM_CHANGE_TRANSACTION_TYPE.CHANGES.value
+                  itm =>
+                    itm.transactionType == INVENTORY_ITEM_CHANGE_TRANSACTION_TYPE.CHANGES.value ||
+                    itm.type == INVENTORY_ITEM_CHANGE_TYPE.REMOVED.value
                 ) || []
             }
           })

package/client/pages/inventory-check/inspecting-product.js

@@ -1013,7 +1013,7 @@ class InspectingProduct extends connect(store)(localize(i18next)(PageView)) {
   async checkOrderInventory() {
     try {
       const filters = [
-        { name: 'inventory', operator: 'eq', value: this.selectedInventory.inventoryId },
+        { name: 'inventoryId', operator: 'eq', value: this.selectedInventory.inventoryId },
         { name: 'status', operator: 'noteq', value: ORDER_INVENTORY_STATUS.TERMINATED.value },
         { name: 'type', operator: 'eq', value: ORDER_TYPES.RELEASE_OF_GOODS.value }
       ]

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

@@ -6,9 +6,10 @@ import { css, html } from 'lit-element'
 
 import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
-import { client, navigate, PageView } from '@things-factory/shell'
+import { client, navigate, PageView, CustomAlert } from '@things-factory/shell'
 import { CommonButtonStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
+import { ORDER_STATUS } from '../constants'
 
 class CreateLoadingManifest extends localize(i18next)(PageView) {
   static get styles() {
@@ -180,6 +181,20 @@ class CreateLoadingManifest extends localize(i18next)(PageView) {
           label: true,
           header: i18next.t('field.transporter'),
           width: 200
+        },
+        {
+          type: 'string',
+          name: 'bizplaceName',
+          label: true,
+          header: i18next.t('field.company'),
+          width: 200
+        },
+        {
+          type: 'string',
+          name: 'status',
+          label: true,
+          header: i18next.t('field.status'),
+          width: 200
         }
       ]
     }
@@ -189,40 +204,50 @@ class CreateLoadingManifest extends localize(i18next)(PageView) {
     try {
       this._validateTrackingNo()
 
-      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({
         query: gql`
-          query releaseGoods($filters: [Filter!], $sortings: [Sorting!]) {
-            releaseGoods(filters: $filters, sortings: $sortings) {
-              items {
+          query releaseGood($trackingNo: String) {
+            releaseGood(trackingNo: $trackingNo) {
+              id
+              name
+              trackingNo
+              refNo
+              transporter
+              bizplace {
                 id
                 name
-                trackingNo
-                refNo
-                transporter
               }
+              status
             }
           }
         `,
-        variables: { filters, sortings: [] }
+        variables: { trackingNo: this.trackingNoInput.value.trim() }
       })
-
       if (!response.errors) {
-        const releaseGood = (response.data.releaseGoods.items || []).map(record => {
-          return {
-            ...record,
-            orderNo: record?.refNo
-          }
-        })[0]
+        const releaseGood = response.data.releaseGood
 
         if (releaseGood && !this.shippingData.records.map(record => record.refNo).includes(releaseGood.refNo)) {
           let manifestItems = this.shippingData.records || []
-          manifestItems.push({ ...releaseGood })
+
+          if (
+            releaseGood?.status === ORDER_STATUS.CANCELLED.value ||
+            releaseGood?.status === ORDER_STATUS.PENDING_CANCEL.value
+          ) {
+            let answer = await CustomAlert({
+              type: 'warning',
+              title: i18next.t('title.order(s)_is_at_pending_cancelled_or_cancelled'),
+              text: i18next.t('text.do_you_want_to_ignore'),
+              confirmButton: { text: i18next.t('button.ignore') },
+              cancelButton: { text: i18next.t('button.cancel') }
+            })
+
+            if (!answer?.value) {
+              this._clearTrackingNoInput()
+              return
+            }
+          }
+
+          manifestItems.push({ ...releaseGood, bizplaceName: releaseGood.bizplace.name, orderNo: releaseGood.refNo })
           this.shippingData = { records: manifestItems }
         } else {
           this._showToast({ message: i18next.t('text.tracking_no_already_exist_in_manifest_list') })

package/client/pages/manifest/dispatcher-verification-popup.js

@@ -54,17 +54,20 @@ class DispatcherVerificationPopup extends localize(i18next)(LitElement) {
   }
 
   _updateManifestDispatchement() {
-    this._validateDispatchmentUpdate()
-    let dispatchment = this._serializeForm(this.dispatchmentForm)
-    this.dispatchEvent(
-      new CustomEvent('dispatch', {
-        detail: {
-          dispatcherName: dispatchment.dispatcherName,
-          dispatcherIdentity: dispatchment.dispatcherIdentity
-        }
-      })
-    )
-    history.back()
+    if (this.dispatchmentForm.checkValidity()) {
+      let dispatchment = this._serializeForm(this.dispatchmentForm)
+      this.dispatchEvent(
+        new CustomEvent('dispatch', {
+          detail: {
+            dispatcherName: dispatchment.dispatcherName,
+            dispatcherIdentity: dispatchment.dispatcherIdentity
+          }
+        })
+      )
+      history.back()
+    } else {
+      this._showToast({ message: i18next.t('text.form_has_invalid_input') })
+    }
   }
 
   _serializeForm(form) {
@@ -78,8 +81,16 @@ class DispatcherVerificationPopup extends localize(i18next)(LitElement) {
     return obj
   }
 
-  _validateDispatchmentUpdate() {
-    this.dispatchmentForm.checkValidity()
+  _showToast({ type, message }) {
+    document.dispatchEvent(
+      new CustomEvent('notify', {
+        detail: {
+          type,
+          message,
+          option: { timer: 1000 }
+        }
+      })
+    )
   }
 }