Fix the remeber batchNoId and productId issue