|
|
@@ -1217,14 +1217,14 @@ async function CalculateQuantity (ration,billsItemID,projectID) {
|
|
|
let b_unit = pbill.unit?pbill.unit:"";
|
|
|
ration.quantityEXP="QDL";
|
|
|
if((/.*kg$/i).test(b_unit)){
|
|
|
- if((/t/i).test(t_unit)) {
|
|
|
+ if((/.*t$/i).test(t_unit)) {
|
|
|
rationTimes = 1000;//如 kg 转 t 时是1000
|
|
|
ration.quantityEXP="QDL*0.001"
|
|
|
}
|
|
|
- if((/10t/i).test(t_unit)){
|
|
|
+ /* if((/10t/i).test(t_unit)){ 兼容 100t 1000t 的情况,统一都乘0.001 再除单位前的数字
|
|
|
rationTimes = 10000;//如 kg 转 10t 时是1000
|
|
|
ration.quantityEXP="QDL*0.0001"
|
|
|
- }
|
|
|
+ } */
|
|
|
}
|
|
|
|
|
|
/* let t_unit = ration.unit?ration.unit.replace(/^\d+/,""):""; 2019-02-01 养护去掉清单与定额单位的这个判断
|
|
|
@@ -1233,7 +1233,7 @@ async function CalculateQuantity (ration,billsItemID,projectID) {
|
|
|
}*/
|
|
|
let billsQuantity = pbill.quantity ? pbill.quantity : 0;
|
|
|
let bill_decimal = await decimal_facade.getBillsQuantityDecimal(projectID,pbill.unit,project);
|
|
|
- let ftimes = rationTimes == 1?FilterNumberFromUnit(ration.unit):rationTimes;
|
|
|
+ let ftimes = rationTimes * FilterNumberFromUnit(ration.unit) //rationTimes == 1?FilterNumberFromUnit(ration.unit):rationTimes;
|
|
|
billsQuantity=scMathUtil.roundForObj(billsQuantity,bill_decimal);
|
|
|
ration.quantity = scMathUtil.roundForObj(billsQuantity / ftimes ,quantity_decimal);//不管是否打勾都做转换
|
|
|
ration.contain = scMathUtil.roundForObj(ration.quantity/billsQuantity,6);
|