@things-factory/operato-wms 3.7.12 → 3.8.0

package/client/pages/order/release-order/receive-release-order-request.js

@@ -400,6 +400,12 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
           header: i18next.t('field.product'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 100
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -595,6 +601,7 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
               product {
                 id
                 sku
+                brand
                 name
                 description
               }
@@ -652,6 +659,7 @@ class ReceiveReleaseOrderRequest extends connect(store)(localize(i18next)(PageVi
         return {
           ...inventoryInfo,
           productSKU: inventoryInfo?.product?.sku || '',
+          productBrand: inventoryInfo?.product?.brand || '',
           qty: inventoryInfo.qty + inventoryInfo.releaseQty,
           remainUomValue: `${inventoryInfo.uomValue + inventoryInfo.releaseUomValue} ${inventoryInfo.uom}`,
           releaseUomValue: inventoryInfo.releaseUomValue + ' ' + inventoryInfo.uom,

package/client/pages/order/release-order/release-extra-product-popup.js

@@ -620,9 +620,17 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
         }
 
         if (columnName === 'releaseQty') {
-          releaseQty = afterValue || 0
-        } else {
-          releaseQty = Math.round(afterValue / packageUom)
+          if (afterValue - originQty <= originAddableQty) {
+            releaseQty = afterValue || 0
+          } else {
+            releaseQty = originQty
+          }
+        } else if (columnName === 'releaseUomValue') {
+          if (afterValue - originUom <= originAddableUom) {
+            releaseQty = Math.round(afterValue / packageUom)
+          } else {
+            releaseQty = Math.round(originUom / packageUom)
+          }
         }
 
         roundedUom = releaseQty * packageUom
@@ -718,7 +726,7 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
       if (beforeValue) {
         event.detail.after[event.detail.column.name] = beforeValue
       } else {
-        delete event.detail.after[event.detail.column.name]
+        event.detail.after[event.detail.column.name] = 0
       }
       this._showToast(e)
     }

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

@@ -527,6 +527,12 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
           header: i18next.t('field.product'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 100
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -724,6 +730,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
               product {
                 id
                 sku
+                brand
                 name
                 description
               }
@@ -789,6 +796,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         return {
           ...inventoryInfo,
           productSKU: inventoryInfo?.product?.sku || '',
+          productBrand: inventoryInfo?.product?.brand || '',
           inventory: {
             id: inventoryInfo.id,
             name: inventoryInfo.name,
@@ -1178,7 +1186,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
   _serializeForm(form) {
     let obj = {}
     Array.from(form.querySelectorAll('input, select')).forEach(field => {
-      if (!field.hasAttribute('hidden') && field.value) {
+      if (!field.hasAttribute('hidden')) {
         obj[field.name] = field.type === 'checkbox' ? field.checked : field.value
       }
     })

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

@@ -271,6 +271,12 @@ class CheckReturnOrder extends connect(store)(localize(i18next)(PageView)) {
           header: i18next.t('field.product'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -343,6 +349,7 @@ class CheckReturnOrder extends connect(store)(localize(i18next)(PageView)) {
                 name
                 description
                 sku
+                brand
               }
               productName
               packingType
@@ -376,7 +383,8 @@ class CheckReturnOrder extends connect(store)(localize(i18next)(PageView)) {
         records: orderInventories.map(orderInventory => {
           return {
             ...orderInventory,
-            sku: orderInventory.product.sku
+            sku: orderInventory.product.sku,
+            brand: orderInventory.product.brand
           }
         })
       }

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

@@ -411,6 +411,11 @@ class CreateReturnOrder extends localize(i18next)(PageView) {
                   width: 280,
                   ignoreCondition: true
                 },
+                {
+                  name: 'productBrand',
+                  header: i18next.t('field.brand'),
+                  ignoreCondition: true
+                },
                 {
                   name: 'packingType',
                   header: i18next.t('field.packing_type'),
@@ -437,6 +442,7 @@ class CreateReturnOrder extends localize(i18next)(PageView) {
                   'releaseGoodName',
                   'batchId',
                   'productName',
+                  'productBrand',
                   'packingType',
                   'packingSize',
                   'releaseQty',
@@ -459,6 +465,12 @@ class CreateReturnOrder extends localize(i18next)(PageView) {
           header: i18next.t('field.product_name'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'batchId',
@@ -632,7 +644,7 @@ class CreateReturnOrder extends localize(i18next)(PageView) {
     if (releaseQty === undefined) throw new Error(i18next.t('text.there_is_no_selected_items'))
     if (returnQty > releaseQty) {
       throw new Error(i18next.t('text.available_quantity_insufficient'))
-    } else if (releaseQty <= 0) {
+    } else if (returnQty <= 0 || isNaN(returnQty)) {
       throw new Error(i18next.t('text.invalid_quantity_input'))
     }
   }
@@ -754,7 +766,7 @@ class CreateReturnOrder extends localize(i18next)(PageView) {
       let returnOrder = this._serializeForm(this.returnOrderForm)
       delete returnOrder.warehouseTransport
       returnOrder.orderInventories = this._getOrderInventories()
-      returnOrder.ownTransport = this._ownTransport  
+      returnOrder.ownTransport = this._ownTransport
       const attachments = this._document?.files ? this._document.files : undefined
       const response = await client.mutate({
         mutation: gql`

package/client/pages/order/return-order/receive-return-order-requests.js

@@ -277,6 +277,12 @@ class ReceiveReturnOrderRequests extends connect(store)(localize(i18next)(PageVi
           header: i18next.t('field.product'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -349,6 +355,7 @@ class ReceiveReturnOrderRequests extends connect(store)(localize(i18next)(PageVi
                 name
                 description
                 sku
+                brand
               }
               productName
               packingType
@@ -381,7 +388,8 @@ class ReceiveReturnOrderRequests extends connect(store)(localize(i18next)(PageVi
         records: orderInventories.map(orderInventory => {
           return {
             ...orderInventory,
-            sku: orderInventory.product.sku
+            sku: orderInventory.product.sku,
+            brand: orderInventory.product.brand
           }
         })
       }

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),
@@ -312,6 +313,12 @@ class ReturnOrderDetail extends connect(store)(localize(i18next)(PageView)) {
           header: i18next.t('field.product'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -384,6 +391,7 @@ class ReturnOrderDetail extends connect(store)(localize(i18next)(PageView)) {
                 name
                 description
                 sku
+                brand
               }
               productName
               packingType
@@ -417,7 +425,8 @@ class ReturnOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         records: orderInventories.map(orderInventory => {
           return {
             ...orderInventory,
-            sku: orderInventory.product.sku
+            sku: orderInventory.product.sku,
+            brand: orderInventory.product.brand
           }
         })
       }

package/client/pages/order/return-order/return-order-inventory-popup.js

@@ -154,6 +154,12 @@ class ReturnOrderInventoryPopup extends localize(i18next)(LitElement) {
           header: i18next.t('field.product_name'),
           width: 220
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 120
+        },
         {
           type: 'code',
           name: 'packingType',
@@ -233,6 +239,7 @@ class ReturnOrderInventoryPopup extends localize(i18next)(LitElement) {
                 id
               }
               productName
+              productBrand
               packingType
               packingSize
               releaseUomValueWithUom

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

@@ -21,6 +21,7 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
       productId: String,
       productName: String,
       productSku: String,
+      productBrand: String,
       bizplaceId: String,
       packingType: String,
       uom: String,
@@ -147,6 +148,7 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
           'picked',
           'palletId',
           'productSku',
+          'productBrand',
           'product',
           'location',
           'pickedQty',
@@ -191,6 +193,12 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
           header: i18next.t('field.product'),
           width: 250
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 130
+        },
         {
           type: 'object',
           name: 'location',
@@ -256,7 +264,7 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
           $packingSize: Float!
           $uom: String!
           $pickingStrategy: String!
-          $locationSortingRules: [Sorting]
+          $locationSortingRules: [Sorting!]!
         ) {
           inventoriesByStrategy(
             worksheetId: $worksheetId
@@ -267,7 +275,6 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
             packingType: $packingType
             packingSize: $packingSize
             uom: $uom
-
             pickingStrategy: $pickingStrategy
             locationSortingRules: $locationSortingRules
           ) {
@@ -280,6 +287,7 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
                 name
                 description
                 sku
+                brand
               }
               location {
                 name
@@ -316,6 +324,7 @@ class InventoryAssignPopup extends localize(i18next)(LitElement) {
             ...item,
             ...item.location,
             productSku: item.product.sku,
+            productBrand: item.product.brand,
             availableUomValue: item.uomValue + ' ' + item.uom
           }
         }),

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

@@ -138,6 +138,12 @@ class InventoryAutoAssignPopup extends localize(i18next)(LitElement) {
           header: i18next.t('field.product'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 100
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -234,6 +240,7 @@ class InventoryAutoAssignPopup extends localize(i18next)(LitElement) {
   async fetchInventoriesByStrategy({ batchId, product, packingType, packingSize, uom }, pickingStrategy, bizplaceId) {
     const productName = product.name
     const productSku = product.sku
+    const productBrand = product.brand
     const response = await client.query({
       query: gql`
         query inventoriesByStrategy(
@@ -268,6 +275,7 @@ class InventoryAutoAssignPopup extends localize(i18next)(LitElement) {
                 name
                 description
                 sku
+                brand
               }
             }
           }
@@ -292,6 +300,7 @@ class InventoryAutoAssignPopup extends localize(i18next)(LitElement) {
           ...item,
           ...item.location,
           productSku: item.product.sku,
+          productBrand: item.product.brand,
           releaseUomValue: item.uomValue + ' ' + item.uom
         }
       })

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 }
   }
 }