|
@@ -35,12 +35,15 @@ let gljUtil = {
|
|
|
let m_glj = quantityMap[m_index];
|
|
|
let p_glj = quantityMap[pkey];
|
|
|
if(m_glj&&p_glj){
|
|
|
- let quantity = scMathUtil.roundForObj(p_glj.quantity*parseFloat(m.consumption),q_decimal);
|
|
|
- let techQuantity = scMathUtil.roundForObj(p_glj.techQuantity*parseFloat(m.consumption),q_decimal);
|
|
|
- let subdivisionQuantity = scMathUtil.roundForObj(p_glj.subdivisionQuantity*parseFloat(m.consumption),q_decimal);
|
|
|
- m_glj.quantity = scMathUtil.roundForObj(m_glj.quantity+quantity,q_decimal);
|
|
|
- m_glj.techQuantity = scMathUtil.roundForObj(m_glj.techQuantity+techQuantity,q_decimal);
|
|
|
- m_glj.subdivisionQuantity = scMathUtil.roundForObj(m_glj.subdivisionQuantity+subdivisionQuantity,q_decimal);
|
|
|
+ let quantity = scMathUtil.roundForObj(parseFloat(p_glj.quantity)*parseFloat(m.consumption),q_decimal);
|
|
|
+ let techQuantity = scMathUtil.roundForObj(parseFloat(p_glj.techQuantity)*parseFloat(m.consumption),q_decimal);
|
|
|
+ let subdivisionQuantity = scMathUtil.roundForObj(parseFloat(p_glj.subdivisionQuantity)*parseFloat(m.consumption),q_decimal);
|
|
|
+ m_glj.quantity = scMathUtil.roundForObj(parseFloat(m_glj.quantity)+quantity,q_decimal);
|
|
|
+ m_glj.techQuantity = scMathUtil.roundForObj(parseFloat(m_glj.techQuantity)+techQuantity,q_decimal);
|
|
|
+ m_glj.subdivisionQuantity = scMathUtil.roundForObj(parseFloat(m_glj.subdivisionQuantity)+subdivisionQuantity,q_decimal);
|
|
|
+ if(m_glj.id == 6832){
|
|
|
+ console.log(m_glj.quantity)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|