Compare commits

..

No commits in common. "4a67c5ff3489b9d23bfd259e7466f630d5261980" and "c3e2562a194e6f4e2a56ded7e36a5ba3f2cf41f2" have entirely different histories.

3 changed files with 9 additions and 11 deletions

View File

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

View File

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

View File

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