@things-factory/operato-wms 3.7.10 → 3.7.14

package/client/pages/components/select-product-popup.js

@@ -139,6 +139,12 @@ class SelectProductPopup extends localize(i18next)(LitElement) {
           header: i18next.t('field.name'),
           width: 180
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          width: 120
+        },
         {
           type: 'string',
           name: 'description',
@@ -196,6 +202,7 @@ class SelectProductPopup extends localize(i18next)(LitElement) {
                 id
                 name
                 sku
+                brand
                 description
                 type
               }
@@ -216,6 +223,7 @@ class SelectProductPopup extends localize(i18next)(LitElement) {
               ...item,
               productId: item.product.id,
               sku: item.product.sku,
+              brand: item.product.brand,
               name: item.product.name,
               description: item.product.description
             }
@@ -236,6 +244,7 @@ class SelectProductPopup extends localize(i18next)(LitElement) {
             uomValue: selectedProduct.uomValue,
             productName: `${selectedProduct.name}(${selectedProduct.description}(${selectedProduct.sku}))`,
             isError: false,
+            productBrand: selectedProduct.brand,
             product: {
               id: selectedProduct.productId,
               name: selectedProduct.name,

package/client/pages/inbound/worksheet-putaway-return.js

@@ -192,6 +192,12 @@ class WorksheetPutawayReturn extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 350
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          width: 120
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -250,6 +256,7 @@ class WorksheetPutawayReturn extends localize(i18next)(PageView) {
                   cartonId
                   product {
                     name
+                    brand
                     description
                   }
                   packingType
@@ -285,6 +292,7 @@ class WorksheetPutawayReturn extends localize(i18next)(PageView) {
           return {
             ...worksheetDetail.targetInventory.inventory,
             name: worksheetDetail.name,
+            brand: worksheetDetail.targetInventory.inventory.product.brand,
             description: worksheetDetail.description,
             status: worksheetDetail.status
           }

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

@@ -231,6 +231,12 @@ class WorksheetPutaway extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 300
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -404,6 +410,7 @@ class WorksheetPutaway extends localize(i18next)(PageView) {
                   product {
                     sku
                     name
+                    brand
                     description
                   }
                   packingType
@@ -443,6 +450,7 @@ class WorksheetPutaway extends localize(i18next)(PageView) {
             name: worksheetDetail.name,
             description: worksheetDetail.description,
             productSku: worksheetDetail.targetInventory.inventory.product.sku,
+            productBrand: worksheetDetail.targetInventory.inventory.product.brand,
             status: worksheetDetail.status
           }
         })

package/client/pages/inbound/worksheet-unloading-return.js

@@ -230,6 +230,12 @@ class WorksheetUnloadingReturn extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 350
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -302,6 +308,7 @@ class WorksheetUnloadingReturn extends localize(i18next)(PageView) {
                   cartonId
                   product {
                     name
+                    brand
                     description
                   }
                   packingType
@@ -345,6 +352,7 @@ class WorksheetUnloadingReturn extends localize(i18next)(PageView) {
             id: worksheetDetail.id,
             name: worksheetDetail.name,
             description: worksheetDetail.description,
+            brand: worksheetDetail.targetInventory.inventory.product.brand,
             returnQty: worksheetDetail.targetInventory.returnQty,
             remark: worksheetDetail.targetInventory.remark,
             status: worksheetDetail.status,

package/client/pages/inbound/worksheet-unloading.js

@@ -287,6 +287,12 @@ class WorksheetUnloading extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 300
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -514,6 +520,7 @@ class WorksheetUnloading extends localize(i18next)(PageView) {
                 product {
                   id
                   sku
+                  brand
                   name
                   type
                   description
@@ -571,6 +578,7 @@ class WorksheetUnloading extends localize(i18next)(PageView) {
             issue: worksheetDetail.issue,
             initialBatchId: worksheetDetail.targetProduct.batchId,
             productSku: worksheetDetail.targetProduct.product.sku,
+            productBrand: worksheetDetail.targetProduct.product.brand,
             hasBatchChanges:
               worksheetDetail.targetProduct &&
               worksheetDetail.targetProduct.batchId !== worksheetDetail.targetProduct.initialBatchId

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

@@ -277,6 +277,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
                 { name: 'productId', hidden: true },
                 { name: 'sku', header: i18next.t('field.sku'), width: 150 },
                 { name: 'name', header: i18next.t('field.name'), width: 250 },
+                { name: 'brand', header: i18next.t('field.brand'), width: 150 },
                 { name: 'description', header: i18next.t('field.description'), width: 450 },
                 { name: 'type', header: i18next.t('field.type'), width: 200 },
                 { name: 'packingType', header: i18next.t('field.packing_type'), width: 200 },
@@ -295,6 +296,12 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           sortable: true,
           width: 500
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          width: 120
+        },
         {
           type: 'code',
           name: 'packingType',
@@ -512,6 +519,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
                 id
                 name
                 sku
+                brand
                 auxUnit1
                 auxValue1
                 description
@@ -555,6 +563,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
       return {
         ...item,
         sku: item.product.sku,
+        brand: item.product.brand,
         lockedQty: item.qty - item.remainQty,
         remainingQty: item.remainQty
       }
@@ -594,6 +603,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
               product {
                 id
                 sku
+                brand
                 name
                 description
               }

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

@@ -193,6 +193,13 @@ class InventoryByProduct extends localize(i18next)(PageView) {
           header: i18next.t('field.name'),
           width: 200
         },
+        {
+          type: 'string',
+          name: 'brand',
+          imex: { header: i18next.t('field.brand'), key: 'brand', width: 30, type: 'string' },
+          header: i18next.t('field.brand'),
+          width: 100
+        },
         {
           type: 'string',
           name: 'description',
@@ -256,6 +263,7 @@ class InventoryByProduct extends localize(i18next)(PageView) {
               product {
                 id
                 sku
+                brand
                 name
                 description
                 type

package/client/pages/inventory/inventory-history-by-pallet.js

@@ -101,6 +101,13 @@ class InventoryHistoryByPallet extends localize(i18next)(LitElement) {
           sortable: true,
           width: 500
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          sortable: true,
+          width: 150
+        },
         {
           type: 'string',
           name: 'batchId',
@@ -225,6 +232,7 @@ class InventoryHistoryByPallet extends localize(i18next)(LitElement) {
                 transactionType
                 product {
                   sku
+                  brand
                   name
                   description
                 }
@@ -262,6 +270,7 @@ class InventoryHistoryByPallet extends localize(i18next)(LitElement) {
               return {
                 ...itm,
                 productSku: itm.product.sku,
+                productBrand: itm.product.brand,
                 uomValue: `${itm.uomValue} ${itm.uom}`,
                 openingUomValue: `${itm.openingUomValue} ${itm.uom}`
               }

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

@@ -197,6 +197,7 @@ class InventoryHistory extends localize(i18next)(PageView) {
         fields: [
           'productSku',
           'product',
+          'productBrand',
           'seq',
           'palletId',
           'cartonId',
@@ -226,6 +227,13 @@ class InventoryHistory extends localize(i18next)(PageView) {
           sortable: true,
           width: 200
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          sortable: true,
+          width: 200
+        },
         {
           type: 'number',
           name: 'seq',
@@ -460,6 +468,7 @@ class InventoryHistory extends localize(i18next)(PageView) {
                 product {
                   id
                   sku
+                  brand
                   name
                   description
                 }
@@ -502,6 +511,7 @@ class InventoryHistory extends localize(i18next)(PageView) {
           return {
             ...item,
             productSku: item.product.sku,
+            productBrand: item.product.brand,
             productName: item.product.name,
             locationName: item.location.name,
             updaterName: item?.updater?.name ? item.updater.name : ''

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

@@ -89,6 +89,7 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
           'initialInboundAt',
           'productSku',
           'productName',
+          'productBrand',
           'packingType',
           'location',
           'remainQty',
@@ -151,6 +152,13 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
           sortable: true,
           width: 500
         },
+        {
+          type: 'string',
+          name: 'product_brand',
+          header: i18next.t('field.brand'),
+          sortable: true,
+          width: 150
+        },
         {
           type: 'code',
           name: 'packingType',
@@ -373,6 +381,7 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
                 id
                 sku
                 name
+                brand
                 description
               }
               qty
@@ -423,7 +432,8 @@ class OnhandInventory extends connect(store)(localize(i18next)(PageView)) {
               ...item,
               product: {
                 ...item.product,
-                name: `${item.product.name} ${item.product.description}`
+                name: `${item.product.name} ${item.product.description}`,
+                productBrand: `${item.product.brand}`
               }
             },
             '_'

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

@@ -187,6 +187,11 @@ class CreateCycleCount extends localize(i18next)(PageView) {
                   header: i18next.t('field.product_info'),
                   width: 280
                 },
+                {
+                  name: 'productBrand',
+                  header: i18next.t('field.brand'),
+                  width: 150
+                },
                 { name: 'packingType', header: i18next.t('field.packing_type') },
                 { name: 'packingSize', header: i18next.t('field.packing_size') },
                 {
@@ -232,6 +237,12 @@ class CreateCycleCount extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 100
+        },
         {
           type: 'code',
           name: 'packingType',

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

@@ -225,6 +225,12 @@ class CycleCountReport extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 350
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          width: 100
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -419,6 +425,7 @@ class CycleCountReport extends localize(i18next)(PageView) {
                   uom
                   product {
                     name
+                    brand
                     description
                   }
                 }
@@ -451,6 +458,7 @@ class CycleCountReport extends localize(i18next)(PageView) {
           return {
             ...worksheetDetail.targetInventory.inventory,
             name: worksheetDetail.name,
+            brand: worksheetDetail.targetInventory.inventory.product.brand,
             description: worksheetDetail.description,
             productName:
               worksheetDetail.targetInventory.inventory.product.name +

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

@@ -207,6 +207,18 @@ class WorksheetCycleCount extends localize(i18next)(PageView) {
           },
           width: 350
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          imex: {
+            header: i18next.t('field.brand'),
+            key: 'brand',
+            width: 15,
+            type: 'string'
+          },
+          width: 80
+        },
         {
           type: 'object',
           name: 'location',
@@ -323,6 +335,7 @@ class WorksheetCycleCount extends localize(i18next)(PageView) {
                   }
                   product {
                     name
+                    brand
                     description
                   }
                 },
@@ -356,6 +369,7 @@ class WorksheetCycleCount extends localize(i18next)(PageView) {
         return {
           ...worksheetDetail.targetInventory.inventory,
           name: worksheetDetail.name,
+          brand: worksheetDetail.targetInventory.inventory.product.brand,
           description: worksheetDetail.description,
           status: worksheetDetail.status,
           inspectedLocation: worksheetDetail.targetInventory.inspectedLocation,