关联台账，不计价相关

app/controller/stage_rela_controller.js

@@ -134,8 +134,8 @@ module.exports = app => {
             });
             this.ctx.helper.assignRelaData(ledgerData, [
                 { data: dgnData, fields: ['deal_dgn_qty1', 'deal_dgn_qty2', 'c_dgn_qty1', 'c_dgn_qty2'], prefix: '', relaId: 'id' },
-                { data: curStageData, fields: ['contract_qty', 'contract_expr', 'contract_tp', 'qc_qty', 'qc_tp', 'postil'], prefix: '', relaId: 'lid' },
-                { data: endStageData, fields: ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', ], prefix: 'end_', relaId: 'lid' },
+                { data: curStageData, fields: ['contract_qty', 'contract_expr', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty', 'postil'], prefix: '', relaId: 'lid' },
+                { data: endStageData, fields: ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty',], prefix: 'end_', relaId: 'lid' },
             ]);
             return ledgerData;
         }
@@ -149,8 +149,8 @@ module.exports = app => {
                 where: {sid: ctx.stage.id, rela_tid: relaStage.rela_tid},
             });
             this.ctx.helper.assignRelaData(posData, [
-                { data: curStageData, fields: ['contract_qty', 'contract_expr', 'contract_tp', 'qc_qty', 'qc_tp', 'postil'], prefix: '', relaId: 'pid' },
-                { data: endStageData, fields: ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', ], prefix: 'end_', relaId: 'pid' },
+                { data: curStageData, fields: ['contract_qty', 'contract_expr', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty', 'postil'], prefix: '', relaId: 'pid' },
+                { data: endStageData, fields: ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty' ], prefix: 'end_', relaId: 'pid' },
             ]);
             return posData;
         }
@@ -236,7 +236,6 @@ module.exports = app => {
                 const result = await ctx.service.stageDetailAtt.addFiles(stage, baseInfo, uploadFiles);
                 ctx.body = { err: 0, mgs: '', data: result };
             } catch (err) {
-                console.log(err);
                 // 失败需要消耗掉stream 以防卡死
                 if (stream) await sendToWormhole(stream);
                 ctx.log(err);

app/service/stage_rela.js

@@ -37,8 +37,8 @@ class srCache {
             ? await this.ctx.service.stageRelaBillsFinal.getAllDataByCondition({ where: { sid: this.preRelaStage.sid, rela_tid: this.preRelaStage.rela_tid } })
             : [];
         this.ctx.helper.assignRelaData(ledger, [
-            { data: curBillsData, fields: ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'postil'], prefix: '', relaId: 'lid' },
-            { data: preStageBills, fields: ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp'], prefix: 'pre_', relaId: 'lid' },
+            { data: curBillsData, fields: ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty', 'postil'], prefix: '', relaId: 'lid' },
+            { data: preStageBills, fields: ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty'], prefix: 'pre_', relaId: 'lid' },
         ]);
         for (const l of ledger) {
             const db = this.dealBills.find(x => {
@@ -57,6 +57,7 @@ class srCache {
             l.end_contract_tp = this.ctx.helper.add(l.pre_contract_tp, l.contract_tp);
             l.end_qc_qty = this.ctx.helper.add(l.pre_qc_qty, l.qc_qty);
             l.end_qc_tp = this.ctx.helper.add(l.pre_qc_tp, l.qc_tp);
+            l.end_qc_minus_qty = this.ctx.helper.add(l.pre_qc_minus_qty, l.qc_minus_qty);
             l.end_gather_qty = this.ctx.helper.add(l.pre_gather_qty, l.gather_qty);
             l.end_gather_tp = this.ctx.helper.add(l.pre_gather_tp, l.gather_tp);
         }
@@ -83,14 +84,15 @@ class srCache {
             ? await this.ctx.service.stageRelaPosFinal.getAllDataByCondition({ where: { sid: this.preRelaStage.sid, rela_tid: this.preRelaStage.rela_tid } })
             : [];
         this.ctx.helper.assignRelaData(pos, [
-            { data: curPosData, fields: ['contract_qty', 'qc_qty', 'postil', 'pid'], prefix: '', relaId: 'pid' },
-            { data: preStagePos, fields: ['contract_qty', 'qc_qty', 'postil', 'pid'], prefix: 'pre_', relaId: 'pid' },
+            { data: curPosData, fields: ['contract_qty', 'qc_qty', 'qc_minus_qty', 'postil', 'pid'], prefix: '', relaId: 'pid' },
+            { data: preStagePos, fields: ['contract_qty', 'qc_qty', 'qc_minus_qty', 'postil', 'pid'], prefix: 'pre_', relaId: 'pid' },
         ]);
         for (const p of pos) {
             p.gather_qty = this.ctx.helper.add(p.contract_qty, p.qc_qty);
             p.pre_gather_qty = this.ctx.helper.add(p.pre_contract_qty, p.pre_qc_qty);
             p.end_contract_qty = this.ctx.helper.add(p.contract_qty, p.pre_contract_qty);
             p.end_qc_qty = this.ctx.helper.add(p.qc_qty, p.pre_qc_qty);
+            p.end_qc_minus_qty = this.ctx.helper.add(p.qc_minus_qty, p.pre_qc_minus_qty);
             p.end_gather_qty = this.ctx.helper.add(p.gather_qty, p.pre_gather_qty);
         }
 
@@ -147,7 +149,7 @@ class srCache {
                     rela_tid: this.stage.tid, rela_sid: this.stage.id, rela_sorder: this.stage.order,
                     lid: t.id, unit_price: t.unit_price,
                     contract_qty: t.contract_qty, contract_tp: t.contract_tp, contract_expr: t.contract_expr,
-                    qc_qty: t.qc_qty, qc_tp: t.qc_tp,
+                    qc_qty: t.qc_qty, qc_tp: t.qc_tp, qc_minus_qty: t.qc_minus_qty,
                     postil: t.postil,
                 });
             }
@@ -156,7 +158,7 @@ class srCache {
                     tid: this.ctx.tender.id, sid: this.ctx.stage.id, sorder: this.ctx.stage.order,
                     rela_tid: this.stage.tid, rela_sid: this.stage.id, rela_sorder: this.stage.order,
                     lid: t.id,
-                    contract_qty: t.end_contract_qty, contract_tp: t.end_contract_tp,
+                    contract_qty: t.end_contract_qty, contract_tp: t.end_contract_tp, qc_minus_qty: t.end_qc_minus_qty,
                     qc_qty: t.end_qc_qty, qc_tp: t.end_qc_tp,
                 })
             }
@@ -173,7 +175,7 @@ class srCache {
                     tid: this.ctx.tender.id, sid: this.ctx.stage.id, sorder: this.ctx.stage.order,
                     rela_tid: this.stage.tid, rela_sid: this.stage.id, rela_sorder: this.stage.order,
                     pid: t.id, lid: t.id,
-                    contract_qty: t.contract_qty, contract_expr: t.contract_expr, qc_qty: t.qc_qty, postil: t.postil,
+                    contract_qty: t.contract_qty, contract_expr: t.contract_expr, qc_qty: t.qc_qty, qc_minus_qty: t.qc_minus_qty, postil: t.postil,
                 });
             }
             if (t.end_contract_qty || t.end_qc_qty) {
@@ -181,7 +183,7 @@ class srCache {
                     tid: this.ctx.tender.id, sid: this.ctx.stage.id, sorder: this.ctx.stage.order,
                     rela_tid: this.stage.tid, rela_sid: this.stage.id, rela_sorder: this.stage.order,
                     pid: t.id, lid: t.lid,
-                    contract_qty: t.end_contract_qty, qc_qty: t.end_qc_qty
+                    contract_qty: t.end_contract_qty, qc_qty: t.end_qc_qty, qc_minus_qty: t.end_qc_minus_qty,
                 })
             }
         }
@@ -205,9 +207,9 @@ class srCache {
                 doc_code: i.doc_code, im_code: i.im_code,
                 calc_memo: i.calc_memo, calc_img_remark: i.calc_img_remark, calc_img: i.calc_img,
                 bgl_code: i.bgl_code, bgl_drawing_code: i.bgl_drawing_code,
-                jl: i.jl, contract_jl: i.contract_jl, qc_jl: i.qc_jl,
-                pre_jl: i.pre_jl, pre_contract_jl: i.pre_contract_jl, pre_qc_jl: i.pre_qc_jl,
-                end_jl: i.end_jl, end_contract_jl: i.end_contract_jl, end_qc_jl: i.end_qc_jl,
+                jl: i.jl, contract_jl: i.contract_jl, qc_jl: i.qc_jl, qc_minus_jl: i.qc_minus_jl,
+                pre_jl: i.pre_jl, pre_contract_jl: i.pre_contract_jl, pre_qc_jl: i.pre_qc_jl, pre_qc_minus_jl: i.pre_qc_minus_jl,
+                end_jl: i.end_jl, end_contract_jl: i.end_contract_jl, end_qc_jl: i.end_qc_jl, end_qc_minus_jl: i.end_qc_minus_jl,
                 tp: i.tp, contract_tp: i.contract_tp, qc_tp: i.qc_tp,
                 pre_tp: i.pre_tp, pre_contract_tp: i.pre_contract_tp, pre_qc_tp: i.pre_qc_tp,
                 end_tp: i.end_tp, end_contract_tp: i.end_contract_tp, end_qc_tp: i.end_qc_tp,
@@ -221,9 +223,9 @@ class srCache {
                 rela_tid: this.stage.tid, rela_sid: this.stage.id, rela_sorder: this.stage.order,
                 im_id: i.imid, bid: i.bid, im_code: i.im_code,
                 b_code: i.b_code, name: i.name, unit: i.unit, unit_price: i.unit_price,
-                jl: i.jl, contract_jl: i.contract_jl, qc_jl: i.qc_jl,
-                pre_jl: i.pre_jl, pre_contract_jl: i.pre_contract_jl, pre_qc_jl: i.pre_qc_jl,
-                end_jl: i.end_jl, end_contract_jl: i.end_contract_jl, end_qc_jl: i.end_qc_jl,
+                jl: i.jl, contract_jl: i.contract_jl, qc_jl: i.qc_jl, qc_minus_jl: i.qc_minus_jl,
+                pre_jl: i.pre_jl, pre_contract_jl: i.pre_contract_jl, pre_qc_jl: i.pre_qc_jl, pre_qc_minus_jl: i.pre_qc_minus_jl,
+                end_jl: i.end_jl, end_contract_jl: i.end_contract_jl, end_qc_jl: i.end_qc_jl, end_qc_minus_jl: i.end_qc_minus_jl,
                 tp: i.tp, contract_tp: i.contract_tp, qc_tp: i.qc_tp,
                 pre_tp: i.pre_tp, pre_contract_tp: i.pre_contract_tp, pre_qc_tp: i.pre_qc_tp,
                 end_tp: i.end_tp, end_contract_tp: i.end_contract_tp, end_qc_tp: i.end_qc_tp,