@things-factory/operato-wms 3.7.15 → 3.8.3

package/client/pages/order/return-order/return-order-detail.js

@@ -227,11 +227,12 @@ class ReturnOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     ]
     if (this._status === ORDER_STATUS.PENDING.value) {
       actions.push(
-        {
-          title: i18next.t('button.delete'),
-          action: this._deleteReturnOrder.bind(this),
-          ...CommonButtonStyles.delete
-        },
+        // Issue with deletion, temporarily disable this feature
+        // {
+        //   title: i18next.t('button.delete'),
+        //   action: this._deleteReturnOrder.bind(this),
+        //   ...CommonButtonStyles.delete
+        // },
         {
           title: i18next.t('button.confirm'),
           action: this._confirmReturnOrder.bind(this),

package/client/pages/order/transport-order/delivery-order-list.js

@@ -432,7 +432,7 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
       return {
         id: item.id,
         ...this._columns
-          .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+          .filter(column => column.type !== 'gutter' && column.imex !== undefined)
           .reduce((record, column) => {
             record[column.imex.key] = column.imex.key
               .split('.')
@@ -440,6 +440,9 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
             if (column.type === 'datetime') {
               record[column.imex.key] = new Date(parseInt(record[column.imex.key])).toLocaleString()
             }
+            if (record[column.imex.key] === 'Invalid Date') {
+              record[column.imex.key] = ''
+            }
             return record
           }, {})
       }

package/client/pages/outbound/inventory-assign-popup.js

@@ -264,7 +264,7 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
           $packingSize: Float!
           $uom: String!
           $pickingStrategy: String!
-          $locationSortingRules: [Sorting]
+          $locationSortingRules: [Sorting!]!
         ) {
           inventoriesByStrategy(
             worksheetId: $worksheetId

package/client/pages/outbound/merged-outbound-worksheet.js

@@ -229,7 +229,7 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'createdAt',
           header: i18next.t('field.created_at'),
-          imex: { header: i18next.t('field.created_at'), key: 'createdAt', width: 30, type: 'datetime' },
+          imex: { header: i18next.t('field.created_at'), key: 'createdAt', width: 30, type: 'string' },
           sortable: true,
           width: 160
         },
@@ -237,7 +237,7 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'startedAt',
           header: i18next.t('field.started_at'),
-          imex: { header: i18next.t('field.started_at'), key: 'startedAt', width: 30, type: 'datetime' },
+          imex: { header: i18next.t('field.started_at'), key: 'startedAt', width: 30, type: 'string' },
           sortable: true,
           width: 160
         },
@@ -245,7 +245,7 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'endedAt',
           header: i18next.t('field.ended_at'),
-          imex: { header: i18next.t('field.ended_at'), key: 'endedAt', width: 30, type: 'datetime' },
+          imex: { header: i18next.t('field.ended_at'), key: 'endedAt', width: 30, type: 'string' },
           sortable: true,
           width: 160
         },
@@ -413,7 +413,7 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
     }
 
     var headerSetting = this.dataGrist._config.columns
-      .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+      .filter(column => column.type !== 'gutter' && column.imex !== undefined)
       .map(column => {
         return column.imex
       })
@@ -422,7 +422,7 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
       return {
         id: item.id,
         ...this._columns
-          .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+          .filter(column => column.type !== 'gutter' && column.imex !== undefined)
           .reduce((record, column) => {
             record[column.imex.key] = column.imex.key
               .split('.')
@@ -430,10 +430,14 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
             if (column.type === 'datetime') {
               record[column.imex.key] = new Date(parseInt(record[column.imex.key])).toLocaleString()
             }
+            if (record[column.imex.key] === 'Invalid Date') {
+              record[column.imex.key] = ''
+            }
             return record
           }, {})
       }
     })
+
     return { header: headerSetting, data: data }
   }
 }

package/client/pages/outbound/picking-product.js

@@ -352,10 +352,18 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
               if (e.keyCode === 13) {
                 e.preventDefault()
                 this._currentBinLocation = null
-                if (this.releaseGoodNoInput.value) {
-                  this.releaseGoodNo = this.releaseGoodNoInput.value
-                  await this.fetchAll(this.releaseGoodNo)
-                  this.completeHandler()
+                if (this.refPickingType === PICKING_TYPES.PICKING.value) {
+                  if (this.releaseGoodNoInput.value) {
+                    this.releaseGoodNo = this.releaseGoodNoInput.value
+                    await this.fetchAll(this.releaseGoodNo)
+                    this.completeHandler()
+                  }
+                } else {
+                  if (this.taskNoInput.value) {
+                    this.taskNo = this.taskNoInput.value
+                    await this.fetchAll(this.taskNo)
+                    this.completeHandler()
+                  }
                 }
               }
             }}"
@@ -571,7 +579,10 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
                 if (this.serialInput) this.serialInput.value = ''
 
                 this._selectedOrderInventory = record
-                await this.fetchInventories(this.releaseGoodNo)
+
+                await this.fetchInventories(
+                  this.refPickingType === PICKING_TYPES.PICKING.value ? this.releaseGoodNo : this.taskNo
+                )
                 let updatedRecords = this._selectedOrderInventory
                 if (updatedRecords.releaseQty === updatedRecords.pickedQty) {
                   updatedRecords.status = 'DONE'
@@ -846,12 +857,14 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
             if (record.pickedQty == record.releaseQty) {
               if (this._isCartonLabel) {
                 this.cartonInput.value = ''
-                this._focusOnCartonNoInput()
+                this.productBarcodeInput.value = ''
+                // this._focusOnCartonNoInput()
               }
               this.inputForm.reset()
             } else {
-              this._focusOnProductBarcodeInput()
+              // this._focusOnProductBarcodeInput()
               this.fillUpForm(this.inputForm, record)
+              this.focusOnInput()
             }
           }
         }
@@ -896,7 +909,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
   async fetchPalletsHandler(releaseGoodNo) {
     const response = await client.query({
       query: gql`
-        query pallets($filters: [Filter], $pagination: Pagination) {
+        query pallets($filters: [Filter!]!, $pagination: Pagination) {
           pallets(filters: $filters, pagination: $pagination) {
             items {
               id
@@ -1008,9 +1021,10 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
         this.isReplacement = false
       } catch (e) {
         this._showToast(e)
-      } finally {
-        this._isExecuting = false
       }
+      // finally {
+      //   this._isExecuting = false
+      // }
     }
   }
 
@@ -1047,21 +1061,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
   openSerialNumberPopup() {
     openPopup(
       html`
-        <serial-number-popup
-          .orderInventory="${this?._selectedOrderInventory?.relatedOrderInv}"
-          @completed="${() => {
-            // if (this.refPickingType === PICKING_TYPES.PICKING.value) {
-            //   this.fetchInventories(this.releaseGoodNoInput.value)
-            //   this.fetchPalletsHandler(this.releaseGoodNoInput.value)
-            // } else {
-            //   this.fetchInventories(this.taskNoInput.value)
-            //   this.fetchPalletsHandler(this.taskNoInput.value)
-            // }
-            // // this._selectedTaskStatus = null
-            // this._selectedOrderInventory = null
-            // this._isReplacement = false
-          }}"
-        ></serial-number-popup>
+        <serial-number-popup .orderInventory="${this?._selectedOrderInventory?.relatedOrderInv}"></serial-number-popup>
       `,
       {
         backdrop: true,
@@ -1098,180 +1098,214 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
   }
 
   async pickCommonPicking() {
-    const locationName =
-      this.isWholePicking || !this.locationInput ? this._selectedOrderInventory.location.name : this.locationInput.value
-    // 1. Check whether location is changed
-    if (this._selectedOrderInventory.location.name !== locationName) {
-      this.locationNameSplit = this.locationInput.value.split('-')
-      const zonePortions = this.locationNameSplit[0].match(/[a-zA-Z0-9]+/g)
-      const rowPortions = this.locationNameSplit[1].match(/[a-zA-Z0-9]+/g)
-      const columnPortions = this.locationNameSplit[2].match(/[a-zA-Z0-9]+/g)
-
-      if (this.locationNameSplit.length === 3) {
-        this._incompleteLocationName = true
-        this.locations = await this.fetchLocations(zonePortions[0], rowPortions[0], columnPortions[0])
-        this._focusOnNewLocationInput()
-        throw new Error(i18next.t('text.please_select_the_location_again'))
-      } else if (this.locationNameSplit.length === 4) {
-        let relocateConfirmation = await CustomAlert({
-          title: i18next.t('title.relocate'),
-          text: i18next.t('text.are_you_sure'),
-          confirmButton: { text: i18next.t('button.relocate') },
-          cancelButton: { text: i18next.t('button.cancel') }
-        })
+    if (this._isExecuting === false) {
+      this._isExecuting = true
 
-        if (!relocateConfirmation.isConfirmed) {
-          this._incompleteLocationName = false
-          this.locationNameSplit = []
-          return false
-        }
-      }
-    }
+      try {
+        const locationName =
+          this.isWholePicking || !this.locationInput
+            ? this._selectedOrderInventory.location.name
+            : this.locationInput.value
+        // 1. Check whether location is changed
+        if (this._selectedOrderInventory.location.name !== locationName) {
+          this.locationNameSplit = this.locationInput.value.split('-')
+          const zonePortions = this.locationNameSplit[0].match(/[a-zA-Z0-9]+/g)
+          const rowPortions = this.locationNameSplit[1].match(/[a-zA-Z0-9]+/g)
+          const columnPortions = this.locationNameSplit[2].match(/[a-zA-Z0-9]+/g)
+
+          if (this.locationNameSplit.length === 3) {
+            this._incompleteLocationName = true
+            this.locations = await this.fetchLocations(zonePortions[0], rowPortions[0], columnPortions[0])
+            this._focusOnNewLocationInput()
+            throw new Error(i18next.t('text.please_select_the_location_again'))
+          } else if (this.locationNameSplit.length === 4) {
+            let relocateConfirmation = await CustomAlert({
+              title: i18next.t('title.relocate'),
+              text: i18next.t('text.are_you_sure'),
+              confirmButton: { text: i18next.t('button.relocate') },
+              cancelButton: { text: i18next.t('button.cancel') }
+            })
 
-    switch (this.refPickingType) {
-      case PICKING_TYPES.PICKING.value:
-        return await client.mutate({
-          mutation: gql`
-            mutation picking(
-              $worksheetDetailName: String!
-              $worksheetType: String!
-              $palletId: String
-              $locationName: String!
-              $releaseQty: Int!
-              $binLocation: String
-              $serialNumber: String
-            ) {
-              picking(
-                worksheetDetailName: $worksheetDetailName
-                worksheetType: $worksheetType
-                palletId: $palletId
-                locationName: $locationName
-                releaseQty: $releaseQty
-                binLocation: $binLocation
-                serialNumber: $serialNumber
-              )
+            if (!relocateConfirmation.isConfirmed) {
+              this._incompleteLocationName = false
+              this.locationNameSplit = []
+              return false
             }
-          `,
-          variables: {
-            worksheetDetailName: this._selectedOrderInventory.name,
-            worksheetType: this.refPickingType,
-            palletId: this.palletInput.value.trim(),
-            locationName,
-            releaseQty: this._isRequireSerialNumberScanning ? 1 : parseInt(this.releaseQtyInput.value),
-            binLocation: this._hasBinPicking ? this.binLocationInput.value : null,
-            serialNumber: this._isRequireSerialNumberScanning ? this.serialInput.value : null
           }
-        })
+        }
 
-      case PICKING_TYPES.BATCH_PICKING.value:
-        return await client.mutate({
-          mutation: gql`
-            mutation batchPicking(
-              $taskNo: String!
-              $worksheetType: String!
-              $palletId: String!
-              $locationName: String
-              $binLocationName: String
-              $releaseQty: Int!
-            ) {
-              batchPicking(
-                taskNo: $taskNo
-                worksheetType: $worksheetType
-                palletId: $palletId
-                locationName: $locationName
-                binLocationName: $binLocationName
-                releaseQty: $releaseQty
-              )
-            }
-          `,
-          variables: {
-            taskNo: this.taskNo,
-            worksheetType: this.refPickingType,
-            palletId: this.palletInput.value.trim(),
-            locationName,
-            binLocationName: this._hasBinPicking ? this.binLocationInput.value : null,
-            releaseQty: parseInt(this.releaseQtyInput.value)
-          }
-        })
+        switch (this.refPickingType) {
+          case PICKING_TYPES.PICKING.value:
+            return (
+              await client.mutate({
+                mutation: gql`
+                  mutation picking(
+                    $worksheetDetailName: String!
+                    $worksheetType: String!
+                    $palletId: String
+                    $locationName: String!
+                    $releaseQty: Int!
+                    $binLocation: String
+                    $serialNumber: String
+                  ) {
+                    picking(
+                      worksheetDetailName: $worksheetDetailName
+                      worksheetType: $worksheetType
+                      palletId: $palletId
+                      locationName: $locationName
+                      releaseQty: $releaseQty
+                      binLocation: $binLocation
+                      serialNumber: $serialNumber
+                    )
+                  }
+                `,
+                variables: {
+                  worksheetDetailName: this._selectedOrderInventory.name,
+                  worksheetType: this.refPickingType,
+                  palletId: this.palletInput.value.trim(),
+                  locationName,
+                  releaseQty: this._isRequireSerialNumberScanning ? 1 : parseInt(this.releaseQtyInput.value),
+                  binLocation: this._hasBinPicking ? this.binLocationInput.value : null,
+                  serialNumber: this._isRequireSerialNumberScanning ? this.serialInput.value : null
+                }
+              }),
+              (this._isExecuting = false)
+            )
+
+          case PICKING_TYPES.BATCH_PICKING.value:
+            return (
+              await client.mutate({
+                mutation: gql`
+                  mutation batchPicking(
+                    $taskNo: String!
+                    $worksheetType: String!
+                    $palletId: String!
+                    $locationName: String
+                    $binLocationName: String
+                    $releaseQty: Int!
+                  ) {
+                    batchPicking(
+                      taskNo: $taskNo
+                      worksheetType: $worksheetType
+                      palletId: $palletId
+                      locationName: $locationName
+                      binLocationName: $binLocationName
+                      releaseQty: $releaseQty
+                    )
+                  }
+                `,
+                variables: {
+                  taskNo: this.taskNo,
+                  worksheetType: this.refPickingType,
+                  palletId: this.palletInput.value.trim(),
+                  locationName,
+                  binLocationName: this._hasBinPicking ? this.binLocationInput.value : null,
+                  releaseQty: parseInt(this.releaseQtyInput.value)
+                }
+              }),
+              (this._isExecuting = false)
+            )
+        }
+      } catch (e) {
+        this._showToast(e)
+      }
+    } else {
+      throw new Error(i18next.t('text.previous_picking_is_still_executing_please_wait'))
     }
   }
 
   async productBarcodePicking() {
-    switch (this.refPickingType) {
-      case PICKING_TYPES.PICKING.value:
-        return await client.mutate({
-          mutation: gql`
-            mutation scanProductPicking(
-              $worksheetDetailName: String!
-              $worksheetType: String!
-              $productBarcode: String!
-              $cartonId: String!
-              $binLocation: String
-              $serialNumber: String
-            ) {
-              scanProductPicking(
-                worksheetDetailName: $worksheetDetailName
-                worksheetType: $worksheetType
-                productBarcode: $productBarcode
-                cartonId: $cartonId
-                binLocation: $binLocation
-                serialNumber: $serialNumber
-              )
-            }
-          `,
-          variables: {
-            worksheetDetailName: this._selectedOrderInventory.name,
-            worksheetType: this.refPickingType,
-            productBarcode: this.productBarcodeInput.value.trim(),
-            cartonId: this.cartonInput.value.trim(),
-            serialNumber: this._isRequireSerialNumberScanning ? this.serialInput.value : null,
-            binLocation: this._hasBinPicking ? this.binLocationInput.value : null
-          }
-        })
+    if (this._isExecuting === false) {
+      this._isExecuting = true
 
-      case PICKING_TYPES.BATCH_PICKING.value:
-        return await client.mutate({
-          mutation: gql`
-            mutation scanProductBatchPicking(
-              $taskNo: String!
-              $worksheetType: String!
-              $cartonId: String!
-              $inventory: InventoryPatch!
-              $productBarcode: String!
-              $binLocationName: String
-            ) {
-              scanProductBatchPicking(
-                taskNo: $taskNo
-                worksheetType: $worksheetType
-                cartonId: $cartonId
-                inventory: $inventory
-                productBarcode: $productBarcode
-                binLocationName: $binLocationName
-              )
-            }
-          `,
-          variables: {
-            taskNo: this.taskNo,
-            worksheetType: this.refPickingType,
-            cartonId: this.cartonInput.value.trim(),
-            productBarcode: this.productBarcodeInput.value.trim(),
-            inventory: {
-              batchId: this._selectedOrderInventory.batchId,
-              packingType: this._selectedOrderInventory.packingType,
-              packingSize: this._selectedOrderInventory.packingSize,
-              product: { id: this._selectedOrderInventory.product.id }
-            },
-            binLocationName: this._hasBinPicking ? this.binLocationInput.value : null
-          }
-        })
+      try {
+        switch (this.refPickingType) {
+          case PICKING_TYPES.PICKING.value:
+            return (
+              await client.mutate({
+                mutation: gql`
+                  mutation scanProductPicking(
+                    $worksheetDetailName: String!
+                    $worksheetType: String!
+                    $productBarcode: String!
+                    $cartonId: String!
+                    $binLocation: String
+                    $serialNumber: String
+                  ) {
+                    scanProductPicking(
+                      worksheetDetailName: $worksheetDetailName
+                      worksheetType: $worksheetType
+                      productBarcode: $productBarcode
+                      cartonId: $cartonId
+                      binLocation: $binLocation
+                      serialNumber: $serialNumber
+                    )
+                  }
+                `,
+                variables: {
+                  worksheetDetailName: this._selectedOrderInventory.name,
+                  worksheetType: this.refPickingType,
+                  productBarcode: this.productBarcodeInput.value.trim(),
+                  cartonId: this.cartonInput.value.trim(),
+                  serialNumber: this._isRequireSerialNumberScanning ? this.serialInput.value : null,
+                  binLocation: this._hasBinPicking ? this.binLocationInput.value : null
+                }
+              }),
+              (this._isExecuting = false)
+            )
+
+          case PICKING_TYPES.BATCH_PICKING.value:
+            return (
+              await client.mutate({
+                mutation: gql`
+                  mutation scanProductBatchPicking(
+                    $taskNo: String!
+                    $worksheetType: String!
+                    $cartonId: String!
+                    $inventory: InventoryPatch!
+                    $productBarcode: String!
+                    $binLocationName: String
+                  ) {
+                    scanProductBatchPicking(
+                      taskNo: $taskNo
+                      worksheetType: $worksheetType
+                      cartonId: $cartonId
+                      inventory: $inventory
+                      productBarcode: $productBarcode
+                      binLocationName: $binLocationName
+                    )
+                  }
+                `,
+                variables: {
+                  taskNo: this.taskNo,
+                  worksheetType: this.refPickingType,
+                  cartonId: this.cartonInput.value.trim(),
+                  productBarcode: this.productBarcodeInput.value.trim(),
+                  inventory: {
+                    batchId: this._selectedOrderInventory.batchId,
+                    packingType: this._selectedOrderInventory.packingType,
+                    packingSize: this._selectedOrderInventory.packingSize,
+                    product: { id: this._selectedOrderInventory.product.id }
+                  },
+                  binLocationName: this._hasBinPicking ? this.binLocationInput.value : null
+                }
+              }),
+              (this._isExecuting = false)
+            )
+        }
+      } catch (e) {
+        this._showToast(e)
+      }
+    } else {
+      throw new Error(i18next.t('text.previous_picking_is_still_executing_please_wait'))
     }
   }
 
   async validatePicking() {
     // validate for previous picking execution (multiple picking scanning)
-    if (this._isExecuting) throw new Error(i18next.t('text.previous_picking_is_still_executing_please_wait'))
+    // if (this._isExecuting) throw new Error(i18next.t('text.previous_picking_is_still_executing_please_wait'))
 
-    this._isExecuting = true
+    // this._isExecuting = true
 
     // validate for order selection
     if (!this._selectedOrderInventory) throw new Error(i18next.t('text.target_is_not_selected'))
@@ -1309,7 +1343,12 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
           if (!this.releaseQtyInput.checkValidity()) throw new Error(i18next.t('text.release_qty_invalid'))
 
           // typed qty should be matched with release qty.
-          if (parseInt(this.releaseQtyInput.value) !== this._selectedOrderInventory.releaseQty) {
+
+          if (
+            parseInt(this.releaseQtyInput.value) !==
+            this._selectedOrderInventory.releaseQty -
+              (this._selectedOrderInventory.pickedQty ? this._selectedOrderInventory.pickedQty : 0)
+          ) {
             this._focusOnReleaseQtyInput()
             throw new Error(i18next.t('text.wrong_release_qty'))
           }

package/client/pages/outbound/picking-replacement-popup.js

@@ -233,7 +233,7 @@ class PickingReplacementPopup extends localize(i18next)(LitElement) {
 
       const response = await client.query({
         query: gql`
-          query inventories($filters: [Filter]) {
+          query inventories($filters: [Filter!]) {
             inventories(filters: $filters) {
               items {
                 palletId
@@ -362,7 +362,7 @@ class PickingReplacementPopup extends localize(i18next)(LitElement) {
           mutation replacePickingPallets(
             $worksheetDetailName: String!
             $worksheetType: String!
-            $inventories: [InventoryPatch]!
+            $inventories: [InventoryPatch!]!
             $returnLocation: String
           ) {
             replacePickingPallets(