1. 财务账面缓存stage_order

2. 成本分析明细汇总sql调整

app/service/cost_stage_book_detail.js

@@ -61,7 +61,7 @@ module.exports = app => {
                 'SELECT sd.cost_id, sd.code, sd.name, sd.tax, sd.is_deal, sd.id AS source_cid, sd.pay_tp, sd.cut_tp, sd.yf_tp, sd.sf_tp, sd.yf_excl_tax_tp, sd.sf_excl_tax_tp, sbd.in_tp, sbd.in_excl_tax_tp ' +
                 `  FROM ${this.ctx.service.costStageDetail.tableName} sd LEFT JOIN ${this.tableName} sbd ON sbd.detail_id = sd.id` +
                 `    LEFT JOIN ${this.ctx.service.costStage.tableName} cs ON sd.stage_id = cs.id` +
-                '  WHERE cs.tid = ? AND cs.stage_order <= ? AND sd.is_deal = 0 ORDER BY sd.code ASC';
+                '  WHERE sbd.tender_id = ? AND sbd.stage_order <= ? AND sd.is_deal = 0 ORDER BY sd.code ASC';
             const commonDetail = await this.db.query(commonDetailSql, [stage.tid, stage.stage_order]);
             // 以下sql需要8.0的mysql才支持
             // const dealDetailSql =
@@ -93,7 +93,7 @@ module.exports = app => {
                 '        sum(csd.yf_excl_tax_tp) AS yf_excl_tax_tp, sum(csd.sf_excl_tax_tp) AS sf_excl_tax_tp,' +
                 '        sum(csbd.in_tp) AS in_tp, sum(csbd.in_excl_tax_tp) As in_excl_tax_tp' +
                 '      FROM zh_cost_stage_detail csd LEFT JOIN zh_cost_stage_book_detail csbd ON csd.id = csbd.detail_id' +
-                '      WHERE csd.tender_id = ? AND csd.stage_order <= ? AND csd.is_deal = 1 GROUP BY csd.cost_id, csd.source_cid' +
+                '      WHERE csbd.tender_id = ? AND csbd.stage_order <= ? AND csd.is_deal = 1 GROUP BY csd.cost_id, csd.source_cid' +
                 '  ) b ON a.cost_id = b.cost_id AND a.source_cid = b.source_cid' +
                 '  ORDER BY a.code ASC';
             const dealDetail = await this.db.query(dealDetailSql, [stage.tid, stage.stage_order, stage.tid, stage.stage_order]);
@@ -143,7 +143,8 @@ module.exports = app => {
 
                 const nd = od
                     ? { id: od.id, update_user_id: user_id }
-                    : { id: this.uuid.v4(), tender_id: this.ctx.costStage.tid, stage_id: this.ctx.costStage.id, ledger_id: d.ledger_id, detail_id: d.detail_id, add_user_id: user_id, update_user_id: user_id };
+                    : { id: this.uuid.v4(), tender_id: this.ctx.costStage.tid, stage_id: this.ctx.costStage.id, stage_order: this.ctx.costStage.stage_order,
+                        ledger_id: d.ledger_id, detail_id: d.detail_id, add_user_id: user_id, update_user_id: user_id };
                 for (const prop of costFields.textFields) {
                     if (d[prop] !== undefined) nd[prop] = d[prop];
                 }

sql/update.sql

@@ -263,6 +263,7 @@ CREATE TABLE `zh_cost_stage_book_detail` (
   `id` varchar(36) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT 'uuid(zh_cost_stage_ledger.id)',
   `tender_id` int(11) unsigned NOT NULL COMMENT '标段id',
   `stage_id` varchar(36) COLLATE utf8_unicode_ci NOT NULL COMMENT '期id',
+  `stage_order` int(11) NOT NULL COMMENT '期序号',
   `ledger_id` varchar(36) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '关联台账id(zh_stage_detail.ledger_id)',
   `detail_id` varchar(36) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '关联明细id(zh_stage_detail.id)',
   `in_tp` decimal(24,8) NOT NULL DEFAULT '0.00000000' COMMENT '入账金额',