山东反馈修正

web/building_saas/standard_interface/export/shandong_common.js

@@ -1475,12 +1475,22 @@ INTERFACE_EXPORT = (() => {
           }
           return rst;
         };
+        const _getRation = function(rationId) {
+          let rst = null;
+          for (let ration of tenderProject.Ration.datas) {
+            if (ration.ID === rationId) {
+              rst = ration;
+              break;
+            }
+          }
+          return rst;
+        };
         const _createNode = function(billIdKey, bill) {
           if (cacheObj[billIdKey]) {
             //1. 叶子清单，先创建清单Item
             let bQtn = 1;
-            if (bill.hasOwnProperty('quantity')) {
-              bQtn = parseFloat(bill.quantity);
+            if (bill.data.hasOwnProperty('quantity')) {
+              bQtn = parseFloat(bill.data.quantity);
               if (isNaN(bQtn)) bQtn = 1;
             }
             let billMainMaterialTtl = cacheObj[billIdKey].mainMaterialFee/bQtn;
@@ -1558,7 +1568,9 @@ INTERFACE_EXPORT = (() => {
               if (rglj.billsItemID === parentBill.data.ID) {
                 let gljQty = parseFloat(rglj.quantity);
                 if (isNaN(gljQty)) gljQty = 0;
-                let gljRationQty = parseFloat(rglj.rationItemQuantity);
+                let ration = _getRation(rglj.rationID);
+                let gljRationQty = 0;
+                if (ration) gljRationQty = parseFloat(ration.quantity);
                 if (isNaN(gljRationQty)) gljRationQty = 0;
                 let gljCns = gljQty * gljRationQty;
                 let prjGlj = _getPrjGLJ(rglj.projectGLJID);