diff --git a/constants.js b/constants.js
index 4200725..92c382a 100644
--- a/constants.js
+++ b/constants.js
@@ -49,6 +49,7 @@ export const dispenseHeaders = [
 ];
 
 export const stockReceiptHeaders = [
+	{ key: "serialNo", header: "S.No"},
 	{ key: "itemId", header: "Item Id" },
 	{ key: "item", header: "Item" },
 	{ key: "supplierName", header: "Supplier Name" },
diff --git a/src/inventory/aushada/aushada.jsx b/src/inventory/aushada/aushada.jsx
index 5afbf57..2dc6e87 100644
--- a/src/inventory/aushada/aushada.jsx
+++ b/src/inventory/aushada/aushada.jsx
@@ -3,6 +3,8 @@ import {
   ButtonSet,
   Column,
   DataTable,
+  DatePicker,
+  DatePickerInput,
   Grid,
   Loading,
   Row,
@@ -26,18 +28,24 @@ import {
 import '../../../index.scss';
 import { ResponseNotification } from '../../components/notifications/response-notification';
 import { useItemStockContext } from '../../context/item-stock-context';
-import saveReceipt from '../../service/save-receipt';
 import {
   fetcher,
   fetcherPost,
+  getLocationAttributes,
+  getRequest,
+  globalPropertyUrl,
+  stockInwardURL,
   stockReceiptURL,
   stockRoomURL
 } from '../../utils/api-utils';
 import {
   getCalculatedQuantity,
+  getInwardStockReceiptObj,
   getStockReceiptObj,
 } from './eaushadha-response-mapper';
 import styles from './aushada.module.scss';
+import { convertToDateTimeFormat } from '../../utils/date-utils';
+import { inwardSaveReceipt, saveReceipt } from '../../service/save-receipt';
 
 const Aushada = (props) => {
   const [items, setItems] = useState([]);
@@ -52,53 +60,97 @@ const Aushada = (props) => {
   const [stockEmptyResonseMessage, setStockEmptyResonseMessage] = useState(false);
   const [negativeError, setNegativeError] = useState(false);
   const [outwardNumberExists, setOutwardNumberExists] = useState(false);
+  const [inwardNumberExists, setInwardNumberExists] = useState(false);
   const [cookies] = useCookies();
   const { setReloadData } = props;
   const { itemStock} = useItemStockContext();
+  const [isDateSelected, setIsDateSelected] = useState(false);
+  const [selectedDate, setSelectedDate] = useState('');
+  const [enableEaushadhaInwardApi, setEnableEaushadhaInwardApi] = useState('');
+  const [instituteId, setInstituteId] = useState([]);
+  const [instituteIdExists, setInstituteIdExists] = useState(false);
+  const locationUuid = cookies[locationCookieName].uuid;
 
   const { data: stockRoom, error: stockRoomError } = useSWR(
     stockRoomURL(cookies[locationCookieName]?.name.trim()),
     fetcher,
   );
 
+  useEffect(async ()=>{
+    const response=await getRequest(globalPropertyUrl('eAushadha.inward'))
+    if(response==true){
+      setEnableEaushadhaInwardApi(true);
+    }
+    const fetchInstituteIdByLocation = async () => {
+      const response = await getRequest(getLocationAttributes(locationUuid));
+      response?.results?.forEach((result) => {
+        if (result?.attributeType?.display === "Institute Id" && result?.value) {
+          setInstituteId(result?.value);
+          setInstituteIdExists(true)
+          return;
+        }
+        else{
+          setInstituteId("Contact Admin to set Institute Id")
+        }
+      });
+    };
+  
+    fetchInstituteIdByLocation();
+  },[enableEaushadhaInwardApi])
+
   useEffect(() => {
     if (stockIntakeButtonClick) {
-    let outwardMatch = false;
-     for (const result of itemStock) {
-     for(const stockOperation of result.details){
-       if (stockOperation.batchOperation.outwardId === outwardNumber) {
-            outwardMatch = true;
-            break;
+      let outwardMatch = false;
+      let inwardNumberMatch = false;
+      
+      for (const result of itemStock) {
+          for (const stockOperation of result.details) {
+            const formattedDate = convertToDateTimeFormat(selectedDate);
+              if (stockOperation.batchOperation.inwardDate === formattedDate) {
+                  inwardNumberMatch = true;
+                  break;
+              }
+              if (stockOperation.batchOperation.outwardId === outwardNumber) {
+                  outwardMatch = true;
+                  break;
+              }
           }
-        }
-        if(outwardMatch){
-          break;
-        }
+          if (inwardNumberMatch || outwardMatch) break;
       }
-          if(outwardMatch){
-          setOutwardNumberExists(true);
-          setStockIntakeButtonClick(false);
-          }
-          else{
-            setOutwardNumberExists(false);
 
-      const fetchData = async () => {
-        try {
-          const response = await fetcherPost(stockReceiptURL(), { ouid: outwardNumber });
-          if (response) {
-            setItems(getStockReceiptObj(response));
-            setReceivedResponse(response);
-            setStockEmptyResonseMessage(response.length === 0);
-          }
-        } catch (error) {
-          setStockReceiptError(error);
-        }
-        setStockIntakeButtonClick(false);
-      };
-      fetchData();
+    setInwardNumberExists(inwardNumberMatch);
+    setOutwardNumberExists(outwardMatch);
+    setStockIntakeButtonClick(false);
+
+    if(!inwardNumberMatch && !outwardMatch)
+        {
+            const fetchData = async () => {
+              try {
+                let url, requestBody;
+
+                if (enableEaushadhaInwardApi) {
+                  url = stockInwardURL();
+                  const formattedDate= convertToDateTimeFormat(selectedDate);
+                  requestBody = { "inwardDate":formattedDate, "instituteId":instituteId};
+                } else {
+                  url = stockReceiptURL();
+                  requestBody = { ouid: outwardNumber };
+                }
+                const response = await fetcherPost(url, requestBody);
+                if (response) {
+                  setItems(enableEaushadhaInwardApi ? getInwardStockReceiptObj(response) : getStockReceiptObj(response));
+                  setReceivedResponse(response);
+                  setStockEmptyResonseMessage(response.length === 0);
+                }
+              } catch (error) {
+                setStockReceiptError(error);
+              }
+              setStockIntakeButtonClick(false);
+             };
+           fetchData();
     }
     }
-  }, [stockIntakeButtonClick, outwardNumber]);
+  }, [stockIntakeButtonClick, outwardNumber,selectedDate,instituteId,items]);
 
   useEffect(() => {
     if (items.length > 0) {
@@ -113,7 +165,7 @@ const Aushada = (props) => {
   }, [items]);
 
   useEffect(() => {
-    if (outwardNumber.length > 0) {
+    if (outwardNumber.length > 0 || (isDateSelected && instituteIdExists)) {
       setIsOutwardNumberDisabled(false);
       setIsFetchStockDisabled(false);
     } else {
@@ -125,7 +177,7 @@ const Aushada = (props) => {
       setIsOutwardNumberDisabled(true);
       setIsFetchStockDisabled(true);
     }
-  }, [items, outwardNumber]);
+  }, [items, outwardNumber, isDateSelected,instituteIdExists]);
 
   useEffect(() => {
     if (onSuccesful) {
@@ -167,7 +219,8 @@ const Aushada = (props) => {
   };
   const handleSave = async () => {
     try {
-      const response = await saveReceipt(items, outwardNumber, stockRoom.results[0]?.uuid);
+      const formattedDate = convertToDateTimeFormat(selectedDate);
+      const response = await(enableEaushadhaInwardApi ? inwardSaveReceipt(items, instituteId,formattedDate, stockRoom.results[0]?.uuid) : saveReceipt(items, outwardNumber, stockRoom.results[0]?.uuid));
       if (response && response.ok) {
         setReloadData(true);
         setOnSuccesful(true);
@@ -184,6 +237,11 @@ const Aushada = (props) => {
     setOnFailure(status);
 
   };
+  
+  const handleDateChange = (date) => {
+    setSelectedDate(date[0]);
+    setIsDateSelected(true);
+  };
 
  return (
     <>
@@ -196,16 +254,43 @@ const Aushada = (props) => {
               ResponseNotification('error', 'Error', failureMessage, setOnSuccessAndFailure)}
                    </Column>
           <Row>
-            <Column sm={8} lg={4}>
-              <TextInput
-                id='stock-receipt'
-                labelText='Outward Number'
-                value={outwardNumber}
-                style={{ width: '80%' }}
-                onChange={(e) => setOutwardNumber(e.target.value)}
-                disabled={isOutwardNumberDisabled}
-              />
-            </Column>
+          {enableEaushadhaInwardApi ? (
+              <>
+                <Column sm={8} lg={4}>
+                <h4 style={{ paddingTop: '1.7rem', fontSize: '1.2rem', color: '#333' }}>
+                  Institute ID: {instituteId}
+                </h4>
+                </Column>
+                <Column sm={8} lg={4}>
+                  <DatePicker
+                    datePickerType='single'
+                    dateFormat='d-m-Y'
+                    value={selectedDate}
+                    onChange={handleDateChange}
+                  >
+                    <DatePickerInput
+                      id='myDatePicker'
+                      labelText='Select a date'
+                      placeholder='dd/mm/yyyy'
+                      pattern='d{1,2}/d{1,2}/d{4}'
+                      disabled={!instituteIdExists}
+                    />
+                  </DatePicker>
+                </Column>
+              </>) : (
+              <>
+                <Column sm={8} lg={4}>
+                  <TextInput
+                    id='stock-receipt'
+                    labelText='Outward Number'
+                    value={outwardNumber}
+                    style={{ width: '80%' }}
+                    onChange={(e) => setOutwardNumber(e.target.value)}
+                    disabled={isOutwardNumberDisabled}
+                  />
+                </Column>
+              </>
+            )}
             <Column sm={8} lg={4} style={{ paddingTop: '1.5rem' }}>
               <Button
                 onClick={() => setStockIntakeButtonClick(true)}
@@ -234,6 +319,15 @@ const Aushada = (props) => {
               )}
             </div>
           )}
+            {inwardNumberExists && (
+              <h3 style={{ paddingTop: '1rem' }}>
+                {ResponseNotification(
+                  'error',
+                  'Error',
+                  'Institute Id with this Date already fetched. Please enter a new institute id and date',setInwardNumberExists
+                )}
+              </h3>
+            )}
             {outwardNumberExists && (
                       <h3 style={{ paddingTop: '1rem' }}>
                         {ResponseNotification(
@@ -270,10 +364,17 @@ const Aushada = (props) => {
                             </TableRow>
                           </TableHead>
                           <TableBody>
-                            {rows.map((row) => (
+                            {rows.map((row,index) => (
                               <>
                                 <TableRow {...getRowProps({ row })} key='stock-fetch'>
                                   {row.cells.map((cell) => {
+                                    if(cell.id.includes('serialNo')){
+                                      return(
+                                        <TableCell key={cell.id}>
+                                          {++index}
+                                        </TableCell>
+                                      )
+                                    }
                                     if (
                                       cell.id.includes('totalQuantity') ||
                                       cell.id.includes('quantity')
diff --git a/src/inventory/aushada/aushada.module.scss b/src/inventory/aushada/aushada.module.scss
index b9824aa..a8edaef 100644
--- a/src/inventory/aushada/aushada.module.scss
+++ b/src/inventory/aushada/aushada.module.scss
@@ -3,6 +3,22 @@
 .stockReceiptTable {
   max-height: calc(100vh - 500px);
   overflow-y: scroll;
+  border: 1px solid #ccc;
+
+  &::-webkit-scrollbar {
+    width: 12px;
+    border-width: 1px;
+    border-radius: 6px;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background-color: darkgray;
+    border-radius: 6px; 
+  }
+
+  &::-webkit-scrollbar-track {
+    background-color: lightgray;
+  }
 }
 
 .buttonSet {
diff --git a/src/inventory/aushada/eaushadha-response-mapper.js b/src/inventory/aushada/eaushadha-response-mapper.js
index 0b27f01..913b3c5 100644
--- a/src/inventory/aushada/eaushadha-response-mapper.js
+++ b/src/inventory/aushada/eaushadha-response-mapper.js
@@ -43,4 +43,30 @@ export const getCalculatedQuantity = (quantity, unitPack) => {
 		unitPackQuantity *= element;
 	});
 	return parseInt(unitPackQuantity * quantity, 10);
-};
\ No newline at end of file
+};
+export const getInwardStockReceiptObj = (response) => {
+	const stockReceiptArray = [];
+	response?.forEach((element,index) => {
+		const dateString = element.exp_Date;
+		const convertedDate = new Date(dateString.split("/").reverse().join("-"));
+		const itemName = element.drug_Name.split(/\s+/).join(' ');
+		const rowObj = {
+			id: `${element.drug_Id}-${index}}`,
+			itemId: element.drug_Id,
+			item: itemName,
+			supplierName: element.supplier,
+			batchNumber: element.batch_Number,
+			expiration: convertedDate
+				.toLocaleDateString("en-GB")
+				.split("/")
+				.join("-"),
+			quantity: element.quantity_In_Pack,
+			totalQuantity: element.quantity_In_Units,
+			unitPack: element.unitPack,
+			invalid: false,
+			inwardNo: element.inwardNo,
+		};
+		stockReceiptArray.push(rowObj);
+	})
+	return stockReceiptArray;
+}
\ No newline at end of file
diff --git a/src/service/save-receipt.js b/src/service/save-receipt.js
index 2b0d70a..4a11cbd 100644
--- a/src/service/save-receipt.js
+++ b/src/service/save-receipt.js
@@ -22,6 +22,7 @@ const saveReceipt = async (items, outwardNumber, destinationUuid) => {
         expiration: item.expiration,
         batchNumber: item.batchNumber,
         calculatedExpiration: true,
+        inwardNo: item.inwardno,
       });
     }),
   );
@@ -39,7 +40,45 @@ const saveReceipt = async (items, outwardNumber, destinationUuid) => {
     department: '',
     outwardId: outwardNumber,
   };
+  
+  return postRequest(stockOperationURL, requestBody);
+};
 
+const inwardSaveReceipt = async (items, institutionId, inwardDate, destinationUuid) => {
+  const instanceTypeResponse = await getRequest(stockOperationTypeURL('Receipt'));
+  const instanceTypeUuids = instanceTypeResponse.results[0].uuid;
+  const itemsArray = [];
+  await Promise.all(
+    items.map(async (item) => {
+      const itemName = encodeURIComponent(item.item);
+      const response = await getRequest(`/openmrs/ws/rest/v2/inventory/item?v=full&q=${itemName}`);
+      const itemUuid = response.results[0]?.uuid;
+      itemsArray.push({
+        item: itemUuid,
+        quantity: item.totalQuantity,
+        expiration: item.expiration,
+        batchNumber: item.batchNumber,
+        calculatedExpiration: true,
+        inwardNo: item.inwardno,
+      });
+    }),
+  );
+
+  const requestBody = {
+    status: 'NEW',
+    attributes: [],
+    items: itemsArray,
+    operationNumber: '',
+    instanceType: instanceTypeUuids,
+    operationDate: getFormattedDate(),
+    source: '',
+    destination: destinationUuid,
+    institution: '',
+    department: '',
+    inwardDate: inwardDate,
+    instituteId: institutionId,
+  };
   return postRequest(stockOperationURL, requestBody);
 };
-export default saveReceipt;
+
+export { saveReceipt, inwardSaveReceipt };
\ No newline at end of file
diff --git a/src/utils/api-utils.js b/src/utils/api-utils.js
index 0891b6a..680597f 100644
--- a/src/utils/api-utils.js
+++ b/src/utils/api-utils.js
@@ -68,11 +68,15 @@ export const prescribedDrugOrders = (patientUuid) =>
 	`/openmrs/ws/rest/v1/bahmnicore/drugOrders/prescribedAndActive?getEffectiveOrdersOnly=false&getOtherActive=true&numberOfVisits=1&patientUuid=${patientUuid}&preferredLocale=en`;
 export const stockReceiptURL = () =>
 	"/openmrs/ws/rest/v1/eaushadha/stock-receipt";
-
+export const stockInwardURL = () =>
+    "/openmrs/ws/rest/v1/eaushadha/inward-stock-receipt";
 export const dispenseConceptURL = '/openmrs/ws/rest/v1/concept?q=Dispensed&limit=1'
 export const stockOperationURL = "/openmrs/ws/rest/v2/inventory/stockOperation"
 export const stockOperationTypeURL = (stockOperationType) => `/openmrs/ws/rest/v2/inventory/stockOperationType?v=full&q=${stockOperationType}`
 export const inventoryItemByNameURL = (itemName) => `/openmrs/ws/rest/v2/inventory/item?v=full&q=${itemName}`
 export const sessionURL = '/openmrs/ws/rest/v1/session?v=custom:(uuid)'
+export const getAllPatient = (locationUuid,inputValue) => `/openmrs/ws/rest/v1/bahmni/search/patient/lucene?filterOnAllIdentifiers=true&identifier=${inputValue}&loginLocationUuid=${locationUuid}&q=${inputValue}`
+export const globalPropertyUrl= (propertyName) => `/openmrs/ws/rest/v1/bahmnicore/sql/globalproperty?property=${propertyName}`;
+export const getLocationAttributes=(locationUuid) => `/openmrs/ws/rest/v1/location/${locationUuid}/attribute`;
 export const stockTakeURL = '/openmrs/ws/rest/v2/inventory/inventoryStockTake'
-export const getAllPatient = (locationUuid,inputValue) => `/openmrs/ws/rest/v1/bahmni/search/patient/lucene?filterOnAllIdentifiers=true&identifier=${inputValue}&loginLocationUuid=${locationUuid}&q=${inputValue}`
\ No newline at end of file
+
diff --git a/src/utils/date-utils.js b/src/utils/date-utils.js
index a419d23..268f0e4 100644
--- a/src/utils/date-utils.js
+++ b/src/utils/date-utils.js
@@ -8,9 +8,23 @@ const getFormattedDate = () => {
 
 };
 
+const convertToDateTimeFormat = (inputTime) => {
+  const dateObject = new Date(inputTime);
+  const year = dateObject.getFullYear();
+  const month = String(dateObject.getMonth() + 1).padStart(2, '0');
+  const day = String(dateObject.getDate()).padStart(2, '0');
+  const hours = String(dateObject.getHours()).padStart(2, '0');
+  const minutes = String(dateObject.getMinutes()).padStart(2, '0');
+  const seconds = String(dateObject.getSeconds()).padStart(2, '0');
+  const milliseconds = String(dateObject.getMilliseconds()).padStart(3, '0');
+  const timezoneOffset = '0000';
+
+  return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}.${milliseconds}+${timezoneOffset}`;
+};
+
 const getDatePattern = () => {
   const datePattern = "(0[1-9]|[1-2][0-9]|3[0-1])/(0[1-9]|1[0-2])/\\d{4}"
   return datePattern;
 };
 
-export { getFormattedDate, getDatePattern };
\ No newline at end of file
+export { getFormattedDate,convertToDateTimeFormat, getDatePattern };
\ No newline at end of file