견적서 소스정리 & 첨부파일

src/components/estimate/Estimate.jsx

@@ -562,7 +562,7 @@ export default function Estimate({ params }) {
     let updateList = []
     let updates = {}
     get({ url: apiUrl }).then((res) => {
-      console.log('아이템디테일::::::::', res)
+      // console.log('아이템디테일::::::::', res)
       updates.objectNo = objectNo
       updates.planNo = planNo
       updates.itemId = res.itemId
@@ -696,98 +696,61 @@ export default function Estimate({ params }) {
 
   useEffect(() => {
     if (itemChangeYn) {
-      let totAmount = 0
+      let totals = {
-      let totVolKw = 0
+        totAmount: 0,
-      let supplyPrice = 0
+        totVolKw: 0,
-      let vatPrice = 0
+        supplyPrice: 0,
-      let totPrice = 0
+        vatPrice: 0,
-      let addSupplyPrice = 0
+        totPrice: 0,
-      let pkgTotPrice = 0
+        addSupplyPrice: 0,
-      if (estimateContextState.estimateType === 'YJOD') {
+        pkgTotPrice: 0,
-        estimateContextState.itemList.sort((a, b) => {
+      }
-          return a.dispOrder - b.dispOrder
-        })
-        // console.log('YJOD 토탈만들어주기::::::::::', estimateContextState.itemList)
 
-        //아이템에서 제품관련 특이사항 중복제거해서 만드는 함수
+      const calculateYJODTotals = (itemList) => {
-        makeUniqueSpecialNoteCd(estimateContextState.itemList)
+        itemList.sort((a, b) => a.dispOrder - b.dispOrder)
+        makeUniqueSpecialNoteCd(itemList)
 
-        estimateContextState.itemList.map((item) => {
+        itemList.forEach((item) => {
           delete item.showSalePrice
           delete item.showSaleTotPrice
           if (item.delFlg === '0') {
-            let amount = Number(item?.amount?.replace(/[^0-9]/g, '').replaceAll(',', ''))
+            let amount = Number(item.amount?.replace(/[^0-9]/g, '').replaceAll(',', '')) || 0
-            if (isNaN(amount)) {
+            let price = Number(item.saleTotPrice?.replaceAll(',', '')) || 0
-              amount = '0'
+
-            }
-            let price = Number(item?.saleTotPrice?.replaceAll(',', ''))
-            if (isNaN(price)) {
-              price = 0
-            }
             if (item.moduleFlg === '1') {
-              //용량(Kw)은 모듈플래그 1만 합산
               const volKw = (item.pnowW * amount) / 1000
-              // const volKw = item.pnowW * amount
+              totals.totVolKw += volKw
-              totVolKw += volKw
             }
-            // const price
+            totals.totAmount += amount
-            totAmount += amount
+            totals.supplyPrice += price
-            supplyPrice += price
           }
         })
 
-        vatPrice = supplyPrice * 0.1
+        totals.vatPrice = totals.supplyPrice * 0.1
-        totPrice = supplyPrice + vatPrice
+        totals.totPrice = totals.supplyPrice + totals.vatPrice
+      }
 
-        setEstimateContextState({
+      const calculateYJSSTotals = (itemList) => {
-          totAmount: totAmount,
+        itemList.sort((a, b) => a.dispOrder - b.dispOrder)
-          totVolKw: totVolKw.toFixed(3),
+        makeUniqueSpecialNoteCd(itemList)
-          supplyPrice: supplyPrice.toFixed(3),
+
-          vatPrice: vatPrice.toFixed(3),
+        itemList.forEach((item) => {
-          totPrice: totPrice.toFixed(3),
-        })
-      } else {
-        //아이템에서 제품관련 특이사항 중복제거해서 만드는 함수
-        makeUniqueSpecialNoteCd(estimateContextState.itemList)
-        //YJSS
-        // console.log('YJSS 토탈만들어주기::::::::::', estimateContextState.itemList)
-        estimateContextState.itemList.sort((a, b) => {
-          return a.dispOrder - b.dispOrder
-        })
-        estimateContextState.itemList.map((item) => {
           if (item.delFlg === '0') {
-            let amount = Number(item.amount?.replace(/[^0-9]/g, '').replaceAll(',', ''))
+            let amount = Number(item.amount?.replace(/[^0-9]/g, '').replaceAll(',', '')) || 0
-            let salePrice = Number(item.salePrice?.replaceAll(',', ''))
+            let salePrice = Number(item.salePrice?.replaceAll(',', '')) || 0
-            let saleTotPrice = Number(item.saleTotPrice?.replaceAll(',', ''))
 
-            if (isNaN(amount)) {
-              amount = '0'
-            }
-
-            if (isNaN(saleTotPrice)) {
-              saleTotPrice = 0
-            }
-
-            if (isNaN(salePrice)) {
-              salePrice = 0
-            }
             if (item.moduleFlg === '1') {
-              //용량(Kw)은 모듈플래그 1만 합산
               const volKw = (item.pnowW * amount) / 1000
-              totVolKw += volKw
+              totals.totVolKw += volKw
             }
 
-            // const saleTotPrice
+            totals.totAmount += amount
-            totAmount += amount
             if (item.pkgMaterialFlg === '1') {
               const saleTotPrice = amount * salePrice
-              //다시계산하기
+              totals.addSupplyPrice += saleTotPrice
-              //YJSS는 PKG제외상품들만(1) 모아서 수량 * 단가를 공급가액(supplyPrice)에 추가로 더해줌
-              addSupplyPrice += saleTotPrice
             }
 
             if (!item.paDispOrder) {
-              //paDispOrder
               if (item.pkgMaterialFlg === '0') {
                 item.showSalePrice = '0'
                 item.showSaleTotPrice = '0'
@@ -795,34 +758,40 @@ export default function Estimate({ params }) {
             }
           }
         })
-        pkgTotPrice = estimateContextState.pkgAsp.replaceAll(',', '') * totVolKw * 1000
-        setEstimateContextState({
-          pkgTotPrice: pkgTotPrice,
-        })
 
-        supplyPrice = addSupplyPrice + pkgTotPrice
+        totals.pkgTotPrice = Number(estimateContextState.pkgAsp.replaceAll(',', '')) * totals.totVolKw * 1000
-        vatPrice = supplyPrice * 0.1
+        totals.supplyPrice = totals.addSupplyPrice + totals.pkgTotPrice
-        totPrice = supplyPrice + vatPrice
+        totals.vatPrice = totals.supplyPrice * 0.1
+        totals.totPrice = totals.supplyPrice + totals.vatPrice
+      }
+
+      if (estimateContextState.estimateType === 'YJOD') {
+        calculateYJODTotals(estimateContextState.itemList)
         setEstimateContextState({
-          totAmount: totAmount,
+          totAmount: totals.totAmount,
-          totVolKw: totVolKw.toFixed(3),
+          totVolKw: totals.totVolKw.toFixed(3),
-          supplyPrice: supplyPrice.toFixed(3),
+          supplyPrice: totals.supplyPrice.toFixed(3),
-          vatPrice: vatPrice.toFixed(3),
+          vatPrice: totals.vatPrice.toFixed(3),
-          totPrice: totPrice.toFixed(3),
+          totPrice: totals.totPrice.toFixed(3),
+        })
+      } else if (estimateContextState.estimateType === 'YJSS') {
+        calculateYJSSTotals(estimateContextState.itemList)
+        setEstimateContextState({
+          pkgTotPrice: totals.pkgTotPrice,
+          totAmount: totals.totAmount,
+          totVolKw: totals.totVolKw.toFixed(3),
+          supplyPrice: totals.supplyPrice.toFixed(3),
+          vatPrice: totals.vatPrice.toFixed(3),
+          totPrice: totals.totPrice.toFixed(3),
         })
       }
 
       setItemChangeYn(false)
     } else {
-      estimateContextState.itemList.map((item) => {
+      estimateContextState.itemList.forEach((item) => {
-        if (estimateContextState.estimateType === 'YJSS') {
+        if (estimateContextState.estimateType === 'YJSS' && !item.paDispOrder && item.pkgMaterialFlg === '0') {
-          if (!item.paDispOrder) {
+          item.showSalePrice = '0'
-            //paDispOrder
+          item.showSaleTotPrice = '0'
-            if (item.pkgMaterialFlg === '0') {
-              item.showSalePrice = '0'
-              item.showSaleTotPrice = '0'
-            }
-          }
         }
       })
     }
@@ -1160,13 +1129,7 @@ export default function Estimate({ params }) {
                   {specialNoteList.length > 0 &&
                     specialNoteList.map((row) => {
                       return (
-                        <div
+                        <div key={uuidv4()} className="special-note-check-item">
-                          key={uuidv4()}
-                          className="special-note-check-item"
-                          onClick={(event) => {
-                            // settingShowContent(row.code, event)
-                          }}
-                        >
                           <div className="d-check-box light">
                             <input
                               type="checkbox"
@@ -1181,9 +1144,7 @@ export default function Estimate({ params }) {
                                 settingShowContent(row.code, event)
                               }}
                             />
-                            <label htmlFor={row.code}>
+                            <label htmlFor={row.code}>{row.codeNm}</label>
-                              {row.codeNm} / {row.code}
-                            </label>
                           </div>
                         </div>
                       )
@@ -1386,7 +1347,6 @@ export default function Estimate({ params }) {
                 <thead>
                   <tr>
                     <th>
-                      {/* <div className="d-check-box pop no-text" style={{ display: 'none' }}> */}
                       <div className="d-check-box pop no-text">
                         <input type="checkbox" id="ch97" checked={isSelectedAll()} onChange={onChangeSelectAll} />
                         <label htmlFor="ch97"></label>

src/hooks/floorPlan/estimate/useEstimateController.js

@@ -3,7 +3,7 @@ import { useContext, useEffect, useReducer, useState } from 'react'
 import { useRecoilState, useRecoilValue } from 'recoil'
 import { globalLocaleStore } from '@/store/localeAtom'
 import { estimateState, floorPlanObjectState } from '@/store/floorPlanObjectAtom'
-import { isObjectNotEmpty, isNotEmptyArray } from '@/util/common-utils'
+import { isObjectNotEmpty } from '@/util/common-utils'
 import { SessionContext } from '@/app/SessionProvider'
 import { useMessage } from '@/hooks/useMessage'
 import { useRouter } from 'next/navigation'
@@ -206,7 +206,7 @@ export const useEstimateController = (planNo) => {
     if (flag && fileFlg && itemFlg) {
       //1. 첨부파일 저장시작
       const formData = new FormData()
-      if (isNotEmptyArray(estimateData.tempFileList) > 1) {
+      if (estimateData?.tempFileList?.length > 0) {
         estimateData.tempFileList.forEach((file) => {
           formData.append('files', file)
         })