@things-factory/operato-wms 4.3.767 → 4.3.769

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

@@ -212,16 +212,16 @@ class DuplicateArrivalNotice 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 DuplicateArrivalNotice 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 DuplicateArrivalNotice 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 DuplicateArrivalNotice 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,8 +320,8 @@ class DuplicateArrivalNotice 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
                     ?selected=${this._containerSize === containerSize.name}
                     value="${containerSize && containerSize.name}"
@@ -329,7 +329,7 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
                     ${containerSize && containerSize.name}
                   </option>
                 `
-            )}
+      )}
           </select>
 
           <label ?hidden="${!this._ownTransport}">${i18next.t('label.do_no')}</label>
@@ -376,8 +376,8 @@ class DuplicateArrivalNotice 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
@@ -762,15 +762,15 @@ class DuplicateArrivalNotice 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>
         `,
         {
@@ -791,39 +791,39 @@ class DuplicateArrivalNotice 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
-                })
-
-                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
+              })
 
-                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>
         `,
         {
@@ -1426,8 +1426,8 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
   _getOrderProducts() {
     return this.productGrist.dirtyData.records.map(record => {
       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: { id: record?.productDetailId || record?.productDetail?.id },
         packingType: record.packingType,
@@ -1526,65 +1526,65 @@ class DuplicateArrivalNotice 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 > 0) {
-                  const existVasData = this.vasData.records.filter(vasRecord => {
-                    switch (vasRecord.targetType) {
-                      case VAS_BATCH_AND_PRODUCT_TYPE:
-                        return (
-                          record.batchId === vasRecord.target.batchId &&
-                          record.product.id === vasRecord.target.productId
-                        )
-                      case VAS_BATCH_NO_TYPE:
-                        return record.batchId === vasRecord.target
-                      case VAS_PRODUCT_TYPE:
-                        return record.product.id === vasRecord.target
-                    }
-                  })
+            .map(record => {
+              let packQty = record.packQty - (record.releaseQty || 0)
+
+              if (this.vasData.records.length > 0) {
+                const existVasData = this.vasData.records.filter(vasRecord => {
+                  switch (vasRecord.targetType) {
+                    case VAS_BATCH_AND_PRODUCT_TYPE:
+                      return (
+                        record.batchId === vasRecord.target.batchId &&
+                        record.product.id === vasRecord.target.productId
+                      )
+                    case VAS_BATCH_NO_TYPE:
+                      return record.batchId === vasRecord.target
+                    case VAS_PRODUCT_TYPE:
+                      return record.product.id === vasRecord.target
+                  }
+                })
 
-                  if (existVasData.length > 0) {
-                    let assignedQty = 0
+                if (existVasData.length > 0) {
+                  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>
         `,
         {
@@ -1625,13 +1625,13 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
       html`
         <popup-partner-bizplaces-selector
           @selected="${e => {
-            this._bizplaceId = e.detail.id
-            this._bizplaceName = e.detail.name
-            this.productGrist.reset()
-            this.vasGrist.reset()
-            this._configureProductGrist()
-            this._showAddProducts = true
-          }}"
+          this._bizplaceId = e.detail.id
+          this._bizplaceName = e.detail.name
+          this.productGrist.reset()
+          this.vasGrist.reset()
+          this._configureProductGrist()
+          this._showAddProducts = true
+        }}"
         ></popup-partner-bizplaces-selector>
       `,
       {
@@ -1792,6 +1792,9 @@ class DuplicateArrivalNotice extends localize(i18next)(PageView) {
 
   async importHandler(patches) {
     patches.map(itm => {
+      if (itm?.batchId) itm.batchId = itm.batchId.trim()
+      if (itm?.batchIdRef) itm.batchIdRef = itm.batchIdRef.trim()
+
       itm.unitPrice = parseFloat(itm.unitPrice) || ''
       if (itm.manufactureDate) {
         let mdt = new Date(itm.manufactureDate)
@@ -1837,9 +1840,9 @@ class DuplicateArrivalNotice 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)}"
             ></import-pop-up>
           `,

package/client/pages/order/arrival-notice/edit-product-popup.js

@@ -118,8 +118,8 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
           raised
           danger
           @click=${() => {
-            history.back()
-          }}
+        history.back()
+      }}
           label="${i18next.t('button.cancel')}"
         ></mwc-button>
         <mwc-button
@@ -242,15 +242,15 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
       },
       ...(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: true },
-              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: true },
+            width: 150
+          }
+        ]
         : []),
       {
         type: 'date',
@@ -451,13 +451,13 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
       },
       ...(this.enableLotIdInput
         ? [
-            {
-              type: 'string',
-              name: 'palletId',
-              header: i18next.t('field.lot_id'),
-              width: 80
-            }
-          ]
+          {
+            type: 'string',
+            name: 'palletId',
+            header: i18next.t('field.lot_id'),
+            width: 80
+          }
+        ]
         : []),
       {
         type: 'date',
@@ -712,32 +712,32 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
           .data="${this.productData}"
           .enableDirectInbound="${this.enableDirectInbound}"
           @selected="${async e => {
-            this.editProductGrist.dirtyData.records[rowIndex].location = { id: e.detail.id, name: e.detail.name }
-            this.editProductGrist.dirtyData.records[rowIndex].warehouse = {
-              id: e.detail.warehouse.id,
-              name: e.detail.warehouse.name
-            }
-            this.editProductGrist.dirtyData.records[rowIndex].__dirty__ = true
+          this.editProductGrist.dirtyData.records[rowIndex].location = { id: e.detail.id, name: e.detail.name }
+          this.editProductGrist.dirtyData.records[rowIndex].warehouse = {
+            id: e.detail.warehouse.id,
+            name: e.detail.warehouse.name
+          }
+          this.editProductGrist.dirtyData.records[rowIndex].__dirty__ = true
 
-            if (this.editProductGrist.dirtyData.records.length !== rowIndex) {
-              // update existing product data records
-              this.editProductGrist.dirtyData.records.splice(rowIndex, 1, {
-                ...this.editProductGrist.dirtyData.records[rowIndex]
-              })
+          if (this.editProductGrist.dirtyData.records.length !== rowIndex) {
+            // update existing product data records
+            this.editProductGrist.dirtyData.records.splice(rowIndex, 1, {
+              ...this.editProductGrist.dirtyData.records[rowIndex]
+            })
 
-              this.productData = {
-                ...this.productData,
-                records: [...this.editProductGrist.dirtyData.records]
-              }
+            this.productData = {
+              ...this.productData,
+              records: [...this.editProductGrist.dirtyData.records]
+            }
 
-              this.editProductGrist.data.records = this.editProductGrist.dirtyData.records
-            } else {
-              this.productData = {
-                ...this.productData,
-                records: [...this.editProductGrist.dirtyData.records]
-              }
+            this.editProductGrist.data.records = this.editProductGrist.dirtyData.records
+          } else {
+            this.productData = {
+              ...this.productData,
+              records: [...this.editProductGrist.dirtyData.records]
             }
-          }}"
+          }
+        }}"
         ></buffer-location-selector>
       `,
       {
@@ -756,32 +756,32 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
           .data="${this.newProductData}"
           .enableDirectInbound="${this.enableDirectInbound}"
           @selected="${async e => {
-            this.addProductGrist.dirtyData.records[rowIndex].location = { id: e.detail.id, name: e.detail.name }
-            this.addProductGrist.dirtyData.records[rowIndex].warehouse = {
-              id: e.detail.warehouse.id,
-              name: e.detail.warehouse.name
-            }
-            this.addProductGrist.dirtyData.records[rowIndex].__dirty__ = true
+          this.addProductGrist.dirtyData.records[rowIndex].location = { id: e.detail.id, name: e.detail.name }
+          this.addProductGrist.dirtyData.records[rowIndex].warehouse = {
+            id: e.detail.warehouse.id,
+            name: e.detail.warehouse.name
+          }
+          this.addProductGrist.dirtyData.records[rowIndex].__dirty__ = true
 
-            if (this.addProductGrist.dirtyData.records.length !== rowIndex) {
-              // update existing product data records
-              this.addProductGrist.dirtyData.records.splice(rowIndex, 1, {
-                ...this.addProductGrist.dirtyData.records[rowIndex]
-              })
+          if (this.addProductGrist.dirtyData.records.length !== rowIndex) {
+            // update existing product data records
+            this.addProductGrist.dirtyData.records.splice(rowIndex, 1, {
+              ...this.addProductGrist.dirtyData.records[rowIndex]
+            })
 
-              this.newProductData = {
-                ...this.newProductData,
-                records: [...this.addProductGrist.dirtyData.records]
-              }
+            this.newProductData = {
+              ...this.newProductData,
+              records: [...this.addProductGrist.dirtyData.records]
+            }
 
-              this.addProductGrist.data.records = this.addProductGrist.dirtyData.records
-            } else {
-              this.newProductData = {
-                ...this.newProductData,
-                records: [...this.addProductGrist.dirtyData.records]
-              }
+            this.addProductGrist.data.records = this.addProductGrist.dirtyData.records
+          } else {
+            this.newProductData = {
+              ...this.newProductData,
+              records: [...this.addProductGrist.dirtyData.records]
             }
-          }}"
+          }
+        }}"
         ></buffer-location-selector>
       `,
       {
@@ -807,27 +807,27 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
           <select-product-popup
             .bizplaceId="${this.bizplace.id}"
             @selected="${e => {
-              // let newRecord = []
-              // newRecord.push(e.detail)
-
-              if (this.addProductGrist.dirtyData.records.length !== rowIndex) {
-                // update existing product data records
-                this.addProductGrist.dirtyData.records.splice(rowIndex, 1, {
-                  ...this.addProductGrist.dirtyData.records[rowIndex],
-                  ...e.detail
-                })
-
-                this.newProductData = {
-                  ...this.newProductData,
-                  records: [...this.addProductGrist.dirtyData.records]
-                }
-              } else {
-                this.newProductData = {
-                  ...this.newProductData,
-                  records: [...this.addProductGrist.dirtyData.records, e.detail]
-                }
+            // let newRecord = []
+            // newRecord.push(e.detail)
+
+            if (this.addProductGrist.dirtyData.records.length !== rowIndex) {
+              // update existing product data records
+              this.addProductGrist.dirtyData.records.splice(rowIndex, 1, {
+                ...this.addProductGrist.dirtyData.records[rowIndex],
+                ...e.detail
+              })
+
+              this.newProductData = {
+                ...this.newProductData,
+                records: [...this.addProductGrist.dirtyData.records]
               }
-            }}"
+            } else {
+              this.newProductData = {
+                ...this.newProductData,
+                records: [...this.addProductGrist.dirtyData.records, e.detail]
+              }
+            }
+          }}"
           ></select-product-popup>
         `,
         {
@@ -910,9 +910,12 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
     return this.addProductGrist.dirtyData.records.map(record => {
       record.unitPrice = parseFloat(record.unitPrice) || 0
 
+      let batchId = record.batchId ? record.batchId.trim() : null
+      let batchIdRef = record.batchIdRef ? record.batchIdRef.trim() : null
+
       return {
-        batchId: isStatusPending ? record.batchId : `N/A`,
-        adjustedBatchId: !isStatusPending ? record.batchId : null,
+        batchId: isStatusPending ? batchId : `N/A`,
+        adjustedBatchId: !isStatusPending ? batchId : null,
         palletQty: isStatusPending ? (record.palletQty ? record.palletQty : 0) : 0,
         adjustedPalletQty: !isStatusPending ? (record?.palletQty ? record.palletQty : null) : null,
         palletId: record.palletId ? record.palletId : null,
@@ -930,8 +933,8 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
         totalUomValue: isStatusPending ? record.totalUomValue : 'N/A',
         adjustedTotalUomValue: record?.totalUomValue && !isStatusPending ? record.totalUomValue : 'N/A',
         manufactureDate: record?.manufactureDate ? record.manufactureDate : null,
-        batchIdRef: isStatusPending ? record?.batchIdRef : 'N/A',
-        adjustedBatchIdRef: record?.batchIdRef && !isStatusPending ? record.batchIdRef : null,
+        batchIdRef: isStatusPending ? batchIdRef : 'N/A',
+        adjustedBatchIdRef: record?.batchIdRef && !isStatusPending ? batchIdRef : null,
         unitPrice: isStatusPending ? record.unitPrice : 0,
         adjustedUnitPrice: record?.unitPrice && !isStatusPending ? record.unitPrice : null,
         remark: record?.remark ? record.remark : null,
@@ -949,18 +952,20 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
     if (this.editProductGrist.dirtyData.records.some(record => record.__dirty__)) {
       this.editProductGrist.dirtyData.records.map(record => {
         record.unitPrice = parseFloat(record.unitPrice)
+        let batchId = record.batchId ? record.batchId.trim() : null
+        let batchIdRef = record.batchIdRef ? record.batchIdRef.trim() : null
 
         editedOrderProducts.push({
           id: record.id,
           adjustedBatchId: !isStatusPending
-            ? record.batchId === record.__origin__.batchId
+            ? batchId === record.__origin__.batchId
               ? null
-              : record.batchId
+              : batchId
             : null,
           adjustedBatchIdRef: !isStatusPending
-            ? record.batchIdRef === record.__origin__.batchIdRef
+            ? batchIdRef === record.__origin__.batchIdRef
               ? null
-              : record.batchIdRef
+              : batchIdRef
             : null,
           adjustedPalletQty: !isStatusPending
             ? record.palletQty === record.__origin__.palletQty
@@ -1011,13 +1016,13 @@ export class EditProductPopup extends localize(i18next)(LitElement) {
           remark: record?.remark ? record.remark : null,
           ...(isStatusPending && {
             unitPrice: record.unitPrice,
-            batchIdRef: record?.batchIdRef,
+            batchIdRef: batchIdRef,
             packingType: record.packingType,
             packQty: record.packQty,
             palletQty: record.palletQty,
             uomValue: record.uomValue,
             uom: record.uom,
-            batchId: record.batchId,
+            batchId: batchId,
             totalUomValue: record.totalUomValue,
             expDate: record.__origin__.expDate,
             location: record.__origin__.location,