广东导出接口debug

web/over_write/js/chongqing_2018_export.js

@@ -1447,7 +1447,7 @@ const XMLStandard = (function () {
                 //定额人材机排序
                 rationGljData = gljUtil.sortRationGLJ(rationGljData);
                 for (let rGlj of rationGljData) {
-                    const totalQuantity = gljUtil.getTotalQuantity(rGlj,  rationData, decimal.glj.quantity, decimal.ration.quantity);
+                    const totalQuantity = gljUtil.getTotalQuantity(rGlj,  rationData, decimal.ration.quantity, decimal.glj.quantity);
                     const parsedTotalQuantity = parseFloat(totalQuantity);
                     if (skipGLJTypes.includes(rGlj.type) || !parsedTotalQuantity) {
                         continue;

web/over_write/js/guangdong_2018_export.js

@@ -1124,10 +1124,10 @@ const XMLStandard = (function () {
                     value: tenderData.name
                 },
                 // 标段 取建设项目名称
-                {
+                /* {
                     name: 'Segment',
                     value: projectData.name
-                },
+                }, */
                 // 工程类别
                 {
                     name: 'ProjectCategory', dName: '工程类别', required: true,
@@ -1136,7 +1136,7 @@ const XMLStandard = (function () {
                 // 工程类型
                 {
                     name: 'ProjectType', dName: '工程类型', required: true,
-                    value: getProjectType(tenderData, false)
+                    value: _util.getValueByKey(projectFeature, 'projType')
                 },
                 // 计价模式
                 {
@@ -1625,14 +1625,14 @@ const XMLStandard = (function () {
             _base.Element.call(this, 'ManageFees', attrs, '子目管理费');
         }
         // 工料机含量明细
-        function LabourMaterialsEquipmentsMachinesElement(glj, quantity) {
+        function LabourMaterialsEquipmentsMachinesElement(glj, quantity, noCost) {
             const attrs = [
                 // 工料机编码
                 { name: 'Number', value: glj.code },
                 // 消耗量
                 { name: 'Quantity', type: _type.DECIMAL, value: quantity },
                 // 不计价材料
-                { name: 'NOCost', typ: _type.BOOL, value: 'false' },
+                { name: 'NOCost', typ: _type.BOOL, value: noCost },
                 // 备注
                 { name: 'Remark', value: '' }
             ];
@@ -1649,7 +1649,7 @@ const XMLStandard = (function () {
                 // 费率
                 { name: 'Rate', type: _type.DECIMAL, value: feeRate },
                 // 金额
-                { name: 'Total', type: _type.DECIMAL, value: calcItem.totalFee },
+                { name: 'Total', type: _type.DECIMAL, value: calcItem.unitFee },
                 // 费用代号
                 { name: 'Code', value: CalculationCodeMap[calcItem.name] },
                 // 备注
@@ -1776,7 +1776,7 @@ const XMLStandard = (function () {
                 // 单价 取市场价
                 { name: 'Price', type: _type.DECIMAL, value: price.marketPrice },
                 // 金额 round（总消耗量*市场价，2）
-                { name: 'Total', type: _type.DECIMAL, value: scMathUtil.roundForObj(price.quantity * price.marketPrice, 2) },
+                { name: 'Total', type: _type.DECIMAL, value: scMathUtil.roundForObj(glj.quantity * price.marketPrice, 2) },
                 // 备注
                 { name: 'Remark', value: glj.remark }
             ];
@@ -1987,7 +1987,7 @@ const XMLStandard = (function () {
                 // 数量(总消耗量)
                 { name: 'Quantity', type: _type.DECIMAL, value: glj.quantity },
                 // 风险系数 从承包人主要材料设备-造价信息差额调整法读取，取不到则输出"0"
-                { name: 'ProviderExp', type: _type.DECIMAL, value: infoData && infoData.riskCoe || '0' },
+                { name: 'ProviderRate', type: _type.DECIMAL, value: infoData && infoData.riskCoe || '0' },
                 // 基准单价 从承包人主要材料设备-造价信息差额调整法读取，取不到则输出"0"
                 { name: 'ProviderBase', type: _type.DECIMAL, value: infoData && infoData.standardPrice || '0' },
                 // 除税定额价（定额价）
@@ -2423,7 +2423,7 @@ const XMLStandard = (function () {
                     ele = new DivisionalWorks(node.data);
                     const summaryCost = new SummaryOfBasicCost(tenderDetail.mainTree.items, node.data);
                     // 递归获取子元素
-                    ele.children = [summaryCost, ...loadFBFX(node.children)];
+                    ele.children = [summaryCost, ...loadFBFX(node.children, kind)];
                 } else { // 无子清单的是分项
                     ele = loadBills(node, kind);
                 }
@@ -2492,13 +2492,14 @@ const XMLStandard = (function () {
             const rationGLJElements = rationGLJs
                 /* .filter(rGLJ => {
                     // 总消耗量为0的，不输出
-                    const totalQuantity = gljUtil.getTotalQuantity(rGLJ, node.data, Decimal.GLJ, Decimal.QUANTITY);
+                    const totalQuantity = gljUtil.getTotalQuantity(rGLJ, node.data, Decimal.QUANTITY, Decimal.GLJ);
                     const parsedTotalQuantity = parseFloat(totalQuantity);
                     return parsedTotalQuantity;
                 }) */
                 .map(rGLJ => {
-                    //const totalQuantity = gljUtil.getTotalQuantity(rGLJ, node.data, Decimal.GLJ, Decimal.QUANTITY);
-                    return new LabourMaterialsEquipmentsMachinesElement(rGLJ, rGLJ.quantity)
+                    const totalQuantity = gljUtil.getTotalQuantity(rGLJ, node.data, Decimal.QUANTITY, Decimal.GLJ);
+                    const noCost = !+totalQuantity; // 总消耗量为0即为不计价材料
+                    return new LabourMaterialsEquipmentsMachinesElement(rGLJ, rGLJ.quantity, noCost);
                 });
             norm.children.push(...rationGLJElements);
             // 子目单价计算（定额计算程序）
@@ -2644,7 +2645,11 @@ const XMLStandard = (function () {
                 // 人材机组成物
                 const connectKey = gljUtil.getIndex(glj, gljKeyArray);
                 const ratios = tenderDetail.projectGLJ.datas.mixRatioMap[connectKey] || [];
-                gljEle.children = ratios.map(ratio => new LabourMaterialsEquipmentsMachinesElement(ratio, ratio.consumption));
+                gljEle.children = ratios.map(ratio => {
+                    const noCost = !+ratio.consumption;
+                    return new LabourMaterialsEquipmentsMachinesElement(ratio, ratio.consumption, noCost);
+                });
+                //gljEle.children = ratios.map(ratio => new LabourMaterialsEquipmentsMachinesElement(ratio, ratio.consumption));
                 return gljEle;
             });
         }

web/over_write/js/guangdong_2018_import.js

@@ -715,7 +715,7 @@ const importXML = (() => {
         // 提取造价信息差额调整法
         function extractDifferentiaGLJ(gljSrc) {
             // 风险系数或者基准单价有值，才算一条差额数据
-            const riskCoe = getValue(gljSrc, ['_ProviderExp']);
+            const riskCoe = getValue(gljSrc, ['_ProviderRate']);
             const standardPrice = getValue(gljSrc, ['_ProviderBase']);
             if ((riskCoe && riskCoe !== '0') || (standardPrice && standardPrice !== '0')) {
                 return {