调差计算问题

app/lib/revise_price.js

@@ -272,29 +272,31 @@ class revisePriceCalc {
         const said = this.ctx.session.sessionUser.accountId;
         billsTree.calculateAll(node => {
             if (node.children && node.children.length > 0) return;
-            const priceDiff = helper.sub(node.unit_price, node.pre_unit_price);
-            if (!priceDiff) return;
+            // const priceDiff = helper.sub(node.unit_price, node.pre_unit_price);
+            // if (!priceDiff) return;
             if (node.cur_id && (node.cur_contract_qty || node.cur_qc_qty)) {
-                node.cur_contract_tp = helper.mul(node.cur_contract_qty, node.unit_price, decimal.tp);
-                node.cur_qc_tp = helper.mul(node.cur_qc_qty, node.unit_price, decimal.tp);
-                node.cur_positive_qc_tp = helper.mul(node.cur_positive_qc_qty, node.unit_price, decimal.tp);
-                node.cur_negative_qc_tp = helper.mul(node.cur_negative_qc_qty, node.unit_price, decimal.tp);
-                if (node.cur_times === stage.times && node.cur_order === 0) {
-                    result.ubData.push({
-                        id: node.cur_id,
-                        contract_tp: node.cur_contract_tp, qc_tp: node.cur_qc_tp,
-                        positive_qc_tp: node.cur_positive_qc_tp, negative_qc_tp: node.cur_negative_qc_tp,
-                    });
-                } else {
-                    result.ibData.push({
-                        tid: stage.tid, sid: stage.id, said,
-                        lid: node.id, times: stage.times, order: 0,
-                        contract_qty: node.cur_contract_qty, contract_tp: node.cur_contract_tp,
-                        qc_qty: node.cur_qc_qty, qc_tp: node.cur_qc_tp,
-                        positive_qc_qty: node.cur_positive_qc_qty, positive_qc_tp: node.cur_positive_qc_tp,
-                        negative_qc_qty: node.cur_negative_qc_qty, negative_qc_tp: node.cur_negative_qc_tp,
-                        postil: node.cur_postil,
-                    });
+                const cur_contract_tp = helper.mul(node.cur_contract_qty, node.unit_price, decimal.tp);
+                const cur_qc_tp = helper.mul(node.cur_qc_qty, node.unit_price, decimal.tp);
+                const cur_positive_qc_tp = helper.mul(node.cur_positive_qc_qty, node.unit_price, decimal.tp);
+                const cur_negative_qc_tp = helper.mul(node.cur_negative_qc_qty, node.unit_price, decimal.tp);
+                if (cur_contract_tp !== node.cur_contract_tp || cur_qc_tp !== node.cur_qc_tp || cur_positive_qc_tp !== node.cur_positive_qc_tp || cur_negative_qc_tp !== node.cur_positive_qc_tp) {
+                    if (node.cur_times === stage.times && node.cur_order === 0) {
+                        result.ubData.push({
+                            id: node.cur_id,
+                            contract_tp: cur_contract_tp, qc_tp: cur_qc_tp,
+                            positive_qc_tp: cur_positive_qc_tp, negative_qc_tp: cur_negative_qc_tp,
+                        });
+                    } else {
+                        result.ibData.push({
+                            tid: stage.tid, sid: stage.id, said,
+                            lid: node.id, times: stage.times, order: 0,
+                            contract_qty: node.cur_contract_qty, contract_tp: cur_contract_tp,
+                            qc_qty: node.cur_qc_qty, qc_tp: cur_qc_tp,
+                            positive_qc_qty: node.cur_positive_qc_qty, positive_qc_tp: cur_positive_qc_tp,
+                            negative_qc_qty: node.cur_negative_qc_qty, negative_qc_tp: cur_negative_qc_tp,
+                            postil: node.cur_postil,
+                        });
+                    }
                 }
             }
             if (node.pre_id && (node.pre_contract_qty || node.pre_qc_qty)) {

app/service/ledger_history.js

@@ -49,7 +49,6 @@ module.exports = app => {
 
             const billsHis = `${this.ctx.session.sessionProject.id}/${tender.id}/ledger/bills${timestamp}.json`;
             const bills = await this.ctx.service.ledger.getData(tender.id);
-            console.log(bills[0]);
             await this.ctx.hisOss.put(this.ctx.hisOssPath + billsHis, Buffer.from(JSON.stringify(bills), 'utf8'));
 
             const posHis = `${this.ctx.session.sessionProject.id}/${tender.id}/ledger/pos${timestamp}.json`;

sql/update.sql

@@ -5,11 +5,11 @@ MODIFY COLUMN `stage_flow_pre_uid`  varchar(1000) NOT NULL DEFAULT 0 COMMENT '
 
 ALTER TABLE `zh_shenpi_audit`
 ADD COLUMN `audit_type`  tinyint(4) UNSIGNED NOT NULL DEFAULT 1 COMMENT '审批类型(1个人，2会签，3或签)' AFTER `audit_id`,
-ADD COLUMN `audit_order`  tinyint(4) UNSIGNED ZEROFILL NOT NULL DEFAULT 0 COMMENT '审批顺序' AFTER `audit_type`;
+ADD COLUMN `audit_order`  tinyint(4) UNSIGNED NOT NULL DEFAULT 0 COMMENT '审批顺序' AFTER `audit_type`;
 
 ALTER TABLE `zh_stage_audit`
 ADD COLUMN `audit_type`  tinyint(4) UNSIGNED NOT NULL DEFAULT 1 COMMENT '审批类型(1个人，2会签，3或签)' AFTER `is_old`,
-ADD COLUMN `audit_order`  tinyint(4) UNSIGNED ZEROFILL NOT NULL DEFAULT 0 COMMENT '审批顺序' AFTER `audit_type`;
+ADD COLUMN `audit_order`  tinyint(4) UNSIGNED NOT NULL DEFAULT 0 COMMENT '审批顺序' AFTER `audit_type`;
 
 ALTER TABLE `zh_payment_tender_info`
 ADD COLUMN `pay_account`  varchar(5000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '付款账号' AFTER `tech_param`;