@things-factory/operato-wms 4.3.794 → 4.3.795

package/client/pages/order/arrival-notice/create-arrival-notice.js

@@ -710,14 +710,14 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
         header: i18next.t('field.total_uom_value'),
         width: 120
       },
-      {
+      ...(!this.enableDirectInbound ? [{
         type: 'integer',
         name: 'palletQty',
         header: i18next.t('field.pallet_qty'),
         imex: { header: i18next.t('field.pallet_qty'), key: 'palletQty', width: 25, type: 'float' },
         record: { editable: editable, options: { min: 0 } },
         width: 80
-      },
+      }] : []),
       ...(this._enableLotIdInput
         ? [
           {
@@ -808,7 +808,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
     }
 
     if (this.enableDirectInbound) {
-      const anchor = this._enableLotIdInput ? 'palletId' : 'palletQty'
+      const anchor = this._enableLotIdInput ? 'palletId' : 'totalUomValue'
       insertAfter(productGristColumns, anchor, [expDateColumn])
 
       insertAfter(productGristColumns, 'batchIdRef', [warehouseColumn, locationColumn])
@@ -1234,7 +1234,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       arrivalNotice.orderProducts = this._getOrderProducts()
       const fileUploader = this._document?.files ? this._document.files : undefined
 
-      if (arrivalNotice.orderProducts.some(orderProduct => !orderProduct.palletQty)) {
+      if (!this.enableDirectInbound && arrivalNotice.orderProducts.some(orderProduct => !orderProduct.palletQty)) {
         const result = await CustomAlert({
           title: i18next.t('title.are_you_sure'),
           text: i18next.t('text.there_is_no_pallet_qty'),
@@ -1439,11 +1439,11 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       throw new Error(i18next.t('text.x_should_be_positive', { state: { x: i18next.t('label.uom_value') } }))
     }
 
-    if (records.some(({ palletQty }) => palletQty < 0)) {
+    if (!this.enableDirectInbound && records.some(({ palletQty }) => palletQty < 0)) {
       throw new Error(i18next.t('text.x_should_be_positive', { state: { x: i18next.t('label.pallet_qty') } }))
     }
 
-    if (records.some(({ palletQty, packQty }) => palletQty > packQty)) {
+    if (!this.enableDirectInbound && records.some(({ palletQty, packQty }) => palletQty > packQty)) {
       throw new Error(
         i18next.t('text.a_cannot_exceed_b', {
           state: {
@@ -1476,7 +1476,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
           )
         }
 
-        if (!record.location || !record.location.id) {
+        if (!record.location || (!record.location.id && !record.location.name)) {
           throw new Error(
             i18next.t('text.location_required_for_product', {
               defaultValue: `Row ${index + 1}: Location is missing for product "${record.product?.name}"`,
@@ -1841,13 +1841,13 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
         imex: { header: i18next.t('field.pack_qty'), key: 'packQty', width: 25, type: 'float' },
         width: 100
       },
-      {
+      ...(!this.enableDirectInbound ? [{
         type: 'integer',
         name: 'palletQty',
         header: i18next.t('field.pallet_qty'),
         imex: { header: i18next.t('field.pallet_qty'), key: 'palletQty', width: 25, type: 'float' },
         width: 100
-      },
+      }] : []),
       ...(this._enableLotIdInput
         ? [
           {
@@ -2087,6 +2087,34 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
 
   async _importableData(records) {
     try {
+      // Remap raw Excel header text keys to imex.key values
+      const headerToKey = {}
+      this.excelColumns()
+        .filter(col => col.imex)
+        .forEach(col => {
+          headerToKey[col.imex.header.toLowerCase()] = col.imex.key
+        })
+
+      records = records.map(record => {
+        const remapped = {}
+        Object.entries(record).forEach(([rawKey, value]) => {
+          if (!rawKey) return
+          const mappedKey = headerToKey[rawKey.toLowerCase()]
+          if (mappedKey) {
+            const parts = mappedKey.split('.')
+            if (parts.length === 2) {
+              remapped[parts[0]] = remapped[parts[0]] || {}
+              remapped[parts[0]][parts[1]] = value
+            } else {
+              remapped[mappedKey] = value
+            }
+          } else {
+            remapped[rawKey] = value
+          }
+        })
+        return remapped
+      })
+
       if (!this.enableDirectInbound && records.some(record => record.location)) {
         throw new Error(
           'Location-based assignment is not allowed. Please delete the' +
@@ -2100,11 +2128,17 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
           .map(record => {
             let warehouseName
             if (this.enableDirectInbound) {
-              const match = record.location.name.match(/(.*) \((.*)\)/)
+              const locationItem = record.location?.name
+              const locationName = typeof locationItem === 'object' ? locationItem?.name : locationItem
+              const locationId = typeof locationItem === 'object' ? locationItem?.id : undefined
+              const match = locationName?.match(/(.*) \((.*)\)/)
               if (match && match.length === 3) {
-                record.location.name = match[1].trim()
                 warehouseName = match[2].trim()
-                record = { ...record, warehouseName: warehouseName }
+                record = {
+                  ...record,
+                  location: { id: locationId, name: match[1].trim() },
+                  warehouseName
+                }
               }
             }
             return {
@@ -2112,19 +2146,19 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
               unitPrice:
                 record.unitPrice == null && record.unitPrice !== undefined
                   ? '0.00'
-                  : record.unitPrice === undefined
+                  : record.unitPrice === undefined || record.unitPrice == ""
                     ? null
                     : parseFloat(parseFloat(record.unitPrice).toFixed(2)),
               packQty:
                 record.packQty == null && record.packQty !== undefined
                   ? '0'
-                  : record.packQty === undefined
+                  : record.packQty === undefined || record.packQty == ""
                     ? null
                     : parseFloat(parseFloat(record.packQty).toFixed(3)),
               palletQty:
                 record.palletQty == null && record.palletQty !== undefined
                   ? parseInt('0')
-                  : record.palletQty === undefined
+                  : record.palletQty === undefined || record.palletQty == ""
                     ? null
                     : parseInt(record.palletQty),
               uomValue: record.uomValue !== null && record.uomValue !== undefined ? parseFloat(record.uomValue) : ''

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "4.3.794",
+  "version": "4.3.795",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -91,7 +91,7 @@
     "@things-factory/print-ui": "^4.3.767",
     "@things-factory/product-base": "^4.3.791",
     "@things-factory/resource-ui": "^4.3.790",
-    "@things-factory/sales-ui": "^4.3.794",
+    "@things-factory/sales-ui": "^4.3.795",
     "@things-factory/scene-data-transform": "^4.3.767",
     "@things-factory/scene-excel": "^4.3.767",
     "@things-factory/scene-firebase": "^4.3.767",
@@ -108,7 +108,7 @@
     "@things-factory/transport-base": "^4.3.767",
     "@things-factory/tutorial-ui": "^4.3.767",
     "@things-factory/warehouse-base": "^4.3.791",
-    "@things-factory/worksheet-base": "^4.3.794"
+    "@things-factory/worksheet-base": "^4.3.795"
   },
   "devDependencies": {
     "@things-factory/builder": "^4.3.767",
@@ -117,5 +117,5 @@
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "cbcc57e2ef7188213c3e64c7e54d977f4f58b3f2"
+  "gitHead": "8159de8fb17815c04d55e515316e41bb226f1450"
 }