|
@@ -462,6 +462,10 @@ async function CalculateQuantity (ration,billsItemID,projectID) {
|
|
|
let decimalObject =await decimal_facade.getProjectDecimal(projectID,project);
|
|
|
let quantity_decimal = (decimalObject&&decimalObject.ration&&decimalObject.ration.quantity)?decimalObject.ration.quantity:3;
|
|
|
let pbill = await bill_model.model.findOne({projectID:projectID,ID:billsItemID});
|
|
|
+ let t_unit = ration.unit.replace(/^\d+/,"");
|
|
|
+ if(t_unit!=pbill.unit){//如果定额工程量的单位去除前面的数字后不等于清单单位,定额工程量保持不变
|
|
|
+ return ;
|
|
|
+ }
|
|
|
let billsQuantity = pbill.quantity ? pbill.quantity : 0;
|
|
|
let bill_decimal = await decimal_facade.getBillsQuantityDecimal(projectID,pbill.unit,project);
|
|
|
billsQuantity=scMathUtil.roundForObj(billsQuantity,bill_decimal);
|