karthikalakshmi
/
Android_Retail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor chnages

This commit is contained in:
Tamilselvan 2026-02-06 14:08:16 +05:30
parent 4beecf0c53
commit 113f9fda23
1 changed files with 33 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/Pages/StockMaster/StockList.jsx
View File

@ -2,7 +2,7 @@ import { useState, useEffect, useRef, useCallback } from 'react';
import { useNavigate, useLocation } from 'react-router-dom'; import { useNavigate, useLocation } from 'react-router-dom';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import { PlusOutlined, EyeOutlined, PrinterFilled } from '@ant-design/icons'; import { PlusOutlined, EyeOutlined, PrinterFilled } from '@ant-design/icons';
import { Image, Pagination, Space, Table } from 'antd'; import { Image, Pagination, Space, Table, Tooltip } from 'antd';
import { import {
changeBreadCrumb, changeBreadCrumb,
getEmpAccess, getEmpAccess,
@ -142,7 +142,6 @@ const StockList = () => {
const [selectedRecords, setSelectedRecords] = useState([]); const [selectedRecords, setSelectedRecords] = useState([]);
const [activeTab, setActiveTab] = useState('stock'); const [activeTab, setActiveTab] = useState('stock');
const [MultiCode, setMultiCode] = useState(true); const [MultiCode, setMultiCode] = useState(true);
const [TotalCount, setTotalCount] = useState(null);
const [dateStrings, setDateStrings] = useState([ const [dateStrings, setDateStrings] = useState([
dayjs().format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'),
dayjs().format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'),
@ -239,10 +238,9 @@ const StockList = () => {
}) })
).unwrap(); ).unwrap();
if (Response?.data?.statusCode === 1) { if (Response?.data?.statusCode === 1) {
setTotalCount(Response?.data?.TotalCount);
return Response?.data?.data; return Response?.data?.data;
} else { } else {
setTotalCount(0);
return []; return [];
} }
}; };
@ -287,17 +285,16 @@ const StockList = () => {
AppId: AppId, AppId: AppId,
BranchId: BranchId, BranchId: BranchId,
CompId: CompId, CompId: CompId,
OrderFromDate: dateStrings?.[0] ?? '', // OrderFromDate: dateStrings?.[0] ?? '',
OrderToDate: dateStrings?.[1] ?? '', // OrderToDate: dateStrings?.[1] ?? '',
search: SearchText, search: SearchText,
}) })
).unwrap(); ).unwrap();
if (Response?.data?.statusCode === 1) { if (Response?.data?.statusCode === 1) {
setTotalCount(Response?.data?.TotalCount);
setpage(1); setpage(1);
return Response?.data?.data; return Response?.data?.data;
} else { } else {
setTotalCount(0);
return []; return [];
} }
} }
@ -703,9 +700,9 @@ const StockList = () => {
dispatch( dispatch(
getSupplierData({ AppId: AppId, BranchId: BranchId, CompId: CompId }) getSupplierData({ AppId: AppId, BranchId: BranchId, CompId: CompId })
); );
dispatch( // dispatch(
getPurchaseData({ AppId: AppId, BranchId: BranchId, CompId: CompId }) // getPurchaseData({ AppId: AppId, BranchId: BranchId, CompId: CompId })
); // );
let ProdData = { let ProdData = {
AppId: AppId, AppId: AppId,
@ -894,25 +891,25 @@ const StockList = () => {
PaymentAmount: PaymentAmount.toFixed(2), PaymentAmount: PaymentAmount.toFixed(2),
InvoiceDate: groupInfo.InwardDate InvoiceDate: groupInfo.InwardDate
? moment(groupInfo.InwardDate, 'YYYY-MM-DD').format( ? moment(groupInfo.InwardDate, 'YYYY-MM-DD').format(
'YYYY-MM-DDTHH:mm:ss' 'YYYY-MM-DDTHH:mm:ss'
) )
: null, : null,
SuppInvoiceNo: groupInfo.SupplierInvoiceNumber, SuppInvoiceNo: groupInfo.SupplierInvoiceNumber,
SuppInvoiceDate: groupInfo.SupplierInvoiceDate SuppInvoiceDate: groupInfo.SupplierInvoiceDate
? moment(groupInfo.SupplierInvoiceDate, 'YYYY-MM-DD').format( ? moment(groupInfo.SupplierInvoiceDate, 'YYYY-MM-DD').format(
'YYYY-MM-DDTHH:mm:ss' 'YYYY-MM-DDTHH:mm:ss'
) )
: null, : null,
DeliveryChallanNo: groupInfo.DeliveryChallanNo, DeliveryChallanNo: groupInfo.DeliveryChallanNo,
DeliveryInvoiceDate: groupInfo.DeliveryInvoiceDate DeliveryInvoiceDate: groupInfo.DeliveryInvoiceDate
? moment(groupInfo.DeliveryInvoiceDate, 'YYYY-MM-DD').format( ? moment(groupInfo.DeliveryInvoiceDate, 'YYYY-MM-DD').format(
'YYYY-MM-DDTHH:mm:ss' 'YYYY-MM-DDTHH:mm:ss'
) )
: null, : null,
DueDate: groupInfo.DueDate DueDate: groupInfo.DueDate
? moment(groupInfo.DueDate, 'YYYY-MM-DD').format( ? moment(groupInfo.DueDate, 'YYYY-MM-DD').format(
'YYYY-MM-DDTHH:mm:ss' 'YYYY-MM-DDTHH:mm:ss'
) )
: null, : null,
InvoiceAmount: Totalamount.toFixed(2), InvoiceAmount: Totalamount.toFixed(2),
TaxAmount: Totaltax.toFixed(2), TaxAmount: Totaltax.toFixed(2),
@ -930,13 +927,13 @@ const StockList = () => {
FreeQty: item.FreeQty, FreeQty: item.FreeQty,
ManufDate: item.ManufactureDate ManufDate: item.ManufactureDate
? moment(item.ManufactureDate, 'YYYY-MM-DD').format( ? moment(item.ManufactureDate, 'YYYY-MM-DD').format(
'YYYY-MM-DDTHH:mm:ss' 'YYYY-MM-DDTHH:mm:ss'
) )
: null, : null,
ExpDate: item.ExpireDate ExpDate: item.ExpireDate
? moment(item.ExpireDate, 'YYYY-MM-DD').format( ? moment(item.ExpireDate, 'YYYY-MM-DD').format(
'YYYY-MM-DDTHH:mm:ss' 'YYYY-MM-DDTHH:mm:ss'
) )
: null, : null,
BatchNo: item.BatchNo, BatchNo: item.BatchNo,
ModelNo: item.ModelNo, ModelNo: item.ModelNo,
@ -989,14 +986,10 @@ const StockList = () => {
const productName = checkComponent('Product Name'); const productName = checkComponent('Product Name');
setPrintProductName(productName); setPrintProductName(productName);
}; };
// const ProductName = Productdata ?.map((e)=>e.ProdName+' '(+e.Size+' '+e.UomName))
const ProductName = Productdata?.map( const ProductName = Productdata?.map(
(e) => `${e.ProdName} (${e.Size} ${e.UomName})` (e) => `${e.ProdName} (${e.Size} ${e.UomName})`
); );
// const ProductName = Varientdata?.map((e)=>e.ProdName)
// const ProductName = Productdata?.map((e)=>e.ProdName)
// const ProductSize = Productdata ?.map((e)=>e.Size)
// const ProductUomName = Productdata ?.map((e)=>e.UomName)
const SupplierNames = SupplierData?.map((e) => e.SuppName); const SupplierNames = SupplierData?.map((e) => e.SuppName);
@ -1012,33 +1005,8 @@ const StockList = () => {
const InwardDtlIds = Varientdata?.map((e) => e.InwardDtlId); const InwardDtlIds = Varientdata?.map((e) => e.InwardDtlId);
const StockProductId = Varientdata?.map((e) => e.ProdId); const StockProductId = Varientdata?.map((e) => e.ProdId);
// let proddetail = StockData?.map((e) => {
// return {
// ...e,
// ProdDetails: e.ProdDetails?.map((d) => ({
// ...d,
// InvoiceNo: e.InvoiceNo,
// InvoiceDate: e.InvoiceDate,
// InvoiceAmt: e.InvoiceAmount
// }))
// };
// });
// let subObjectsArray = [];
// // Iterate over mainObjects and concatenate subObjects arrays
// proddetail.forEach(obj => {
// subObjectsArray = subObjectsArray.concat(obj.ProdDetails);
// });
// function safeRound(amountStr) {
// if (amountStr == null) return allowDecimal ? '0.00' : '0';
// const cleaned = String(amountStr).replace(/[^0-9.-]+/g, '');
// const num = Number(cleaned);
// if (isNaN(num)) return allowDecimal ? '0.00' : '0';
// return allowDecimal ? num.toFixed(2) : Math.round(num).toString();
// }
const onFinish = async () => { const onFinish = async () => {
const template = barcodeTemplateDetails?.find( const template = barcodeTemplateDetails?.find(
@ -1194,7 +1162,8 @@ const StockList = () => {
? countData?.length ? countData?.length
? countData?.length ? countData?.length
: 0 : 0
: TotalCount; : data?.[0]?.TotalCount;
console.log(debouncedSearchText,countData,data,"kkkk",countOfProduct)
return ( return (
<div className="userPageTable"> <div className="userPageTable">
<div className="userPageContent"> <div className="userPageContent">
@ -1210,14 +1179,15 @@ const StockList = () => {
<div <div
className="searchAddDiv" className="searchAddDiv"
style={{ justifyContent: 'flex-start' }} style={{ justifyContent: 'flex-start' }}
> ><Tooltip title="Search using Invoice No,Supp Name">
<div className="formSearch" style={{ Width: '200px' }}> <div className="formSearch" style={{ Width: '200px' }}>
<Search <Search
placeholder="Search by Invoice No" placeholder="Search by Invoice No"
onSearch={onSearch} onSearch={onSearch}
onSearchChange={onSearchChange} onSearchChange={onSearchChange}
/> />
</div> </div>
</Tooltip>
<div style={{ width: '200px' }}> <div style={{ width: '200px' }}>
<RangePicker <RangePicker
placeholder={['Start Date', 'End Date']} placeholder={['Start Date', 'End Date']}
@ -1258,7 +1228,7 @@ const StockList = () => {
data={filteredData} data={filteredData}
dataSource={filteredData} dataSource={filteredData}
onChange={handleChange} onChange={handleChange}
// pagination={handlePageChange} // pagination={handlePageChange}
/>{' '} />{' '}
{countOfProduct > 10 && ( {countOfProduct > 10 && (
<Pagination <Pagination