diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx
index 4cdffbed..a8f5f148 100644
--- a/src/components/estimate/Estimate.jsx
+++ b/src/components/estimate/Estimate.jsx
@@ -24,6 +24,7 @@ import { useSwal } from '@/hooks/useSwal'
 import { QcastContext } from '@/app/QcastProvider'
 import { useCanvasMenu } from '@/hooks/common/useCanvasMenu'
 import {normalizeDigits, normalizeDecimal} from '@/util/input-utils'
+import { CalculatorInput } from '@/components/common/input/CalcInput'
 export default function Estimate({}) {
   const [uniqueData, setUniqueData] = useState([])
   const [handlePricingFlag, setHandlePricingFlag] = useState(false)
@@ -2106,25 +2107,60 @@ export default function Estimate({}) {
                             </td>
                             <td>
                               <div className="input-wrap" style={{ width: '100%' }}>
-                                <input
-                                  type="text"
-                                  className="input-light al-r"
+                                {/*<input*/}
+                                {/*  type="text"*/}
+                                {/*  className="input-light al-r"*/}
+                                {/*  value={convertNumberToPriceDecimal(item?.amount?.replaceAll(',', ''))}*/}
+                                {/*  disabled={item.itemId === '' || !!item?.paDispOrder}*/}
+                                {/*  onChange={(e) => {*/}
+                                {/*    onChangeAmount(e.target.value, item.dispOrder, index)*/}
+                                {/*  }}*/}
+                                {/*  maxLength={6}*/}
+                                {/*/>*/}
+                                <CalculatorInput
+                                  className={"input-light al-r"}
                                   value={convertNumberToPriceDecimal(item?.amount?.replaceAll(',', ''))}
                                   disabled={item.itemId === '' || !!item?.paDispOrder}
-                                  onChange={(e) => {
-                                    onChangeAmount(e.target.value, item.dispOrder, index)
+                                  onChange={(value) =>{
+                                    onChangeAmount(value, item.dispOrder, index)
                                   }}
-                                  maxLength={6}
-                                />
+                                  options={{
+                                    allowNegative: false,
+                                    allowDecimal: false
+                                  }}
+                                  />
                               </div>
                             </td>
                             <td>{item.unit}</td>
                             <td>
                               <div className="form-flex-wrap">
                                 <div className="input-wrap mr5">
-                                  <input
-                                    type="text"
-                                    className="input-light al-r"
+                                  {/*<input*/}
+                                  {/*  type="text"*/}
+                                  {/*  className="input-light al-r"*/}
+                                  {/*  value={*/}
+                                  {/*    item.openFlg === '1'*/}
+                                  {/*      ? 'OPEN'*/}
+                                  {/*      : convertNumberToPriceDecimal(item?.showSalePrice === '0' ? null : item?.salePrice?.replaceAll(',', ''))*/}
+                                  {/*  }*/}
+                                  {/*  disabled={*/}
+                                  {/*    item.openFlg === '1'*/}
+                                  {/*      ? true*/}
+                                  {/*      : estimateContextState?.estimateType === 'YJSS'*/}
+                                  {/*        ? item?.paDispOrder*/}
+                                  {/*          ? true*/}
+                                  {/*          : item.pkgMaterialFlg !== '1'*/}
+                                  {/*        : item.itemId === '' || !!item?.paDispOrder*/}
+                                  {/*          ? true*/}
+                                  {/*          : item.openFlg === '1'*/}
+                                  {/*  }*/}
+                                  {/*  onChange={(e) => {*/}
+                                  {/*    onChangeSalePrice(e.target.value, item.dispOrder, index)*/}
+                                  {/*  }}*/}
+                                  {/*  maxLength={12}*/}
+                                  {/*/>*/}
+                                  <CalculatorInput
+                                    className={"input-light al-r"}
                                     value={
                                       item.openFlg === '1'
                                         ? 'OPEN'
@@ -2140,13 +2176,15 @@ export default function Estimate({}) {
                                           : item.itemId === '' || !!item?.paDispOrder
                                             ? true
                                             : item.openFlg === '1'
-                                              ? true
-                                              : false
                                     }
-                                    onChange={(e) => {
-                                      onChangeSalePrice(e.target.value, item.dispOrder, index)
+                                    onChange={(value) =>{
+                                      onChangeSalePrice(value, item.dispOrder, index)
                                     }}
                                     maxLength={12}
+                                    options={{
+                                      allowNegative: false,
+                                      allowDecimal: false
+                                    }}
                                   />
                                 </div>
                                 {item.openFlg === '1' && (