Compare commits
No commits in common. "7e842fb34dc8e899088f95c84af8906eb587670a" and "cde1ffb0eaa2001cbe64c3dcb4333ff115e4969e" have entirely different histories.
7e842fb34d
...
cde1ffb0ea
@ -609,7 +609,6 @@ 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,
|
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
}
|
}
|
||||||
@ -846,6 +845,7 @@ 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
|
||||||
@ -892,6 +892,9 @@ 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) {
|
||||||
@ -990,7 +993,6 @@ 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,
|
||||||
|
|||||||
@ -340,7 +340,6 @@ 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,
|
||||||
@ -566,7 +565,6 @@ 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,
|
||||||
|
|||||||
@ -51,7 +51,6 @@ 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,
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -60,7 +59,6 @@ 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,
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -75,7 +73,6 @@ 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,
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -84,7 +81,6 @@ 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,
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -113,11 +109,13 @@ 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: (parent?.directionText ?? '').replace(/[0-9]/g, ''),
|
roofSurface: canvas
|
||||||
roofSurfaceIncl: +(parent?.roofMaterial?.pitch ?? 0),
|
.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) => {
|
moduleList: getModuleList(obj).map((module) => {
|
||||||
return {
|
return {
|
||||||
itemId: module.moduleInfo.itemId,
|
itemId: module.moduleInfo.itemId,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user