|
|
@@ -278,8 +278,8 @@ module.exports = app => {
|
|
|
times: stage.times, order: 0,
|
|
|
contract_qty: sb.contract_qty, contract_expr: sb.contract_expr, contract_tp,
|
|
|
qc_qty: sb.qc_qty, qc_tp, qc_minus_qty: sb.qc_minus_qty,
|
|
|
- positive_qc_qty: sb.positive_qc_qty, positive_qc_tp: sb.positive_qc_tp,
|
|
|
- negative_qc_qty: sb.negative_qc_qty, negative_qc_tp: sb.negative_qc_tp,
|
|
|
+ positive_qc_qty: sb.positive_qc_qty, positive_qc_tp: positive_qc_tp,
|
|
|
+ negative_qc_qty: sb.negative_qc_qty, negative_qc_tp: negative_qc_tp,
|
|
|
ex_stage_qty1: sb.ex_stage_qty1, ex_stage_tp1,
|
|
|
postil: sb.postil,
|
|
|
});
|
|
|
@@ -314,7 +314,8 @@ module.exports = app => {
|
|
|
const positive_qc_tp = this.ctx.helper.mul(b.unit_price, sb.positive_qc_qty, decimal.tp);
|
|
|
const negative_qc_tp = this.ctx.helper.mul(b.unit_price, sb.positive_qc_qty, decimal.tp);
|
|
|
const ex_stage_tp1 = this.ctx.helper.mul(b.unit_price, sb.ex_stage_qty1, decimal.tp);
|
|
|
- if (contract_tp == sb.contract_tp && qc_tp === sb.qc_tp && ex_stage_tp1 === sb.ex_stage_tp1) continue;
|
|
|
+ if (contract_tp == sb.contract_tp && qc_tp === sb.qc_tp && ex_stage_tp1 === sb.ex_stage_tp1
|
|
|
+ && positive_qc_tp === sb.positive_qc_tp && negative_qc_tp === sb.negative_qc_tp) continue;
|
|
|
|
|
|
if (sb.times === stage.times && sb.order === 0) {
|
|
|
updateStageBills.push({
|
|
|
@@ -326,8 +327,8 @@ module.exports = app => {
|
|
|
times: stage.times, order: 0,
|
|
|
contract_qty: sb.contract_qty, contract_expr: sb.contract_expr, contract_tp,
|
|
|
qc_qty: sb.qc_qty, qc_tp, qc_minus_qty: sb.qc_minus_qty,
|
|
|
- positive_qc_qty: sb.positive_qc_qty, positive_qc_tp: sb.positive_qc_tp,
|
|
|
- negative_qc_qty: sb.negative_qc_qty, negative_qc_tp: sb.negative_qc_tp,
|
|
|
+ positive_qc_qty: sb.positive_qc_qty, positive_qc_tp: positive_qc_tp,
|
|
|
+ negative_qc_qty: sb.negative_qc_qty, negative_qc_tp: negative_qc_tp,
|
|
|
ex_stage_qty1: sb.ex_stage_qty1, ex_stage_tp1,
|
|
|
postil: sb.postil,
|
|
|
});
|
