فهرست منبع

浙江象山接口调整

Tony Kang 3 سال پیش
والد
کامیت
af1d61f3d5

+ 1 - 1
web/building_saas/standard_interface/config.js

@@ -128,7 +128,7 @@ const INTERFACE_CONFIG = (() => {
       },
     },
     '浙江@象山': {
-      scriptName: 'zhejiang_ninghai.js',
+      scriptName: 'zhejiang_xiangshan.js',
       fileSuffix: {
         [BID_INVITATION]: '.zjglzb',
         [BID_SUBMISSION]: '.zjgltb',

+ 1 - 1
web/building_saas/standard_interface/export/zhejiang_xiangshan.js

@@ -561,7 +561,7 @@ INTERFACE_EXPORT = (() => {
       /* 生成定额信息表 */
       function createDEXXB(node) {
         const rst = [];
-        if(isBidInvitation) return rst; //招标工程量清单不导出定额数据
+        // if(isBidInvitation) return rst; //招标工程量清单不导出定额数据
         node.children.forEach(ration => {
           const dexxb = new DEXXB(ration);
           rst.push(dexxb);

+ 3 - 1
web/building_saas/standard_interface/import/base.js

@@ -178,7 +178,9 @@ const INTERFACE_EXPORT_BASE = (() => {
         itemsSrc.forEach(itemSrc => {
           const obj = extractFuc(itemSrc, field[0]);
           if (obj) {
-            obj.children = extractItemsRecur(itemSrc, fields, extractFuc);
+            if (!obj.children || obj.children.length === 0) {
+              obj.children = extractItemsRecur(itemSrc, fields, extractFuc);
+            }
             items.push(obj);
           }
         })

+ 32 - 11
web/building_saas/standard_interface/import/zhejiang_xiangshan.js

@@ -120,17 +120,38 @@ INTERFACE_IMPORT = (() => {
         });
         // 第100-700章的数据
         if (oneSevenBills) {
-          oneSevenBills.children = extractItemsRecur(oneSevenSrc, [['工程量清单明细']], (src) => ({
-            GUID: getValue(src, ['_GUID']),
-            sectionCode: getValue(src, ['_清单章节号']),
-            code: getValue(src, ['_子目号']),
-            name: getValue(src, ['_子目名称']),
-            unit: getValue(src, ['_单位']),
-            quantity: getValue(src, ['_数量']),
-            remark: getValue(src, ['_备注']),
-            appraisalBills: +getValue(src, ['_评审清单']),
-            specialProvisional: getValue(src, ['_数据类型']) === '21' ? '专业工程' : ''
-          }));
+          oneSevenBills.children = extractItemsRecur(oneSevenSrc, [['工程量清单明细']], (src) => {
+            const bill = {
+              GUID: getValue(src, ['_GUID']),
+              sectionCode: getValue(src, ['_清单章节号']),
+              code: getValue(src, ['_子目号']),
+              name: getValue(src, ['_子目名称']),
+              unit: getValue(src, ['_单位']),
+              quantity: getValue(src, ['_数量']),
+              remark: getValue(src, ['_备注']),
+              appraisalBills: +getValue(src, ['_评审清单']),
+              specialProvisional: getValue(src, ['_数据类型']) === '21' ? '专业工程' : '',
+              children: [],
+            };
+            const rBillItems = arrayValue(src, ['定额信息表']); // 导入后作为清单处理
+            if (rBillItems.length > 0) {
+              rBillItems.forEach((rationXml, index) => {
+                const item = {
+                  // seq: index + 1,
+                  // fees,
+                  GUID: getValue(rationXml, ['_GUID']),
+                  code: getValue(rationXml, ['_定额编号']),
+                  name: getValue(rationXml, ['_定额名称']),
+                  unit: getValue(rationXml, ['_单位']),
+                  tenderQuantity: getValue(rationXml, ['_数量']),
+                  quantity: getValue(rationXml, ['_数量']),
+                  remark: getValue(rationXml, ['_备注']),
+                };
+                bill.children.push(item);
+              });
+            }
+            return bill;
+          });
         }
         // 计日工数据
         if (dayWorkBills) {