- 견적서 API circuitItemList 내용 수정
This commit is contained in:
parent
bc07fc9e04
commit
89f5c2d708
@ -563,8 +563,8 @@ export default function CircuitTrestleSetting({ id }) {
|
|||||||
goodsNo: model.goodsNo,
|
goodsNo: model.goodsNo,
|
||||||
serQtyList: [
|
serQtyList: [
|
||||||
{
|
{
|
||||||
serQty: result[index + 1].maxValue,
|
serQty: result[(index + 1).toString()] ? result[(index + 1).toString()].maxValue : 0,
|
||||||
paralQty: result[index + 1].count,
|
paralQty: result[(index + 1).toString()] ? result[(index + 1).toString()].count : 0,
|
||||||
rmdYn: 'Y',
|
rmdYn: 'Y',
|
||||||
usePossYn: 'Y',
|
usePossYn: 'Y',
|
||||||
roofSurfaceList: canvas
|
roofSurfaceList: canvas
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import { basicSettingState, trestleDisplaySelector } from '@/store/settingAtom'
|
|||||||
import { useSwal } from '@/hooks/useSwal'
|
import { useSwal } from '@/hooks/useSwal'
|
||||||
import { useContext } from 'react'
|
import { useContext } from 'react'
|
||||||
import { QcastContext } from '@/app/QcastProvider'
|
import { QcastContext } from '@/app/QcastProvider'
|
||||||
|
import { useCircuitTrestle } from '@/hooks/useCirCuitTrestle'
|
||||||
|
|
||||||
// 모듈간 같은 행, 열의 마진이 10 이하인 경우는 같은 행, 열로 간주
|
// 모듈간 같은 행, 열의 마진이 10 이하인 경우는 같은 행, 열로 간주
|
||||||
const MODULE_MARGIN = 10
|
const MODULE_MARGIN = 10
|
||||||
@ -22,6 +23,9 @@ export const useTrestle = () => {
|
|||||||
const isTrestleDisplay = useRecoilValue(trestleDisplaySelector)
|
const isTrestleDisplay = useRecoilValue(trestleDisplaySelector)
|
||||||
const { swalFire } = useSwal()
|
const { swalFire } = useSwal()
|
||||||
const { setIsGlobalLoading } = useContext(QcastContext)
|
const { setIsGlobalLoading } = useContext(QcastContext)
|
||||||
|
|
||||||
|
const { getSelectedPcsItemList } = useCircuitTrestle()
|
||||||
|
|
||||||
const apply = () => {
|
const apply = () => {
|
||||||
const notAllocationModules = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE && !obj.circuit)
|
const notAllocationModules = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE && !obj.circuit)
|
||||||
if (notAllocationModules.length > 0) {
|
if (notAllocationModules.length > 0) {
|
||||||
@ -723,11 +727,7 @@ export const useTrestle = () => {
|
|||||||
|
|
||||||
// circuitItemList 중복제거
|
// circuitItemList 중복제거
|
||||||
circuitItemList = circuitItemList.filter((item, index) => circuitItemList.indexOf(item) === index)
|
circuitItemList = circuitItemList.filter((item, index) => circuitItemList.indexOf(item) === index)
|
||||||
circuitItemList = circuitItemList.map((circuitId) => {
|
circuitItemList = getSelectedPcsItemList()
|
||||||
return {
|
|
||||||
itemId: circuitId,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
return { itemList, northArrangement, roofSurfaceList, circuitItemList }
|
return { itemList, northArrangement, roofSurfaceList, circuitItemList }
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user