update.sql

app/public/js/stage.js

@@ -696,7 +696,7 @@ $(document).ready(() => {
                 : true;
         }
         _matchBillsParent(match, change) {
-            return match ? (!change.b_bwmx || change.b_bwmx === this.callData.leafXmj.name) : true;
+            return match ? (!change.b_bwmx || change.b_bwmx === (this.callData.leafXmj ? this.callData.leafXmj.name : '')) : true;
         }
         _filterChange(filterEmpty, matchPosName) {
             this.displayChanges = [];

app/service/stage_pos.js

@@ -566,7 +566,7 @@ module.exports = app => {
                     qc_minus_qty: noValue ? qty : (orgPos ? orgPos.qc_minus_qty : 0),
                     positive_qc_qty: !noValue ? positiveQty : (orgPos ? orgPos.positive_qc_qty : 0),
                     negative_qc_qty: !noValue ? negativeQty : (orgPos ? orgPos.negative_qc_qty : 0),
-                    ex_stage_qty1: orgPos ? orgPos.ex_stage_qty1 : 0,
+                    ex_stage_qty1: orgPos ? orgPos.ex_stage_qty1 || 0 : 0,
                 });
             }
             await this.ctx.service.stageBills.calc(this.ctx.tender.id, this.ctx.stage.id, pos.lid, transaction);