中间计量数据，调整

app/lib/stage_im.js

@@ -649,9 +649,15 @@ class StageIm {
         im.qc_jl = 0;
         for (const b of im.gclBills) {
             im.contract_jl = this.ctx.helper.add(im.contract_jl, this.ctx.helper.mul(b.contract_jl, b.unit_price, tp_decimal));
+            im.pre_contract_jl = this.ctx.helper.add(im.pre_contract_jl, this.ctx.helper.mul(b.pre_contract_jl, b.unit_price, tp_decimal));
+            im.end_contract_jl = this.ctx.helper.add(im.end_contract_jl, this.ctx.helper.mul(b.end_contract_jl, b.unit_price, tp_decimal));
             im.qc_jl = this.ctx.helper.add(im.qc_jl, this.ctx.helper.mul(b.qc_jl, b.unit_price, tp_decimal));
+            im.pre_qc_jl = this.ctx.helper.add(im.pre_qc_jl, this.ctx.helper.mul(b.pre_qc_jl, b.unit_price, tp_decimal));
+            im.end_qc_jl = this.ctx.helper.add(im.end_qc_jl, this.ctx.helper.mul(b.end_qc_jl, b.unit_price, tp_decimal));
         }
         im.jl = this.ctx.helper.add(im.contract_jl, im.qc_jl);
+        im.pre_jl = this.ctx.helper.add(im.pre_contract_jl, im.pre_qc_jl);
+        im.end_jl = this.ctx.helper.add(im.end_contract_jl, im.end_qc_jl);
     }
     _getBwBillsIm(node, peg, index, bw) {
         const im = {
@@ -724,6 +730,10 @@ class StageIm {
 
                 imDefault.contract_jl = this.ctx.helper.add(imDefault.contract_jl, p.contract_qty);
                 imDefault.qc_jl = this.ctx.helper.add(imDefault.qc_jl, p.qc_qty);
+                imDefault.pre_contract_jl = this.ctx.helper.add(imDefault.pre_contract_jl, p.pre_contract_qty);
+                imDefault.pre_qc_jl = this.ctx.helper.add(imDefault.pre_qc_jl, p.pre_qc_qty);
+                imDefault.end_contract_jl = this.ctx.helper.add(imDefault.end_contract_jl, p.end_contract_qty);
+                imDefault.end_qc_jl = this.ctx.helper.add(imDefault.end_qc_jl, p.end_qc_qty);
                 imDefault.used = true;
 
                 this._addBwBillsGclBills(imDefault, p);
@@ -731,6 +741,8 @@ class StageIm {
         }
         if (imDefault.used) {
             imDefault.jl = this.ctx.helper.add(imDefault.contract_jl, imDefault.qc_jl);
+            imDefault.pre_jl = this.ctx.helper.add(imDefault.pre_contract_jl, imDefault.pre_qc_jl);
+            imDefault.end_jl = this.ctx.helper.add(imDefault.end_contract_jl, imDefault.end_qc_jl);
             imDefault.id = this.ImData.length + 1;
             this.ImData.push(imDefault);
         }

app/service/stage.js

@@ -536,6 +536,8 @@ module.exports = app => {
                 await transaction.delete(this.ctx.service.stageRela.tableName, { sid: id });
                 await transaction.delete(this.ctx.service.stageRelaBills.tableName, { sid: id });
                 await transaction.delete(this.ctx.service.stageRelaBillsFinal.tableName, { sid: id });
+                await transaction.delete(this.ctx.service.stageRelaIm.tableName, { sid: id });
+                await transaction.delete(this.ctx.service.stageRelaImBills.tableName, { sid: id });
                 // 删除计量合同支付附件
                 const payList = await this.ctx.service.stagePay.getAllDataByCondition({ where: { sid: id } });
                 if (payList) {