@things-factory/operato-wms 3.7.10 → 3.7.14

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
               }
@@ -785,12 +792,11 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
 
       this.roType = releaseOrder.type
       const orderInventories = releaseOrder.inventoryInfos.map(inventoryInfo => {
-        let roundedUomValue =
-          inventoryInfo.releaseQty *
-          ((inventoryInfo.uomValue + inventoryInfo.releaseUomValue) / (inventoryInfo.qty + inventoryInfo.releaseQty))
+        let roundedUomValue = parseFloat(inventoryInfo.releaseUomValue.toFixed(2))
         return {
           ...inventoryInfo,
           productSKU: inventoryInfo?.product?.sku || '',
+          productBrand: inventoryInfo?.product?.brand || '',
           inventory: {
             id: inventoryInfo.id,
             name: inventoryInfo.name,

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',
@@ -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

@@ -312,6 +312,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 +390,7 @@ class ReturnOrderDetail extends connect(store)(localize(i18next)(PageView)) {
                 name
                 description
                 sku
+                brand
               }
               productName
               packingType
@@ -417,7 +424,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/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',
@@ -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/worksheet-loading.js

@@ -137,7 +137,7 @@ class WorksheetLoading extends localize(i18next)(PageView) {
               ${Object.keys(WORKSHEET_STATUS).map(
                 key => html` <option value="${WORKSHEET_STATUS[key].value}">${WORKSHEET_STATUS[key].name}</option> `
               )}
-            </select>        
+            </select>
           </fieldset>
         </form>
 
@@ -211,6 +211,12 @@ class WorksheetLoading extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 350
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'zone',
@@ -404,6 +410,7 @@ class WorksheetLoading extends localize(i18next)(PageView) {
                   }
                   product {
                     sku
+                    brand
                     name
                     description
                   }
@@ -438,6 +445,7 @@ class WorksheetLoading extends localize(i18next)(PageView) {
             description: worksheetDetail.description,
             status: worksheetDetail.status,
             productSku: worksheetDetail.targetInventory.inventory.product.sku,
+            productBrand: worksheetDetail.targetInventory.inventory.product.brand,
             releaseQty: worksheetDetail.targetInventory.releaseQty,
             packingType: worksheetDetail.targetInventory.inventory.packingType
           }

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

@@ -246,6 +246,12 @@ class WorksheetPacking extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 250
         },
+        {
+          type: 'string',
+          name: 'brand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -354,6 +360,7 @@ class WorksheetPacking extends localize(i18next)(PageView) {
                   id
                   name
                   sku
+                  brand
                   description
                 }
                 packingType
@@ -411,6 +418,7 @@ class WorksheetPacking extends localize(i18next)(PageView) {
             batchId: worksheetDetail.targetInventory.batchId,
             batchIdRef: worksheetDetail.targetInventory.batchIdRef,
             sku: worksheetDetail.targetInventory.product.sku,
+            brand: worksheetDetail.targetInventory.product.brand,
             status: worksheetDetail.status,
             releaseQty: worksheetDetail.targetInventory.releaseQty,
             releaseUomValueWithUom:

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

@@ -393,6 +393,12 @@ class WorksheetPicking extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 250
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 100
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -456,6 +462,12 @@ class WorksheetPicking extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 250
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 100
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -647,6 +659,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
                 name
                 description
                 sku
+                brand
               }
               packingType
               packingSize
@@ -747,9 +760,11 @@ class WorksheetPicking extends localize(i18next)(PageView) {
         (result, ordInv) => {
           if (ordInv.status === ORDER_INVENTORY_STATUS.PENDING_SPLIT.value) {
             ordInv.productSku = ordInv.product.sku
+            ordInv.productBrand = ordInv.product.brand
             result.tempOrderInvs.push(ordInv)
           } else {
             ordInv.productSku = ordInv.product.sku
+            ordInv.productBrand = ordInv.product.brand
             ordInv.releaseUomValueWithUom = ordInv.releaseUomValue.toFixed(2) + ' ' + ordInv.inventory.uom
             ordInv.availableQty = ordInv.inventory.qty - ordInv.inventory.lockedQty + ordInv.releaseQty
             result.completedOrderInvs.push(ordInv)
@@ -887,6 +902,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
                   product {
                     sku
                     name
+                    brand
                     description
                   }
                   location {
@@ -914,6 +930,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
             ...item.targetInventory.inventory,
             ...item.targetInventory.inventory.location,
             productSku: item.targetInventory.inventory.product.sku,
+            productBrand: item.targetInventory.inventory.product.brand,
             description: item.description,
             releaseUomValueWithUom:
               item.targetInventory.releaseUomValue.toFixed(2) + ' ' + item.targetInventory.inventory.uom,
@@ -970,6 +987,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
                   product {
                     sku
                     name
+                    brand
                     description
                   }
                   zone
@@ -1019,6 +1037,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
             description: wsd.description,
             status: wsd.status,
             productSku: wsd.targetInventory.inventory.product.sku,
+            productBrand: item.targetInventory.inventory.product.brand,
             releaseQty: wsd.targetInventory.releaseQty,
             releaseUomValue: wsd.targetInventory.releaseUomValue,
             releaseUomValueWithUom:

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

@@ -101,7 +101,7 @@ class WorksheetReturn extends localize(i18next)(PageView) {
         accept: ['preview'],
         content: this
       },
-      help: 'operato-wms/outbound/worksheet-return',
+      help: 'operato-wms/outbound/worksheet-return'
     }
   }
 
@@ -187,6 +187,12 @@ class WorksheetReturn 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',
@@ -251,6 +257,7 @@ class WorksheetReturn extends localize(i18next)(PageView) {
                   cartonId
                   product {
                     name
+                    brand
                     description
                   }
                   packingType
@@ -285,6 +292,7 @@ class WorksheetReturn extends localize(i18next)(PageView) {
           return {
             ...worksheetDetail.targetInventory.inventory,
             name: worksheetDetail.name,
+            brand: worksheetDetail.targetInventory.inventory.product.brand,
             description: worksheetDetail.description,
             releaseQty: worksheetDetail.targetInventory.releaseQty,
             status: worksheetDetail.status

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

@@ -189,6 +189,12 @@ class WorksheetSorting extends localize(i18next)(PageView) {
           header: i18next.t('field.product'),
           width: 350
         },
+        {
+          type: 'string',
+          name: 'productBrand',
+          header: i18next.t('field.brand'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'packingType',
@@ -263,6 +269,7 @@ class WorksheetSorting extends localize(i18next)(PageView) {
                   product {
                     name
                     sku
+                    brand
                     description
                   }
                 }
@@ -292,7 +299,8 @@ class WorksheetSorting extends localize(i18next)(PageView) {
             ...worksheetDetail.targetInventory,
             ...worksheetDetail.targetInventory.product,
             ...worksheetDetail.targetInventory.inventory,
-            productSku: worksheetDetail.targetInventory.inventory.product.sku
+            productSku: worksheetDetail.targetInventory.inventory.product.sku,
+            productBrand: worksheetDetail.targetInventory.inventory.product.brand
           }
         })
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "3.7.10",
+  "version": "3.7.14",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -69,9 +69,9 @@
     "@things-factory/print-proxy-service": "^3.7.5",
     "@things-factory/print-service": "^3.7.5",
     "@things-factory/print-ui": "^3.7.5",
-    "@things-factory/product-base": "^3.7.8",
+    "@things-factory/product-base": "^3.7.14",
     "@things-factory/resource-ui": "^3.7.7",
-    "@things-factory/sales-ui": "^3.7.10",
+    "@things-factory/sales-ui": "^3.7.14",
     "@things-factory/scene-chartjs": "^3.7.5",
     "@things-factory/scene-clock": "^3.7.5",
     "@things-factory/scene-clone": "^3.7.5",
@@ -102,11 +102,11 @@
     "@things-factory/system-ui": "^3.7.5",
     "@things-factory/transport-base": "^3.7.5",
     "@things-factory/tutorial-ui": "^3.7.5",
-    "@things-factory/warehouse-base": "^3.7.10",
-    "@things-factory/worksheet-base": "^3.7.10"
+    "@things-factory/warehouse-base": "^3.7.14",
+    "@things-factory/worksheet-base": "^3.7.14"
   },
   "devDependencies": {
     "@things-factory/builder": "^3.7.5"
   },
-  "gitHead": "dc4aa344ee524651b4e633c3647c85c8daad8eb6"
+  "gitHead": "b8736fcc7bbaa2102e70b4f4ab1c409743e2eb6c"
 }