|
|
@@ -1685,11 +1685,11 @@ INTERFACE_EXPORT = (() => {
|
|
|
}
|
|
|
tenderProject.ration_glj.datas.forEach((rglj) => {
|
|
|
if (rglj.billsItemID === parentBill.data.ID) {
|
|
|
- let gljQty = parseFloat(rglj.quantity);
|
|
|
+ let gljQty = parseFloat(rglj.tenderQuantity || rglj.quantity);
|
|
|
if (isNaN(gljQty)) gljQty = 0;
|
|
|
let ration = _getRation(rglj.rationID);
|
|
|
let gljRationQty = 0;
|
|
|
- if (ration) gljRationQty = parseFloat(ration.quantity);
|
|
|
+ if (ration) gljRationQty = parseFloat(ration.tenderQuantity || ration.quantity);
|
|
|
if (isNaN(gljRationQty)) gljRationQty = 0;
|
|
|
let gljCns = gljQty * gljRationQty;
|
|
|
let prjGlj = _getPrjGLJ(rglj.projectGLJID);
|