qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into feature/redo-undo

Browse Source
This commit is contained in:
hyojun.choi 2026-06-22 13:35:04 +09:00
commit c93f098939
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
View File

@ -611,6 +611,7 @@ export default function CircuitTrestleSetting({ id }) {
itemId: item.itemId, itemId: item.itemId,
pcsMkrCd: item.pcsMkrCd, pcsMkrCd: item.pcsMkrCd,
pcsSerCd: item.pcsSerCd, pcsSerCd: item.pcsSerCd,
pcsSerParallelYn: item.pcsSerParallelYn,
} }
}), }),
} }
@ -848,7 +849,6 @@ export default function CircuitTrestleSetting({ id }) {
}) })
const pcs = [] const pcs = []
console.log(stepUpListData)
stepUpListData[0].pcsItemList.map((item, index) => { stepUpListData[0].pcsItemList.map((item, index) => {
const targetTpCds = pcsModuleTpCds[selectedModels[index]?.id] const targetTpCds = pcsModuleTpCds[selectedModels[index]?.id]
return item.serQtyList return item.serQtyList
@ -895,9 +895,6 @@ export default function CircuitTrestleSetting({ id }) {
} }
const getPcsOptCd = (index) => { const getPcsOptCd = (index) => {
console.log(selectedModels)
console.log(seletedMainOption)
console.log(seletedSubOption)
if (selectedModels.some((model) => model.pcsSerParallelYn === 'Y')) { if (selectedModels.some((model) => model.pcsSerParallelYn === 'Y')) {
if (selectedModels.length > 1) { if (selectedModels.length > 1) {
if (index === 0) { if (index === 0) {
@ -996,6 +993,7 @@ export default function CircuitTrestleSetting({ id }) {
itemId: model.itemId, itemId: model.itemId,
itemNm: model.itemNm, itemNm: model.itemNm,
goodsNo: model.goodsNo, goodsNo: model.goodsNo,
pcsSerParallelYn: model.pcsSerParallelYn,
serQtyList: [ serQtyList: [
{ {
serQty: result[(index + 1).toString()] ? result[(index + 1).toString()].maxValue : 0, serQty: result[(index + 1).toString()] ? result[(index + 1).toString()].maxValue : 0,

2
src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
View File

@ -340,6 +340,7 @@ export default function PassivityCircuitAllocation(props) {
itemId: model.itemId, itemId: model.itemId,
itemNm: model.itemNm, itemNm: model.itemNm,
goodsNo: model.goodsNo, goodsNo: model.goodsNo,
pcsSerParallelYn: model.pcsSerParallelYn,
serQtyList: [ serQtyList: [
{ {
serQty: result[(index + 1).toString()] ? result[(index + 1).toString()].maxValue : 0, serQty: result[(index + 1).toString()] ? result[(index + 1).toString()].maxValue : 0,
@ -565,6 +566,7 @@ export default function PassivityCircuitAllocation(props) {
itemId: model.itemId, itemId: model.itemId,
itemNm: model.itemNm, itemNm: model.itemNm,
goodsNo: model.goodsNo, goodsNo: model.goodsNo,
pcsSerParallelYn: model.pcsSerParallelYn,
serQtyList: [ serQtyList: [
{ {
serQty: targetModules.length, serQty: targetModules.length,

12
src/hooks/useCirCuitTrestle.js
View File

@ -51,6 +51,7 @@ export function useCircuitTrestle(executeEffect = false) {
itemId: model.itemId, itemId: model.itemId,
pcsMkrCd: model.pcsMkrCd, pcsMkrCd: model.pcsMkrCd,
pcsSerCd: model.pcsSerCd, pcsSerCd: model.pcsSerCd,
pcsSerParallelYn: model.pcsSerParallelYn,
} }
}) })
} }
@ -59,6 +60,7 @@ export function useCircuitTrestle(executeEffect = false) {
itemId: model.itemId, itemId: model.itemId,
pcsMkrCd: model.pcsMkrCd, pcsMkrCd: model.pcsMkrCd,
pcsSerCd: model.pcsSerCd, pcsSerCd: model.pcsSerCd,
pcsSerParallelYn: model.pcsSerParallelYn,
} }
}) })
} }
@ -73,6 +75,7 @@ export function useCircuitTrestle(executeEffect = false) {
itemId: model.itemId, itemId: model.itemId,
pcsMkrCd: model.pcsMkrCd, pcsMkrCd: model.pcsMkrCd,
pcsSerCd: model.pcsSerCd, pcsSerCd: model.pcsSerCd,
pcsSerParallelYn: model.pcsSerParallelYn,
} }
}) })
} }
@ -81,6 +84,7 @@ export function useCircuitTrestle(executeEffect = false) {
itemId: model.itemId, itemId: model.itemId,
pcsMkrCd: model.pcsMkrCd, pcsMkrCd: model.pcsMkrCd,
pcsSerCd: model.pcsSerCd, pcsSerCd: model.pcsSerCd,
pcsSerParallelYn: model.pcsSerParallelYn,
} }
}) })
} }
@ -109,13 +113,11 @@ export function useCircuitTrestle(executeEffect = false) {
const result = roofSurfaceList const result = roofSurfaceList
.map((obj) => { .map((obj) => {
const parent = canvas.getObjects().filter((o) => o.id === obj.parentId)[0]
return { return {
roofSurfaceId: obj.id, roofSurfaceId: obj.id,
roofSurface: canvas roofSurface: (parent?.directionText ?? '').replace(/[0-9]/g, ''),
.getObjects() roofSurfaceIncl: +(parent?.roofMaterial?.pitch ?? 0),
.filter((o) => o.id === obj.parentId)[0]
.directionText.replace(/[0-9]/g, ''),
roofSurfaceIncl: +canvas.getObjects().filter((o) => o.id === obj.parentId)[0].roofMaterial.pitch,
moduleList: getModuleList(obj).map((module) => { moduleList: getModuleList(obj).map((module) => {
return { return {
itemId: module.moduleInfo.itemId, itemId: module.moduleInfo.itemId,