|
@@ -340,13 +340,13 @@ async function summateResults (query,detailList,decimal) {
|
|
|
}
|
|
|
if(query.hasOwnProperty('rationID')){
|
|
|
let ration = await ration_model.findOne({'ID':query.rationID,'projectID':query.projectID,deleteInfo: null});
|
|
|
- getQuantityByUnit(quantity,ration.unit);
|
|
|
+ quantity = getQuantityByUnit(quantity,ration.unit);
|
|
|
quantity = scMathUtil.roundTo(quantity, -decimal.ration.quantity);
|
|
|
await ration_model.update({'ID':query.rationID,'projectID':query.projectID,deleteInfo: null},{quantity:quantity,isFromDetail:1});
|
|
|
}else {
|
|
|
let bill = await bill_model.findOne({'ID':query.billID,'projectID':query.projectID,deleteInfo: null});
|
|
|
decimal = await decimal_facade.getBillsQuantityDecimal(query.projectID,bill.unit);
|
|
|
- getQuantityByUnit(quantity,bill.unit);
|
|
|
+ quantity = getQuantityByUnit(quantity,bill.unit);
|
|
|
quantity = scMathUtil.roundTo(quantity, -decimal);
|
|
|
await bill_model.update({'ID':query.billID,'projectID':query.projectID,deleteInfo: null},{quantity:quantity,isFromDetail:1});
|
|
|
}
|