From 734636adad85eee4b30081583e7a192685b3d075 Mon Sep 17 00:00:00 2001
From: changkyu choi <okoookoo@naver.com>
Date: Thu, 13 Feb 2025 11:33:23 +0900
Subject: [PATCH 1/6] =?UTF-8?q?=EC=9E=90=EB=8F=99=ED=95=A0=EB=8B=B9?=
 =?UTF-8?q?=EC=9D=BC=20=EB=95=8C=20=EB=AA=A8=EB=93=88=EC=9D=98=20=ED=9A=8C?=
 =?UTF-8?q?=EB=A1=9C=20=EC=A0=95=EB=B3=B4=20=EC=B4=88=EA=B8=B0=ED=99=94=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9=20=EB=B0=8F=20API=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=8B=9C=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modal/circuitTrestle/CircuitTrestleSetting.jsx |  6 +++++-
 .../modal/circuitTrestle/step/StepUp.jsx           | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
index 67f7c058..736c4f48 100644
--- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
@@ -178,7 +178,11 @@ export default function CircuitTrestleSetting({ id }) {
             ...params,
             pcsItemList: getSelectedPcsItemList(),
           }).then((res) => {
-            setTabNum(2)
+            if (res?.result.resultCode === 'S' && res?.data) {
+              setTabNum(2)
+            } else {
+              swalFire({ text: getMessage('common.message.send.error') })
+            }
           })
         } else {
           swalFire({
diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
index 723d63bf..d9398aa7 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
@@ -56,9 +56,19 @@ export default function StepUp(props) {
   // }
 
   useEffect(() => {
-    console.log(allocationType)
-
     if (allocationType === 'auto') {
+      // 자동일 때 모듈의 회로 정보 초기화
+      canvas
+        .getObjects()
+        .filter((obj) => obj.name === POLYGON_TYPE.MODULE)
+        .forEach((module) => {
+          module.circuit = null
+          module.circuitNumber = null
+          module.pcsItemId = null
+        })
+
+      canvas.renderAll()
+
       // PCS 자동 승압설정 정보 조회
       fetchAutoStepUpData()
     } else {

From f73faa24446ac9cd579cb9e188cca36b029c942a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?=
 <43837214+Minsiki@users.noreply.github.com>
Date: Thu, 13 Feb 2025 11:35:27 +0900
Subject: [PATCH 2/6] =?UTF-8?q?=EB=B6=80=EB=8F=99=20=EC=86=8C=EC=88=98?=
 =?UTF-8?q?=EC=A0=90=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useCirCuitTrestle.js | 37 +++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/hooks/useCirCuitTrestle.js b/src/hooks/useCirCuitTrestle.js
index 408c552f..a0b77644 100644
--- a/src/hooks/useCirCuitTrestle.js
+++ b/src/hooks/useCirCuitTrestle.js
@@ -15,6 +15,7 @@ import { useContext } from 'react'
 import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil'
 import { useMessage } from './useMessage'
 import { useCanvasPopupStatusController } from './common/useCanvasPopupStatusController'
+import Big from 'big.js'
 
 export function useCircuitTrestle() {
   const [makers, setMakers] = useRecoilState(makersState)
@@ -207,7 +208,7 @@ export function useCircuitTrestle() {
       surface.modules.forEach((module) => {
         if (!surfaceObjects[surface.id][module.moduleInfo.itemId]) {
           // 지붕면에 모듈 존재 여부
-          surfaceObjects[surface.id][module.moduleInfo.itemId] = 0 // 모듈 초기화
+          surfaceObjects[surface.id][module.moduleInfo.itemId] = new Big(0) // 모듈 초기화
         }
 
         surfaceObjects[surface.id][module.moduleInfo.itemId]++
@@ -224,10 +225,18 @@ export function useCircuitTrestle() {
           if (!surfaceObjects[surface.id].circuits[module.circuitNumber].circuits[module.moduleInfo.itemId]) {
             surfaceObjects[surface.id].circuits[module.circuitNumber].circuits[module.moduleInfo.itemId] = 0
           }
-          surfaceObjects[surface.id].circuits[module.circuitNumber].circuits[module.moduleInfo.itemId]++
-          surfaceObjects[surface.id].circuits[module.circuitNumber].circuits.wpOut += +module.moduleInfo.wpOut
-          surfaceObjects[surface.id].wpOut -= +module.moduleInfo.wpOut
-          surfaceObjects[surface.id][module.moduleInfo.itemId]--
+          surfaceObjects[surface.id].circuits[module.circuitNumber].circuits[module.moduleInfo.itemId] = Big(
+            surfaceObjects[surface.id].circuits[module.circuitNumber].circuits[module.moduleInfo.itemId],
+          )
+            .plus(1)
+            .toNumber()
+          surfaceObjects[surface.id].circuits[module.circuitNumber].circuits.wpOut = Big(
+            surfaceObjects[surface.id].circuits[module.circuitNumber].circuits.wpOut,
+          )
+            .plus(+module.moduleInfo.wpOut)
+            .toNumber()
+          surfaceObjects[surface.id].wpOut = Big(surfaceObjects[surface.id].wpOut).minus(+module.moduleInfo.wpOut).toNumber()
+          surfaceObjects[surface.id][module.moduleInfo.itemId] = Big(surfaceObjects[surface.id][module.moduleInfo.itemId]).minus(1).toNumber()
         }
       })
     })
@@ -236,7 +245,7 @@ export function useCircuitTrestle() {
       let tempRow = {
         name: surfaceObjects[key].roofSurface,
         circuit: surfaceObjects[key].circuit,
-        wpOut: parseFloat(surfaceObjects[key].wpOut / 1000),
+        wpOut: parseFloat(Big(surfaceObjects[key].wpOut).div(1000).toNumber()),
       }
       selectedModules.itemList.forEach((module) => {
         tempRow[module.itemId] = surfaceObjects[key][module.itemId]
@@ -247,7 +256,7 @@ export function useCircuitTrestle() {
         let row = {
           name: surfaceObjects[key].roofSurface,
           circuit: surfaceObjects[key].circuits[circuit].circuit,
-          wpOut: parseFloat(surfaceObjects[key].circuits[circuit].circuits.wpOut / 1000),
+          wpOut: parseFloat(Big(surfaceObjects[key].circuits[circuit].circuits.wpOut).div(1000).toNumber()),
         }
         selectedModules.itemList.forEach((module) => {
           row[module.itemId] = surfaceObjects[key].circuits[circuit].circuits[module.itemId]
@@ -255,14 +264,24 @@ export function useCircuitTrestle() {
         tempRows.push(row)
       })
     })
+    let ftWpOut = 0
+    tempRows.forEach((row) => {
+      ftWpOut = Big(ftWpOut).plus(+row.wpOut).toNumber()
+    })
 
     const tempFooter = {
       name: getMessage('modal.panel.batch.statistic.total'),
       circuit: '-',
-      wpOut: tempRows.reduce((acc, row) => acc + row.wpOut, 0),
+      wpOut: ftWpOut,
     }
     selectedModules.itemList.forEach((module) => {
-      tempFooter[module.itemId] = tempRows.reduce((acc, row) => acc + (row[module.itemId] ? row[module.itemId] : 0), 0)
+      let wpOut = 0
+      tempRows.forEach((row) => {
+        wpOut = Big(wpOut)
+          .plus(+row[module.itemId] ?? 0)
+          .toNumber()
+      })
+      tempFooter[module.itemId] = wpOut
     })
     canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
     setModuleStatistics({ header: tempHeader, rows: tempRows.filter((row) => row.wpOut !== 0), footer: tempFooter })

From f89332bb65abdf9de49dbb587db7a72562f80cca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?=
 <43837214+Minsiki@users.noreply.github.com>
Date: Thu, 13 Feb 2025 12:20:02 +0900
Subject: [PATCH 3/6] =?UTF-8?q?Undo,=20Redo=20=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/floor-plan/CanvasMenu.jsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx
index 46fe5810..8eed041a 100644
--- a/src/components/floor-plan/CanvasMenu.jsx
+++ b/src/components/floor-plan/CanvasMenu.jsx
@@ -677,8 +677,6 @@ export default function CanvasMenu(props) {
                 ></button>
                 {/*<button className="btn04" onClick={() => setShowCanvasSettingModal(true)}></button>*/}
                 <button className="btn04" onClick={handlePopup}></button>
-                <button className="btn05"></button>
-                <button className="btn06"></button>
               </div>
               <div className="size-control">
                 <button

From 9498a9ce8dc33ec0b265af1d09ba01dfd636c759 Mon Sep 17 00:00:00 2001
From: basssy <basssy@interplug.co.kr>
Date: Thu, 13 Feb 2025 14:31:35 +0900
Subject: [PATCH 4/6] #732

---
 src/components/management/StuffDetail.jsx | 10 ++++++--
 src/locales/ja.json                       | 28 ++++++++++++-----------
 src/locales/ko.json                       |  2 ++
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx
index 681afa16..ecdcfe65 100644
--- a/src/components/management/StuffDetail.jsx
+++ b/src/components/management/StuffDetail.jsx
@@ -344,7 +344,9 @@ export default function StuffDetail() {
     if (objectNo) {
       setManagementState({})
       setEditMode('EDIT')
+      setIsGlobalLoading(true)
       promiseGet({ url: `/api/object/${objectNo}/detail` }).then((res) => {
+        setIsGlobalLoading(false)
         if (res.status === 200) {
           if (res?.data?.createSaleStoreId === 'T01') {
             if (session?.storeId !== 'T01') {
@@ -358,6 +360,10 @@ export default function StuffDetail() {
             } else if (res.data.surfaceType === 'Ⅱ') {
               surfaceTypeValue = '2'
             }
+            //설치높이 0이면 빈값으로로 셋팅
+            if (res.data.installHeight === '0') {
+              res.data.installHeight = ''
+            }
             setManagementState({ ...res.data, surfaceTypeValue: surfaceTypeValue })
           } else {
             setIsGlobalLoading(false)
@@ -1487,7 +1493,7 @@ export default function StuffDetail() {
           setIsGlobalLoading(false)
           if (res.status === 201) {
             swalFire({
-              text: getMessage('stuff.detail.tempSave.message1'),
+              text: getMessage('stuff.detail.tempSave.message0'),
               type: 'alert',
               confirmFn: () => {
                 router.push(`/management/stuff/tempdetail?objectNo=${res.data.objectNo.toString()}`, { scroll: false })
@@ -1506,7 +1512,7 @@ export default function StuffDetail() {
           setIsGlobalLoading(false)
           if (res.status === 201) {
             swalFire({
-              text: getMessage('stuff.detail.tempSave.message1'),
+              text: getMessage('stuff.detail.tempSave.message0'),
               type: 'alert',
               confirmFn: () => {
                 router.push(`/management/stuff/tempdetail?objectNo=${res.data.objectNo.toString()}`, { scroll: false })
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 69749fcd..a8689471 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -695,7 +695,8 @@
   "stuff.detail.remarks": "メモ",
   "stuff.detail.tooltip.saleStoreId": "販売代理店または販売代理店IDを1文字以上入力してください",
   "stuff.detail.tooltip.surfaceType": "塩害地域の定義は各メーカーの設置マニュアルをご確認ください",
-  "stuff.detail.tempSave.message1": "一時保存されました。物件番号を取得するには、必須項目をすべて入力してください。",
+  "stuff.detail.tempSave.message0": "一時保存されました. 商品番号を取得するには、保存ボタンを押してください.",
+  "stuff.detail.tempSave.message1": "一時保存されました. 物件番号を取得するには、必須項目をすべて入力してください.",
   "stuff.detail.tempSave.message2": "担当者名は10桁以下で入力してください。",
   "stuff.detail.tempSave.message3": "二次販売店を選択してください。",
   "stuff.detail.confirm.message1": "販売店情報を変更すると、設計依頼文書番号が削除されます。変更しますか？",
@@ -951,20 +952,21 @@
   "estimate.detail.productFeaturesPopup.requiredStoreId": "一次販売店は必須です。",
   "estimate.detail.productFeaturesPopup.requiredReceiveUser": "担当者は必須です。",
   "estimate.detail.save.alertMsg": "保存されました。見積書で製品を変更すると、図面や回路には反映されません。",
-  "estimate.detail.copy.alertMsg": "コピーされました。",
-  "estimate.detail.save.requiredFileUpload": "ファイル添付が必須のアイテムがあります。ファイルを添付するか、後日添付をチェックしてください。",
+  "estimate.detail.copy.alertMsg": "コピーされました.",
+  "estimate.detail.save.requiredFileUpload": "ファイル添付が必須のアイテムがあります。ファイルを添付するか、後日添付をチェックしてください.",
   "estimate.detail.save.requiredNorthArrangementFileUpload": "北面にモジュールを配置した場合、北面配置許可書を必ず添付する必要があります.",
-  "estimate.detail.save.requiredItem": "製品は1つ以上登録する必要があります。",
-  "estimate.detail.save.requiredCharger": "担当者は必須です。",
-  "estimate.detail.save.requiredObjectName": "案件名は必須です。",
-  "estimate.detail.save.requiredPkgAsp": "住宅pkg単価は0より大きい値を入力してください。",
-  "estimate.detail.save.requiredEstimateDate": "見積日は必須です。",
-  "estimate.detail.save.requiredItemId": "製品を選択してください。",
-  "estimate.detail.save.requiredAmount": "数量は0より大きい値を入力してください。",
-  "estimate.detail.save.requiredSalePrice": "単価は0より大きい値を入力してください。",
-  "estimate.detail.reset.alertMsg": "初期化されました。",
+  "estimate.detail.save.requiredItem": "製品は1つ以上登録する必要があります.",
+  "estimate.detail.save.requiredCharger": "担当者は必須です.",
+  "estimate.detail.save.requiredObjectName": "案件名は必須です.",
+  "estimate.detail.save.requiredPkgAsp": "住宅pkg単価は0より大きい値を入力してください.",
+  "estimate.detail.save.requiredEstimateDate": "見積日は必須です.",
+  "estimate.detail.save.requiredItemId": "製品を選択してください.",
+  "estimate.detail.save.requiredAmount": "数量は0より大きい値を入力してください.",
+  "estimate.detail.save.requiredSalePrice": "単価は0より大きい値を入力してください.",
+  "estimate.detail.save.requiredEstimateType": "注文分類を選択してください.",
+  "estimate.detail.reset.alertMsg": "初期化されました.",
   "estimate.detail.reset.confirmMsg": "保存した見積情報が初期化され、最近保存された図面情報が反映されます。本当に初期化しますか？",
-  "estimate.detail.lock.alertMsg": "見積もりを[ロック]すると変更できません。 <br />見積もりを修正するには、ロックを解除してください。",
+  "estimate.detail.lock.alertMsg": "見積もりを[ロック]すると変更できません。 <br />見積もりを修正するには、ロックを解除してください.",
   "estimate.detail.unlock.alertMsg": "[ロック解除]すると、見積書を編集できます。 <br />解除しますか？",
   "estimate.detail.unlock.confirmBtnName": "解放",
   "estimate.detail.alert.delFile": "添付ファイルを完全に削除するには、[保存]ボタンをクリックしてください。",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 35d0cc73..17594550 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -695,6 +695,7 @@
   "stuff.detail.remarks": "메모",
   "stuff.detail.tooltip.saleStoreId": "판매대리점 또는 판매대리점ID를 1자 이상 입력하세요",
   "stuff.detail.tooltip.surfaceType": "염해지역 정의는 각 메이커의 설치 매뉴얼을 확인해주십시오",
+  "stuff.detail.tempSave.message0": "임시저장 되었습니다. 물건번호를 획득하려면 저장버튼을 눌러주십시오.",
   "stuff.detail.tempSave.message1": "임시저장 되었습니다. 물건번호를 획득하려면 필수 항목을 모두 입력해 주십시오.",
   "stuff.detail.tempSave.message2": "담당자이름은 10자리 이하로 입력해 주십시오.",
   "stuff.detail.tempSave.message3": "2차 판매점을 선택해주세요.",
@@ -963,6 +964,7 @@
   "estimate.detail.save.requiredItemId": "제품을 선택해주세요.",
   "estimate.detail.save.requiredAmount": "수량은 0보다 큰값을 입력해주세요.",
   "estimate.detail.save.requiredSalePrice": "단가는 0보다 큰값을 입력해주세요.",
+  "estimate.detail.save.requiredEstimateType": "주문분류를 선택해주세요.",
   "estimate.detail.reset.alertMsg": "초기화 되었습니다.",
   "estimate.detail.reset.confirmMsg": "수기 변경(저장)한 견적 정보가 초기화되고 최근 저장된 도면정보가 반영됩니다. 정말로 초기화하시겠습니까?",
   "estimate.detail.lock.alertMsg": "견적서를 [잠금]하면 수정할 수 없습니다. <br />견적서를 수정하려면 잠금해제를 하십시오.",

From 06e15a6ca4abb003b15b179edf7fd2c8296ec155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?=
 <43837214+Minsiki@users.noreply.github.com>
Date: Thu, 13 Feb 2025 14:40:16 +0900
Subject: [PATCH 5/6] =?UTF-8?q?=EB=B0=B0=EC=B9=98=EB=A9=B4=20=EC=B4=88?=
 =?UTF-8?q?=EA=B8=B0=EC=84=A4=EC=A0=95=20=EA=B0=81=EB=8F=84,=20=EA=B2=BD?=
 =?UTF-8?q?=EC=82=AC=20=EC=9E=85=EB=A0=A5=20=ED=95=84=EB=93=9C=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../placementShape/PlacementShapeSetting.jsx  | 43 +++++++++++++------
 src/styles/_modal.scss                        | 11 +++++
 2 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx
index 5439b303..c8efb5cb 100644
--- a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx
+++ b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx
@@ -228,19 +228,38 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, set
                 <tr>
                   <th>{getMessage('modal.placement.initial.setting.roof.angle.setting')}</th>
                   <td>
-                    <div className="pop-form-radio">
+                    <div className="pop-form-radio place">
                       {currentRoof &&
-                        roofAngleSetArray.map((item) => (
-                          <div className="d-check-radio pop" key={item.id}>
-                            <input
-                              type="radio"
-                              id={item.id}
-                              name={item.name}
-                              value={item.value}
-                              checked={currentRoof?.roofAngleSet === item.value}
-                              onChange={(e) => setCurrentRoof({ ...currentRoof, roofAngleSet: e.target.value })}
-                            />
-                            <label htmlFor={item.id}>{getMessage(item.message)}</label>
+                        roofAngleSetArray.map((item, index) => (
+                          <div className="outline-form">
+                            <span>
+                              <div className="d-check-radio pop" key={item.id}>
+                                <input
+                                  type="radio"
+                                  id={item.id}
+                                  name={item.name}
+                                  value={item.value}
+                                  checked={currentRoof?.roofAngleSet === item.value}
+                                  onChange={(e) => setCurrentRoof({ ...currentRoof, roofAngleSet: e.target.value })}
+                                />
+                                <label htmlFor={item.id}>{getMessage(item.message)}</label>
+                              </div>
+                            </span>
+                            <div className="input-grid mr5">
+                              <input
+                                type="number"
+                                className="input-origin block"
+                                defaultValue={4}
+                                readOnly={currentRoof?.roofAngleSet !== item.value}
+                                value={index === 0 ? currentRoof?.pitch : currentRoof?.angle}
+                                onChange={(e) =>
+                                  index === 0
+                                    ? setCurrentRoof({ ...currentRoof, pitch: e.target.value })
+                                    : setCurrentRoof({ ...currentRoof, angle: e.target.value })
+                                }
+                              />
+                            </div>
+                            <span className="thin">{index === 0 ? '寸' : '度'}</span>
                           </div>
                         ))}
                     </div>
diff --git a/src/styles/_modal.scss b/src/styles/_modal.scss
index bbdf38f8..95db2ea7 100644
--- a/src/styles/_modal.scss
+++ b/src/styles/_modal.scss
@@ -523,6 +523,17 @@ $alert-color: #101010;
     display: flex;
     align-items: center;
     gap: 10px;
+    &.place{
+        gap: 15px;
+        .outline-form{
+            span{
+                width: fit-content;
+            }
+            .input-grid{
+                width: 80px;
+            }
+        }
+    }
 }
 .placement-option{
     display: flex;

From abc98a959287489714c41f01ebe07621d787c1d0 Mon Sep 17 00:00:00 2001
From: basssy <basssy@interplug.co.kr>
Date: Thu, 13 Feb 2025 15:06:24 +0900
Subject: [PATCH 6/6] #728

---
 src/components/estimate/Estimate.jsx          | 32 +++++++++++--------
 .../estimate/popup/EstimateCopyPop.jsx        |  5 ++-
 src/components/floor-plan/CanvasMenu.jsx      |  5 +++
 .../estimate/useEstimateController.js         | 15 +++++++--
 4 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx
index 609ba73e..be1ea754 100644
--- a/src/components/estimate/Estimate.jsx
+++ b/src/components/estimate/Estimate.jsx
@@ -74,7 +74,7 @@ export default function Estimate({}) {
   const objectRecoil = useRecoilValue(floorPlanObjectState)
   const currentPid = searchParams.get('pid')
   //견적서 상세데이터
-  const { estimateContextState, setEstimateContextState, addItem, handleEstimateFileDownload } = useEstimateController(currentPid)
+  const { estimateContextState, setEstimateContextState, addItem, handleEstimateFileDownload } = useEstimateController(currentPid, false)
 
   const { selectedPlan } = usePlan()
 
@@ -465,6 +465,10 @@ export default function Estimate({}) {
 
   //Pricing 버튼
   const handlePricing = async (showPriceCd) => {
+    //todo: 추후 YJSS가 다시 나타날 경우 아래 swalFire 제거 필요
+    if (estimateContextState.estimateType === 'YJSS') {
+      return swalFire({ text: getMessage('estimate.detail.save.requiredEstimateType'), type: 'alert', icon: 'warning' })
+    }
     const param = {
       saleStoreId: session.storeId,
       sapSalesStoreCd: session.custCd,
@@ -483,7 +487,7 @@ export default function Estimate({}) {
       })
 
       if (!pass) {
-        //Pricing이 누락된 아이템이 있습니다. Pricing을 진행해주세요.
+        //Pricing이 누락된 아이템이 있습니다. 제품 선택 후 Pricing을 진행해주세요.
         return swalFire({
           text: getMessage('estimate.detail.showPrice.pricingBtn.noItemId'),
           type: 'alert',
@@ -581,7 +585,6 @@ export default function Estimate({}) {
   //주택PKG input 변경
   const onChangePkgAsp = (value) => {
     if (estimateContextState.estimateType === 'YJSS') {
-      // let newValue = value.replace(/[^0-9.]/g, '')
       let newValue = (value || '0').replace(/[^0-9.]/g, '')
       if (newValue.length > 1) {
         newValue = newValue.replace(/(^0+)/, '')
@@ -605,8 +608,6 @@ export default function Estimate({}) {
       let totVolKw = estimateContextState.totVolKw * 1000
       let pkgTotPrice = parseFloat(pkgAsp?.replaceAll(',', '')) * totVolKw * 1000
 
-      // pkgAsp = formatNumberWithComma(parseFloat(pkgAsp).toFixed(2))
-
       setEstimateContextState({
         pkgAsp: pkgAsp,
         pkgTotPrice: pkgTotPrice.toFixed(2),
@@ -687,6 +688,10 @@ export default function Estimate({}) {
 
   // 아이템 자동완성 검색시 아이템 추가/변경시
   const onChangeDisplayItem = (itemId, dispOrder, index) => {
+    //todo: 추후 YJSS가 다시 나타날 경우 아래 swalFire 제거 필요
+    if (estimateContextState.estimateType === 'YJSS') {
+      return swalFire({ text: getMessage('estimate.detail.save.requiredEstimateType'), type: 'alert', icon: 'warning' })
+    }
     const param = {
       itemId: itemId,
       coldZoneFlg: estimateContextState?.coldRegionFlg,
@@ -740,8 +745,6 @@ export default function Estimate({}) {
             return { ...item, ...updates, saleTotPrice: '' }
           } else {
             if (estimateContextState.estimateType === 'YJSS') {
-              // return { ...item, ...updates, salePrice: '', saleTotPrice: '' }
-              //확인
               if (updates.pkgMaterialFlg === '1') {
                 return { ...item, ...updates, showSalePrice: updates.salePrice }
               } else {
@@ -1272,7 +1275,7 @@ export default function Estimate({}) {
                     </th>
                     <td colSpan={3}>
                       <div className="radio-wrap">
-                        <div className="d-check-radio light mr10">
+                        {/* <div className="d-check-radio light mr10">
                           <input
                             type="radio"
                             name="estimateType"
@@ -1286,7 +1289,7 @@ export default function Estimate({}) {
                             }}
                           />
                           <label htmlFor="YJSS">{getMessage('estimate.detail.estimateType.yjss')}</label>
-                        </div>
+                        </div> */}
                         <div className="d-check-radio light">
                           <input
                             type="radio"
@@ -1295,7 +1298,8 @@ export default function Estimate({}) {
                             value={'YJOD'}
                             checked={estimateContextState?.estimateType === 'YJOD' ? true : false}
                             onChange={(e) => {
-                              setHandlePricingFlag(true)
+                              //todo: 추후 YJSS가 다시 나타날 경우 아래 주석풀기
+                              // setHandlePricingFlag(true)
                               setEstimateContextState({ estimateType: e.target.value })
                             }}
                           />
@@ -1576,10 +1580,10 @@ export default function Estimate({}) {
             </div>
             <div className="esimate-wrap">
               <div className="estimate-list-wrap one">
-                <div className="estimate-box">
+                {/* <div className="estimate-box">
                   <div className="estimate-tit">{getMessage('estimate.detail.sepcialEstimateProductInfo.totAmount')}</div>
                   <div className="estimate-name blue">{convertNumberToPriceDecimal(estimateContextState?.totAmount)}</div>
-                </div>
+                </div> */}
                 <div className="estimate-box">
                   <div className="estimate-tit">{getMessage('estimate.detail.sepcialEstimateProductInfo.totVolKw')}</div>
                   <div className="estimate-name blue">{convertNumberToPriceDecimalToFixed(estimateContextState?.totVolKw, 2)}</div>
@@ -1599,7 +1603,7 @@ export default function Estimate({}) {
               </div>
             </div>
             {/* YJOD면 아래영역 숨김 */}
-            <div className="common-table bt-able" style={{ display: estimateContextState?.estimateType === 'YJSS' ? '' : 'none' }}>
+            {/* <div className="common-table bt-able" style={{ display: estimateContextState?.estimateType === 'YJSS' ? '' : 'none' }}>
               <table>
                 <colgroup>
                   <col style={{ width: '160px' }} />
@@ -1634,7 +1638,7 @@ export default function Estimate({}) {
                   </tr>
                 </tbody>
               </table>
-            </div>
+            </div> */}
             {/* 제품정보 끝 */}
             {/* 가격표시영역시작 */}
             <div className="estimate-product-option">
diff --git a/src/components/estimate/popup/EstimateCopyPop.jsx b/src/components/estimate/popup/EstimateCopyPop.jsx
index 35d8d54b..6ff2e540 100644
--- a/src/components/estimate/popup/EstimateCopyPop.jsx
+++ b/src/components/estimate/popup/EstimateCopyPop.jsx
@@ -2,7 +2,7 @@
 import { useEffect, useState, useContext, useRef } from 'react'
 import { useMessage } from '@/hooks/useMessage'
 import { useAxios } from '@/hooks/useAxios'
-import Select, { components } from 'react-select'
+import Select from 'react-select'
 import { SessionContext } from '@/app/SessionProvider'
 import { isEmptyArray, isObjectNotEmpty } from '@/util/common-utils'
 import { useEstimateController } from '@/hooks/floorPlan/estimate/useEstimateController'
@@ -11,7 +11,7 @@ export default function EstimateCopyPop({ planNo, setEstimateCopyPopupOpen }) {
   const { getMessage } = useMessage()
   const { get } = useAxios()
 
-  const { handleEstimateCopy, estimateContextState } = useEstimateController(planNo)
+  const { handleEstimateCopy, estimateContextState } = useEstimateController(planNo, true)
 
   const { session } = useContext(SessionContext)
 
@@ -282,7 +282,6 @@ export default function EstimateCopyPop({ planNo, setEstimateCopyPopupOpen }) {
                       type="text"
                       className="input-light"
                       required
-                      // defaultValue={estimateContextState?.charger}
                       defaultValue={session?.userNm}
                       onChange={(e) => {
                         setCopyReceiveUser(e.target.value)
diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx
index b80eceac..3dd85620 100644
--- a/src/components/floor-plan/CanvasMenu.jsx
+++ b/src/components/floor-plan/CanvasMenu.jsx
@@ -354,6 +354,11 @@ export default function CanvasMenu(props) {
 
   // 견적서 초기화 버튼
   const handleEstimateReset = () => {
+    //todo: 추후 YJSS가 다시 나타날 경우 아래 swalFire 제거 필요
+    if (estimateRecoilState.estimateType === 'YJSS') {
+      return swalFire({ text: getMessage('estimate.detail.save.requiredEstimateType'), type: 'alert', icon: 'warning' })
+    }
+
     swalFire({
       text: getMessage('estimate.detail.reset.confirmMsg'),
       type: 'confirm',
diff --git a/src/hooks/floorPlan/estimate/useEstimateController.js b/src/hooks/floorPlan/estimate/useEstimateController.js
index c63633cc..b3c4c452 100644
--- a/src/hooks/floorPlan/estimate/useEstimateController.js
+++ b/src/hooks/floorPlan/estimate/useEstimateController.js
@@ -18,7 +18,7 @@ const updateItemInList = (itemList, dispOrder, updates) => {
   return itemList.map((item) => (item.dispOrder === dispOrder ? { ...item, ...updates } : item))
 }
 
-export const useEstimateController = (planNo) => {
+export const useEstimateController = (planNo, flag) => {
   const { swalFire } = useSwal()
   const [fileList, setFileList] = useState([])
   const { setIsGlobalLoading } = useContext(QcastContext)
@@ -42,7 +42,9 @@ export const useEstimateController = (planNo) => {
       let recoilObjectNo = objectRecoil.floorPlanObjectNo ? objectRecoil.floorPlanObjectNo : searchParams.get('objectNo')
 
       if (recoilObjectNo && planNo) {
-        fetchSetting(recoilObjectNo, planNo)
+        if (!flag) {
+          fetchSetting(recoilObjectNo, planNo)
+        }
       }
     }
   }, [])
@@ -160,6 +162,11 @@ export const useEstimateController = (planNo) => {
 
   //견적서 저장
   const handleEstimateSubmit = async () => {
+    //todo: 추후 YJSS가 다시 나타날 경우 아래 swalFire 제거 필요
+    if (estimateData.estimateType === 'YJSS') {
+      return swalFire({ text: getMessage('estimate.detail.save.requiredEstimateType'), type: 'alert', icon: 'warning' })
+    }
+
     //0. 필수체크
     let flag = true
     let originFileFlg = false
@@ -409,6 +416,10 @@ export const useEstimateController = (planNo) => {
    *  T01관리자 계정 및 1차판매점에게만 제공
    */
   const handleEstimateCopy = async (sendPlanNo, copyReceiveUser, saleStoreId, otherSaleStoreId) => {
+    //todo: 추후 YJSS가 다시 나타날 경우 아래 swalFire 제거 필요
+    if (estimateData.estimateType === 'YJSS') {
+      return swalFire({ text: getMessage('estimate.detail.save.requiredEstimateType'), type: 'alert', icon: 'warning' })
+    }
     if (saleStoreId === '') {
       return swalFire({
         text: getMessage('estimate.detail.productFeaturesPopup.requiredStoreId'),