Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/service/report_memory.js

@@ -30,13 +30,14 @@ const billsFields = (function () {
     const pre = ['pre_contract_qty', 'pre_contract_tp', 'pre_qc_qty', 'pre_qc_tp', 'pre_gather_qty', 'pre_gather_tp'];
     const end = ['end_contract_qty', 'end_contract_tp', 'end_qc_qty', 'end_qc_tp', 'end_gather_qty', 'end_gather_tp'];
     const final = ['final_tp', 'final_ratio'];
+    const stageDgn = ['deal_dgn_qty1', 'deal_dgn_qty2', 'c_dgn_qty1', 'c_dgn_qty2'];
 
     const stage = cur.concat(pre, end, final);
     const stageEnd = pre.concat(end, final);
     const bgl = ['qc_bgl_code'];
     const leafXmj = ['leaf_xmj_id'];
 
-    return {cur, pre, end, final, stage, stageEnd, bgl, leafXmj};
+    return {cur, pre, end, final, stageDgn, stage, stageEnd, bgl, leafXmj};
 })();
 const posFields = (function () {
     const cur = ['contract_qty', 'qc_qty', 'gather_qty', 'postil'];
@@ -348,6 +349,13 @@ module.exports = app => {
             }
 
             const billsData = await this.ctx.service.ledger.getData(this.ctx.tender.id);
+            if (this._checkFieldsExist(fields, billsFields.stageDgn)) {
+                const dgnData = await this.ctx.service.stageBillsDgn.getDgnData(this.ctx.tender.id);
+                for (const d of dgnData) {
+                    const l = this.ctx.helper._.find(billsData, {id: d.id});
+                    this.ctx.helper._.assignIn(l, d);
+                }
+            }
             if (this._checkFieldsExist(fields, billsFields.stage)) {
                 if (this.ctx.stage.readOnly) {
                     const curStage = await this.ctx.service.stageBills.getAuditorStageData(this.ctx.tender.id,

app/service/rpt_gather_memory.js

@@ -35,6 +35,9 @@ const gatherUtils = {
         gatherNode[prefix + "qty"] = helper.add(gatherNode[prefix + "qty"], sourceNode.quantity);
         gatherNode[prefix + "tp"] = helper.add(gatherNode[prefix + "tp"], sourceNode.total_price);
 
+        gatherNode[prefix + "dgn_qty1"] = helper.add(gatherNode[prefix + "dgn_qty1"], sourceNode.dgn_qty1);
+        gatherNode[prefix + "dgn_qty2"] = helper.add(gatherNode[prefix + "dgn_qty2"], sourceNode.dgn_qty2);
+
         gatherNode[prefix + "contract_qty"] = helper.add(gatherNode[prefix + "contract_qty"], sourceNode.contract_qty);
         gatherNode[prefix + "contract_tp"] = helper.add(gatherNode[prefix + "contract_tp"], sourceNode.contract_tp);
         gatherNode[prefix + "qc_qty"] = helper.add(gatherNode[prefix + "qc_qty"], sourceNode.qc_qty);
@@ -56,6 +59,11 @@ const gatherUtils = {
         gatherNode[prefix + "end_gather_qty"] = helper.add(gatherNode[prefix + "end_gather_qty"], sourceNode.end_gather_qty);
         gatherNode[prefix + "end_gather_tp"] = helper.add(gatherNode[prefix + "end_gather_tp"], sourceNode.end_gather_tp);
 
+        gatherNode[prefix + "deal_dgn_qty1"] = helper.add(gatherNode[prefix + "deal_dgn_qty1"], sourceNode.deal_dgn_qty1);
+        gatherNode[prefix + "deal_dgn_qty2"] = helper.add(gatherNode[prefix + "deal_dgn_qty2"], sourceNode.deal_dgn_qty2);
+        gatherNode[prefix + "c_dgn_qty1"] = helper.add(gatherNode[prefix + "c_dgn_qty1"], sourceNode.c_dgn_qty1);
+        gatherNode[prefix + "c_dgn_qty2"] = helper.add(gatherNode[prefix + "c_dgn_qty2"], sourceNode.c_dgn_qty2);
+
         gatherNode['s_' + "qty"] = helper.add(gatherNode['s_' + "qty"], sourceNode.quantity);
         gatherNode['s_' + "tp"] = helper.add(gatherNode['s_' + "tp"], sourceNode.total_price);
 
@@ -87,6 +95,9 @@ const gatherUtils = {
         gatherNode[prefix + "qty"] = helper.add(gatherNode[prefix + "qty"], sourceNode.quantity);
         gatherNode[prefix + "tp"] = helper.add(gatherNode[prefix + "tp"], sourceNode.total_price);
 
+        gatherNode[prefix + "dgn_qty1"] = helper.add(gatherNode[prefix + "dgn_qty1"], sourceNode.dgn_qty1);
+        gatherNode[prefix + "dgn_qty2"] = helper.add(gatherNode[prefix + "dgn_qty2"], sourceNode.dgn_qty2);
+
         gatherNode[prefix + "contract_qty"] = helper.add(gatherNode[prefix + "contract_qty"], sourceNode.contract_qty);
         gatherNode[prefix + "contract_tp"] = helper.add(gatherNode[prefix + "contract_tp"], sourceNode.contract_tp);
         gatherNode[prefix + "qc_qty"] = helper.add(gatherNode[prefix + "qc_qty"], sourceNode.qc_qty);
@@ -94,6 +105,11 @@ const gatherUtils = {
         gatherNode[prefix + "gather_qty"] = helper.add(gatherNode[prefix + "gather_qty"], sourceNode.gather_qty);
         gatherNode[prefix + "gather_tp"] = helper.add(gatherNode[prefix + "gather_tp"], sourceNode.gather_tp);
 
+        gatherNode[prefix + "deal_dgn_qty1"] = helper.add(gatherNode[prefix + "deal_dgn_qty1"], sourceNode.deal_dgn_qty1);
+        gatherNode[prefix + "deal_dgn_qty2"] = helper.add(gatherNode[prefix + "deal_dgn_qty2"], sourceNode.deal_dgn_qty2);
+        gatherNode[prefix + "c_dgn_qty1"] = helper.add(gatherNode[prefix + "c_dgn_qty1"], sourceNode.c_dgn_qty1);
+        gatherNode[prefix + "c_dgn_qty2"] = helper.add(gatherNode[prefix + "c_dgn_qty2"], sourceNode.c_dgn_qty2);
+
         gatherNode['s_' + "qty"] = helper.add(gatherNode['s_' + "qty"], sourceNode.quantity);
         gatherNode['s_' + "tp"] = helper.add(gatherNode['s_' + "tp"], sourceNode.total_price);
 
@@ -111,6 +127,9 @@ const gatherUtils = {
         gatherNode[prefix + "qty"] = helper.add(gatherNode[prefix + "qty"], sourceNode.quantity);
         gatherNode[prefix + "tp"] = helper.add(gatherNode[prefix + "tp"], sourceNode.total_price);
 
+        gatherNode[prefix + "dgn_qty1"] = helper.add(gatherNode[prefix + "dgn_qty1"], sourceNode.dgn_qty1);
+        gatherNode[prefix + "dgn_qty2"] = helper.add(gatherNode[prefix + "dgn_qty2"], sourceNode.dgn_qty2);
+
         gatherNode['s_' + "qty"] = helper.add(gatherNode['s_' + "qty"], sourceNode.quantity);
         gatherNode['s_' + "tp"] = helper.add(gatherNode['s_' + "tp"], sourceNode.total_price);
     },
@@ -215,6 +234,13 @@ module.exports = app => {
                 }
             });
             const billsData = await this.ctx.service.ledger.getData(tender.id);
+
+            const dgnData = await this.ctx.service.stageBillsDgn.getDgnData(tender.id);
+            for (const d of dgnData) {
+                const l = this.ctx.helper._.find(billsData, {id: d.id});
+                this.ctx.helper._.assignIn(l, d);
+            }
+
             if (stage) {
                 await this.ctx.service.stage.doCheckStage(stage);
                 if (stage.readOnly) {
@@ -298,6 +324,12 @@ module.exports = app => {
             completeData.name = tender.name;
             const billsData = await this.ctx.service.ledger.getData(tender.id);
 
+            const dgnData = await this.ctx.service.stageBillsDgn.getDgnData(tender.id);
+            for (const d of dgnData) {
+                const l = this.ctx.helper._.find(billsData, {id: d.id});
+                this.ctx.helper._.assignIn(l, d);
+            }
+
             let billsIndexData = {};
             for (const bd of billsData) {
                 billsIndexData[indexPre + bd.id] = bd;

builder_report_index_define.js

@@ -271,6 +271,11 @@ const stage_bills = {
         { name: '设计错漏-公式', field: 'sjcl_expr', type: dataType.currency },
         { name: '其他错漏-公式', field: 'qtcl_expr', type: dataType.currency },
         { name: '本期-合同-公式', field: 'contract_expr', type: dataType.currency },
+
+        { name: '合同-设计数量1', field: 'deal_dgn_qty1', type: dataType.currency },
+        { name: '合同-设计数量2', field: 'deal_dgn_qty2', type: dataType.currency },
+        { name: '变更-设计数量1', field: 'c_dgn_qty1', type: dataType.currency },
+        { name: '变更-设计数量2', field: 'c_dgn_qty2', type: dataType.currency },
     ],
 };
 const stage_bills_compare = {
@@ -794,6 +799,13 @@ const gather_stage_bills = {
 
         { name: '(特殊3-需替换key3)台账-设计数量1', field: 'ts_key3_dgn_qty1', type: dataType.currency },
         { name: '(特殊3-需替换key3)台账-设计数量2', field: 'ts_key3_dgn_qty2', type: dataType.currency },
+
+        { name: '(标段)台账-设计数量1', field: 't_dgn_qty1', type: dataType.currency },
+        { name: '(标段)台账-设计数量2', field: 't_dgn_qty2', type: dataType.currency },
+        { name: '(标段)合同-设计数量1', field: 't_deal_dgn_qty1', type: dataType.currency },
+        { name: '(标段)合同-设计数量2', field: 't_deal_dgn_qty2', type: dataType.currency },
+        { name: '(标段)变更-设计数量1', field: 't_c_dgn_qty1', type: dataType.currency },
+        { name: '(标段)变更-设计数量2', field: 't_c_dgn_qty2', type: dataType.currency },
     ],
 };
 const gather_tender_info = {