@things-factory/operato-wms 4.3.764 → 4.3.769

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

@@ -212,16 +212,16 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
               ?checked="${this._ownTransport}"
               ?disabled="${this._disableTransport}"
               @change="${e => {
-                this._ownTransport = e.currentTarget.checked
-                if (this._ownTransport) {
-                  this._warehouseTransportInput.checked = false
-                  this._warehouseTransport = false
-                } else {
-                  this._warehouseTransportInput.checked = true
-                  this._warehouseTransport = true
-                }
-                this._validateTransport()
-              }}"
+        this._ownTransport = e.currentTarget.checked
+        if (this._ownTransport) {
+          this._warehouseTransportInput.checked = false
+          this._warehouseTransport = false
+        } else {
+          this._warehouseTransportInput.checked = true
+          this._warehouseTransport = true
+        }
+        this._validateTransport()
+      }}"
             />
             <label for="ownTransport">${i18next.t('label.own_transport')}</label>
 
@@ -232,16 +232,16 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
               ?disabled="${this._disableTransport}"
               ?checked="${this._warehouseTransport}"
               @change="${e => {
-                this._warehouseTransport = e.currentTarget.checked
-                if (this._warehouseTransport) {
-                  this._ownTransportInput.checked = false
-                  this._ownTransport = false
-                } else {
-                  this._ownTransportInput.checked = true
-                  this._ownTransport = true
-                }
-                this._validateTransport()
-              }}"
+        this._warehouseTransport = e.currentTarget.checked
+        if (this._warehouseTransport) {
+          this._ownTransportInput.checked = false
+          this._ownTransport = false
+        } else {
+          this._ownTransportInput.checked = true
+          this._ownTransport = true
+        }
+        this._validateTransport()
+      }}"
             />
             <label for="warehouseTransport">${i18next.t('label.warehouse_transport')}</label>
 
@@ -251,8 +251,8 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
               name="container"
               ?checked="${this._hasContainer}"
               @change="${e => {
-                this._hasContainer = e.currentTarget.checked
-              }}"
+        this._hasContainer = e.currentTarget.checked
+      }}"
               ?hidden="${!this._checkTransport}"
             />
             <label for="container" ?hidden="${!this._checkTransport}">${i18next.t('label.container')}</label>
@@ -272,9 +272,9 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
               name="importCargo"
               ?checked="${this._importedOrder}"
               @change="${e => {
-                this._importedOrder = e.currentTarget.checked
-                this._validateImportCargo()
-              }}"
+        this._importedOrder = e.currentTarget.checked
+        this._validateImportCargo()
+      }}"
               ?hidden="${!this._checkTransport}"
             />
             <label for="importedOrder" ?hidden="${!this._checkTransport}">${i18next.t('label.import_cargo')}</label>
@@ -320,11 +320,11 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
           <select name="containerSize" ?hidden="${!this._hasContainer}">
             <option value="">--${i18next.t('label.please_select_a_container_size')}--</option>
             ${(this.containerSizes || []).map(
-              containerSize =>
-                html`
+        containerSize =>
+          html`
                   <option value="${containerSize && containerSize.name}">${containerSize && containerSize.name}</option>
                 `
-            )}
+      )}
           </select>
 
           <label ?hidden="${!this._ownTransport}">${i18next.t('label.do_no')}</label>
@@ -378,8 +378,8 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
 
           <h2
             @click="${e => {
-              this._vasExpanded = !this._vasExpanded
-            }}"
+        this._vasExpanded = !this._vasExpanded
+      }}"
             class="vas-title"
           >
             <mwc-icon>list_alt</mwc-icon>${i18next.t('title.vas')}<mwc-icon
@@ -720,15 +720,15 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       },
       ...(this._enableLotIdInput
         ? [
-            {
-              type: 'string',
-              name: 'palletId',
-              header: i18next.t('field.lot_id'),
-              imex: { header: i18next.t('field.lot_id'), key: 'palletId', width: 25, type: 'string' },
-              record: { editable: editable },
-              width: 150
-            }
-          ]
+          {
+            type: 'string',
+            name: 'palletId',
+            header: i18next.t('field.lot_id'),
+            imex: { header: i18next.t('field.lot_id'), key: 'palletId', width: 25, type: 'string' },
+            record: { editable: editable },
+            width: 150
+          }
+        ]
         : []),
       {
         type: 'date',
@@ -833,9 +833,9 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       html`
         <select-transport-vehicle-popup
           @selected="${e => {
-            // value of e might be wrong, need to recheck
-            this._transportVehicle = `${e.detail.regNumber}` + ` - ${e.detail.size}`
-          }}"
+          // value of e might be wrong, need to recheck
+          this._transportVehicle = `${e.detail.regNumber}` + ` - ${e.detail.size}`
+        }}"
         ></select-transport-vehicle-popup>
       `,
       {
@@ -854,15 +854,15 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
             .bizplaceId="${this._bizplaceId}"
             .selectMultipleProducts="${this._showAddProducts}"
             @selected="${e => {
-              let newRecords = []
-              for (let i = 0; i < e.detail.multipleProducts.length; i++) {
-                newRecords.push(e.detail.multipleProducts[i])
-              }
-              this.productData = {
-                ...this.productData,
-                records: [...this.productGrist.dirtyData.records, ...newRecords]
-              }
-            }}"
+            let newRecords = []
+            for (let i = 0; i < e.detail.multipleProducts.length; i++) {
+              newRecords.push(e.detail.multipleProducts[i])
+            }
+            this.productData = {
+              ...this.productData,
+              records: [...this.productGrist.dirtyData.records, ...newRecords]
+            }
+          }}"
           ></select-product-popup>
         `,
         {
@@ -883,40 +883,40 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
           <select-product-popup
             .bizplaceId="${this._bizplaceId}"
             @selected="${e => {
-              // let newRecord = []
-              // newRecord.push(e.detail)
-
-              if (this.productGrist.dirtyData.records.length !== rowIndex) {
-                // update existing product data records
-                this.productGrist.dirtyData.records.splice(rowIndex, 1, {
-                  ...this.productGrist.dirtyData.records[rowIndex],
-                  ...e.detail,
-                  isRequiredCheckExpiry: e.detail.product.isRequiredCheckExpiry
-                })
-
-                this.productGrist.dirtyData.records = this.productGrist.dirtyData.records.map(item => {
-                  return {
-                    ...item,
-                    totalUomValue:
-                      item?.packQty > 0
-                        ? item?.totalUomValue
-                          ? item.totalUomValue
-                          : `${parseFloat(item.packQty * e.detail.uomValue).toFixed(3)} ${e.detail.uom}`
-                        : null
-                  }
-                })
+            // let newRecord = []
+            // newRecord.push(e.detail)
+
+            if (this.productGrist.dirtyData.records.length !== rowIndex) {
+              // update existing product data records
+              this.productGrist.dirtyData.records.splice(rowIndex, 1, {
+                ...this.productGrist.dirtyData.records[rowIndex],
+                ...e.detail,
+                isRequiredCheckExpiry: e.detail.product.isRequiredCheckExpiry
+              })
 
-                this.productData = {
-                  ...this.productData,
-                  records: [...this.productGrist.dirtyData.records]
-                }
-              } else {
-                this.productData = {
-                  ...this.productData,
-                  records: [...this.productGrist.dirtyData.records, e.detail]
+              this.productGrist.dirtyData.records = this.productGrist.dirtyData.records.map(item => {
+                return {
+                  ...item,
+                  totalUomValue:
+                    item?.packQty > 0
+                      ? item?.totalUomValue
+                        ? item.totalUomValue
+                        : `${parseFloat(item.packQty * e.detail.uomValue).toFixed(3)} ${e.detail.uom}`
+                      : null
                 }
+              })
+
+              this.productData = {
+                ...this.productData,
+                records: [...this.productGrist.dirtyData.records]
               }
-            }}"
+            } else {
+              this.productData = {
+                ...this.productData,
+                records: [...this.productGrist.dirtyData.records, e.detail]
+              }
+            }
+          }}"
           ></select-product-popup>
         `,
         {
@@ -938,31 +938,31 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
             .bizplaceId="${this._bizplaceId}"
             .enableDirectInbound="${this.enableDirectInbound}"
             @selected="${async e => {
-              this.productGrist.dirtyData.records[rowIndex].location = { id: e.detail.id, name: e.detail.name }
-              this.productGrist.dirtyData.records[rowIndex].warehouse = {
-                id: e.detail.warehouse.id,
-                name: e.detail.warehouse.name
-              }
-              this.productGrist.dirtyData.records[rowIndex].__dirty__ = true
+            this.productGrist.dirtyData.records[rowIndex].location = { id: e.detail.id, name: e.detail.name }
+            this.productGrist.dirtyData.records[rowIndex].warehouse = {
+              id: e.detail.warehouse.id,
+              name: e.detail.warehouse.name
+            }
+            this.productGrist.dirtyData.records[rowIndex].__dirty__ = true
 
-              if (this.productGrist.dirtyData.records.length !== rowIndex) {
-                this.productGrist.dirtyData.records.splice(rowIndex, 1, {
-                  ...this.productGrist.dirtyData.records[rowIndex]
-                })
+            if (this.productGrist.dirtyData.records.length !== rowIndex) {
+              this.productGrist.dirtyData.records.splice(rowIndex, 1, {
+                ...this.productGrist.dirtyData.records[rowIndex]
+              })
 
-                this.productData = {
-                  ...this.productData,
-                  records: [...this.productGrist.dirtyData.records]
-                }
+              this.productData = {
+                ...this.productData,
+                records: [...this.productGrist.dirtyData.records]
+              }
 
-                this.productGrist.data.records = this.productGrist.dirtyData.records
-              } else {
-                this.productData = {
-                  ...this.productData,
-                  records: [...this.productGrist.dirtyData.records]
-                }
+              this.productGrist.data.records = this.productGrist.dirtyData.records
+            } else {
+              this.productData = {
+                ...this.productData,
+                records: [...this.productGrist.dirtyData.records]
               }
-            }}"
+            }
+          }}"
           ></buffer-location-selector>
         `,
         {
@@ -1575,8 +1575,8 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       }
 
       let orderProduct = {
-        batchId: record.batchId,
-        batchIdRef: record?.batchIdRef ? record.batchIdRef : null,
+        batchId: record.batchId ? record.batchId.trim() : null,
+        batchIdRef: record.batchIdRef ? record.batchIdRef.trim() : null,
         product: { id: record.product.id },
         productDetail: record?.productDetail?.id ? record.productDetail : { id: record.productDetailId },
         packingType: record.packingType,
@@ -1677,67 +1677,67 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
         html`
           <vas-create-popup
             .targetList="${this.productGrist.dirtyData.records
-              .map(record => {
-                let packQty = record.packQty - (record.releaseQty || 0)
-
-                if (this.vasData.records?.length) {
-                  const existVasData = this.vasData.records.filter(vasRecord => {
-                    const isSamePackingType = !!(record.packingType === vasRecord.packingType)
-                    switch (vasRecord.targetType) {
-                      case VAS_BATCH_AND_PRODUCT_TYPE:
-                        return (
-                          record.batchId === vasRecord.target.batchId &&
-                          record.product.id === vasRecord.target.productId &&
-                          isSamePackingType
-                        )
-                      case VAS_BATCH_NO_TYPE:
-                        return record.batchId === vasRecord.target && isSamePackingType
-                      case VAS_PRODUCT_TYPE:
-                        return record.product.id === vasRecord.target && isSamePackingType
-                    }
-                  })
+            .map(record => {
+              let packQty = record.packQty - (record.releaseQty || 0)
+
+              if (this.vasData.records?.length) {
+                const existVasData = this.vasData.records.filter(vasRecord => {
+                  const isSamePackingType = !!(record.packingType === vasRecord.packingType)
+                  switch (vasRecord.targetType) {
+                    case VAS_BATCH_AND_PRODUCT_TYPE:
+                      return (
+                        record.batchId === vasRecord.target.batchId &&
+                        record.product.id === vasRecord.target.productId &&
+                        isSamePackingType
+                      )
+                    case VAS_BATCH_NO_TYPE:
+                      return record.batchId === vasRecord.target && isSamePackingType
+                    case VAS_PRODUCT_TYPE:
+                      return record.product.id === vasRecord.target && isSamePackingType
+                  }
+                })
 
-                  if (existVasData?.length) {
-                    let assignedQty = 0
+                if (existVasData?.length) {
+                  let assignedQty = 0
 
-                    existVasData.forEach(dt => {
-                      assignedQty += dt.qty
-                    })
+                  existVasData.forEach(dt => {
+                    assignedQty += dt.qty
+                  })
 
-                    packQty -= assignedQty
-                  }
+                  packQty -= assignedQty
                 }
+              }
 
-                delete record.__dirty__
-                delete record.__dirtyfields__
-                return {
-                  ...record,
-                  packQty,
-                  unitUomValue: record.uomValue,
-                  totalUomValue: record.uomValue * packQty
-                }
-              })
-              .filter(record => record.packQty > 0)}"
+              delete record.__dirty__
+              delete record.__dirtyfields__
+              return {
+                ...record,
+                packQty,
+                unitUomValue: record.uomValue,
+                totalUomValue: record.uomValue * packQty
+              }
+            })
+            .filter(record => record.packQty > 0)}"
             .vasList="${this.vasData.records}"
             .record="${record}"
             @completed="${e => {
-              const newRecords = e.detail
+            const newRecords = e.detail
 
-              if (this.vasGrist.dirtyData.records.length !== this._selectedVasRecordIdx) {
-                // update existing vasData records
-                this.vasGrist.dirtyData.records.splice(this._selectedVasRecordIdx, 1, ...newRecords)
+            if (this.vasGrist.dirtyData.records.length !== this._selectedVasRecordIdx) {
+              // update existing vasData records
+              this.vasGrist.dirtyData.records.splice(this._selectedVasRecordIdx, 1, ...newRecords)
 
-                this.vasData = {
-                  ...this.vasData,
-                  records: [...this.vasGrist.dirtyData.records]
-                }
-              } else {
-                this.vasData = {
-                  ...this.vasData,
-                  records: [...this.vasGrist.dirtyData.records, ...newRecords]
-                }
+              this.vasData = {
+                ...this.vasData,
+                records: [...this.vasGrist.dirtyData.records]
+              }
+            } else {
+              this.vasData = {
+                ...this.vasData,
+                records: [...this.vasGrist.dirtyData.records, ...newRecords]
               }
-            }}"
+            }
+          }}"
           ></vas-create-popup>
         `,
         {
@@ -1778,15 +1778,15 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       html`
         <popup-partner-bizplaces-selector
           @selected="${async e => {
-            this._bizplaceId = e.detail.id
-            this._bizplaceName = e.detail.name
-            this.productGrist.reset()
-            this.vasGrist.reset()
-            this._strictProductSelection = await fetchSettingRule('strict-product-selection', e.detail.domain.id)
-            this._configureProductGrist()
-            this._clearView()
-            this._showAddProducts = true
-          }}"
+          this._bizplaceId = e.detail.id
+          this._bizplaceName = e.detail.name
+          this.productGrist.reset()
+          this.vasGrist.reset()
+          this._strictProductSelection = await fetchSettingRule('strict-product-selection', e.detail.domain.id)
+          this._configureProductGrist()
+          this._clearView()
+          this._showAddProducts = true
+        }}"
         ></popup-partner-bizplaces-selector>
       `,
       {
@@ -1850,14 +1850,14 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       },
       ...(this._enableLotIdInput
         ? [
-            {
-              type: 'string',
-              name: 'palletId',
-              header: i18next.t('field.lot_id'),
-              imex: { header: i18next.t('field.lot_id'), key: 'palletId', width: 25, type: 'string' },
-              width: 100
-            }
-          ]
+          {
+            type: 'string',
+            name: 'palletId',
+            header: i18next.t('field.lot_id'),
+            imex: { header: i18next.t('field.lot_id'), key: 'palletId', width: 25, type: 'string' },
+            width: 100
+          }
+        ]
         : []),
       {
         type: 'date',
@@ -1875,20 +1875,20 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       },
       ...(this.enableDirectInbound
         ? [
-            {
-              type: 'object',
-              name: 'location',
+          {
+            type: 'object',
+            name: 'location',
+            header: i18next.t('field.location'),
+            imex: {
               header: i18next.t('field.location'),
-              imex: {
-                header: i18next.t('field.location'),
-                key: 'location.name',
-                width: 30,
-                type: 'array',
-                arrData: []
-              },
-              width: 120
-            }
-          ]
+              key: 'location.name',
+              width: 30,
+              type: 'array',
+              arrData: []
+            },
+            width: 120
+          }
+        ]
         : []),
       {
         type: 'float',
@@ -1906,14 +1906,14 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       },
       ...(this.enableDirectInbound
         ? [
-            {
-              type: 'string',
-              name: 'errMsg',
-              header: i18next.t('field.error_message'),
-              imex: { header: i18next.t('field.error_message'), key: 'errMsg', width: 25, type: 'string' },
-              width: 350
-            }
-          ]
+          {
+            type: 'string',
+            name: 'errMsg',
+            header: i18next.t('field.error_message'),
+            imex: { header: i18next.t('field.error_message'), key: 'errMsg', width: 25, type: 'string' },
+            width: 350
+          }
+        ]
         : [])
     ]
 
@@ -2025,8 +2025,8 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
             item?.unitPrice || item?.unitPrice == 0
               ? item.unitPrice
               : item?.productDetail?.costPrice
-              ? item.productDetail.costPrice
-              : null
+                ? item.productDetail.costPrice
+                : null
 
           return {
             ...item,
@@ -2058,6 +2058,9 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
   async importHandler(patches) {
     try {
       const orderProducts = patches.map(patch => {
+        if (patch?.batchId) patch.batchId = patch.batchId.trim()
+        if (patch?.batchIdRef) patch.batchIdRef = patch.batchIdRef.trim()
+
         if (patch.manufactureDate) {
           const mdt = new Date(patch.manufactureDate)
           patch.manufactureDate = mdt < new Date() ? `${mdt.getFullYear()}-${mdt.getMonth() + 1}-${mdt.getDate()}` : ''
@@ -2087,8 +2090,8 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       if (!this.enableDirectInbound && records.some(record => record.location)) {
         throw new Error(
           'Location-based assignment is not allowed. Please delete the' +
-            ' location ' +
-            'column or enable Direct GAN Order in settings.'
+          ' location ' +
+          'column or enable Direct GAN Order in settings.'
         )
       }
       if (this._bizplaceId) {
@@ -2110,20 +2113,20 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
                 record.unitPrice == null && record.unitPrice !== undefined
                   ? '0.00'
                   : record.unitPrice === undefined
-                  ? null
-                  : parseFloat(parseFloat(record.unitPrice).toFixed(2)),
+                    ? null
+                    : parseFloat(parseFloat(record.unitPrice).toFixed(2)),
               packQty:
                 record.packQty == null && record.packQty !== undefined
                   ? '0'
                   : record.packQty === undefined
-                  ? null
-                  : parseFloat(parseFloat(record.packQty).toFixed(3)),
+                    ? null
+                    : parseFloat(parseFloat(record.packQty).toFixed(3)),
               palletQty:
                 record.palletQty == null && record.palletQty !== undefined
                   ? parseInt('0')
                   : record.palletQty === undefined
-                  ? null
-                  : parseInt(record.palletQty),
+                    ? null
+                    : parseInt(record.palletQty),
               uomValue: record.uomValue !== null && record.uomValue !== undefined ? parseFloat(record.uomValue) : ''
             }
           })
@@ -2134,9 +2137,9 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
             <import-pop-up
               .records=${records}
               .config=${{
-                rows: this.productGristConfig.rows,
-                columns: [...this.excelColumns().filter(column => column.imex !== undefined)]
-              }}
+              rows: this.productGristConfig.rows,
+              columns: [...this.excelColumns().filter(column => column.imex !== undefined)]
+            }}
               .importHandler="${await this.importHandler.bind(this)}"
               .enableDirectInbound=${this.enableDirectInbound}
             ></import-pop-up>