Merge pull request #651 from amansinghbais/refetch-issue

Fixed: avoiding refetching of item on adding new item
hotwax · Jan 20, 2025 · 152bb39 · 152bb39
2 parents 5fbfd54 + 59befca
commit 152bb39
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 15 deletions.
diff --git a/src/store/modules/product/actions.ts b/src/store/modules/product/actions.ts
@@ -72,7 +72,7 @@ const actions: ActionTree<ProductState, RootState> = {
 
   async fetchProductByIdentification ( { commit, state }, payload) {
     const cachedProductIds = Object.keys(state.cached);
-    if(cachedProductIds.includes(payload.scannedValue)) return;
+    if(cachedProductIds.includes(payload.scannedValue)) return state.cached[payload.scannedValue];
     const productIdentifications = process.env.VUE_APP_PRDT_IDENT ? JSON.parse(JSON.stringify(process.env.VUE_APP_PRDT_IDENT)) : []
 
     const productStoreSettings = store.getters["user/getProductStoreSettings"];

diff --git a/src/views/HardCountDetail.vue b/src/views/HardCountDetail.vue
@@ -469,18 +469,29 @@ async function addProductToItemsList() {
       initializeObserver()
     }, 0);
   }
-  findProductFromIdentifier(queryString.value.trim());
+  findProductFromIdentifier(queryString.value.trim(), newItem);
   return newItem;
 }
 
-async function findProductFromIdentifier(scannedValue: string ) {
+async function findProductFromIdentifier(scannedValue: string, newItem: any ) {
   const product = await store.dispatch("product/fetchProductByIdentification", { scannedValue })
-  let newItem = {} as any;
-  if(product?.productId) newItem = await addProductToCount(product.productId)
 
-  setTimeout(() => {
-    updateCurrentItemInList(newItem, scannedValue);
-  }, 1000)
+  if(productStoreSettings.value['showQoh']) {
+    let updatedItem = {} as any;
+    if(product?.productId) updatedItem = await addProductToCount(product.productId)
+
+    setTimeout(() => {
+      updateCurrentItemInList(updatedItem, scannedValue);
+    }, 1000)
+  } else {
+    let importItemSeqId = "" as any;
+    if(product?.productId) importItemSeqId = await addProductToCount(product.productId)
+  
+    setTimeout(() => {
+      updateCurrentItemInList({...newItem, importItemSeqId, ...product}, scannedValue);
+    }, 1000)
+  }
+
 }
 
 async function addProductToCount(productId: any) {
@@ -501,19 +512,25 @@ async function addProductToCount(productId: any) {
     if(!hasError(resp) && resp.data?.itemList?.length) {
       const importItemSeqId = resp.data.itemList[0].importItemSeqId
 
-      resp = await CountService.fetchCycleCountItems({ inventoryCountImportId: cycleCount.value.inventoryCountImportId, importItemSeqId, pageSize: 1 })
-      if(!hasError(resp)) {
-        newProduct = resp.data.itemList[0];
+      if(productStoreSettings.value['showQoh']) {
+        resp = await CountService.fetchCycleCountItems({ inventoryCountImportId: cycleCount.value.inventoryCountImportId, importItemSeqId, pageSize: 1 })
+        if(!hasError(resp)) {
+          newProduct = resp.data.itemList[0];
+          return newProduct
+        } else {
+          throw resp;
+        }
       } else {
-        throw resp;
+        return importItemSeqId
       }
+
     } else {
       throw resp;
     }
   } catch(err) {
     logger.error("Failed to add product to count", err)
   }
-  return newProduct;
+  return "";
 }
 
 async function updateCurrentItemInList(newItem: any, scannedValue: string) {  
@@ -700,8 +717,13 @@ async function matchProduct(currentProduct: any) {
   addProductModal.onDidDismiss().then(async (result) => {
     if(result.data?.selectedProduct) {
       const product = result.data.selectedProduct
-      const newItem = await addProductToCount(product.productId)
-      await updateCurrentItemInList(newItem, currentProduct.scannedId);
+      if(productStoreSettings.value['showQoh']) {
+        const newItem = await addProductToCount(product.productId)
+        await updateCurrentItemInList(newItem, currentProduct.scannedId);
+      } else {
+        const importItemSeqId = await addProductToCount(product.productId)
+        await updateCurrentItemInList({ ...currentProduct, ...product, importItemSeqId }, currentProduct.scannedId);
+      }
     }
   })