上报自检，超计调整

app/controller/stage_controller.js

@@ -395,6 +395,30 @@ module.exports = app => {
             try {
                 const ledgerData = await this._getStageLedgerData(ctx);
                 const posData = await this._getStagePosData(ctx);
+                // 加载负变更，将台账变成1#台账
+                const minusChange = await this.ctx.service.stageChange.getStageMinusChange(ctx.stage);
+                const preMinusChange = await this.ctx.service.stageChangeFinal.getPreMinusChange(ctx.stage.tid, ctx.stage.order);
+                this.ctx.helper.assignSumRelaData(ledgerData, 'id', [
+                    {data: preMinusChange, fields: [{source: 'qty', target: 'pre_minus_qc_qty'}], relaField: 'lid'},
+                    {data: minusChange, fields: [{source: 'qty', target: 'minus_qc_qty'}], relaField: 'lid'},
+                ]);
+                this.ctx.helper.assignSumRelaData(posData, 'id', [
+                    {data: preMinusChange, fields: [{source: 'qty', target: 'pre_minus_qc_qty'}], relaField: 'pid'},
+                    {data: minusChange, fields: [{source: 'qty', target: 'minus_qc_qty'}], relaField: 'pid'},
+                ]);
+                const helper = this.ctx.helper;
+                posData.forEach(x => {
+                    x.end_minus_qc_qty = helper.add(x.pre_minus_qc_qty, x.minus_qc_qty);
+                    x.qty_0 = x.quantity;
+                    x.quantity = helper.add(x.quantity, x.end_minus_qc_qty);
+                });
+                ledgerData.forEach(x => {
+                    x.end_minus_qc_qty = helper.add(x.pre_minus_qc_qty, x.minus_qc_qty);
+                    x.qty_0 = x.quantity;
+                    x.deal_qty_0 = x.deal_qty;
+                    x.quantity = helper.add(x.quantity, x.end_minus_qc_qty);
+                    x.deal_qty = helper.add(x.deal_qty, x.end_minus_qc_qty);
+                });
 
                 const projRela = await this.ctx.service.project.getFunRela(this.ctx.session.sessionProject.id);
                 const checkDataModel = require('../lib/ledger').checkData;

app/public/js/ledger_check.js

@@ -200,7 +200,7 @@ const ledgerCheckUtil = {
                 if (ratio === 0) {
                     if (!data.contract_tp && !data.pre_contract_tp) return 2; // 漏计
                 } else {
-                    const tp = ZhCalc.mul(data.total_price, ZhCalc.div(ratio, 100, 4), this.ctx.tender.info.decimal.tp);
+                    const tp = ZhCalc.mul(data.final_1_tp, ZhCalc.div(ratio, 100, 4), this.ctx.tender.info.decimal.tp);
                     const checkTp = ZhCalc.add(data.contract_tp, data.pre_contract_tp);
                     if (tp > checkTp) return 1; // 违规
                     if (tp < checkTp) return 2; // 漏计
@@ -217,7 +217,7 @@ const ledgerCheckUtil = {
                     if (!data.contract_qty && !data.qc_qty && !data.pre_contract_qty && !data.pre_qc_qty) return 2; // 漏计
                 } else {
                     const precision = findPrecision(tenderInfo.precision, unit);
-                    const checkQty = ZhCalc.mul(data.quantity, ZhCalc.div(ratio, 100, 4), precision.value);
+                    const checkQty = ZhCalc.mul(data.final_1_qty, ZhCalc.div(ratio, 100, 4), precision.value);
                     const qty = ZhCalc.add(data.contract_qty, data.pre_contract_qty) || 0;
                     if (qty > checkQty) return 1; // 违规
                     if (qty < checkQty) return 2; // 漏计

app/public/js/stage.js

@@ -978,7 +978,6 @@ $(document).ready(() => {
         },
         loadRelaData: function () {
             const billsSheet = slSpread.getActiveSheet();
-            console.log(SpreadJsObj.getSelectObject(billsSheet));
             SpreadJsObj.saveTopAndSelect(billsSheet, ckBillsSpread);
             const posSheet = spSpread.getActiveSheet();
             SpreadJsObj.resetTopAndSelect(posSheet);
@@ -2047,7 +2046,6 @@ $(document).ready(() => {
 
     // 加载计量单元数据 - 暂时统一加载，如有需要，切换成动态加载并缓存
     postData(window.location.pathname + '/load', { filter: 'ledger;pos;detail;change;import_change;tag;cooperation;minus_change' }, function (result) {
-        console.log(result.minus_change, result.changeData);
         // 加载树结构
         stageTree.loadDatas(result.ledgerData);
         // 加载部位明细