无部位明细数据，终审无法通过问题

app/service/stage_bills_final.js

@@ -85,7 +85,7 @@ module.exports = app => {
             }
             if (stage.order > 1) {
                 const cur = await this.ctx.service.stageBills.getLastestStageData(tender.id, stage.id);
-                //if (!cur || cur.length === 0) return;
+                if ((!cur || cur.length === 0) && (!pre || pre.length === 0)) return;
                 const pre = await this.getFinalData(tender, stage.order - 1);
                 for (const c of cur) {
                     delete c.id;
@@ -109,13 +109,12 @@ module.exports = app => {
                     }
                 }
 
-                //await transaction.insert(this.tableName, cur);
                 for (const p of pre) {
                     p.sid = stage.id;
                     p.sorder = stage.order;
                     p.used = p.used || !this.ctx.helper.checkZero(p.contract_qty) || !this.ctx.helper.checkZero(p.qc_qty);
                 }
-                await transaction.insert(this.tableName, cur.concat(pre));
+                await transaction.insert(this.tableName, cur ? cur.concat(pre) : pre);
             } else {
                 const sql = 'Insert Into ??(tid, sid, lid, sorder, contract_qty, contract_tp, qc_qty, qc_tp, used)' +
                     '  SELECT b.tid, b.sid, b.lid, ? As `sorder`, b.contract_qty, b.contract_tp, b.qc_qty, b.qc_tp,' +

app/service/stage_change.js

@@ -314,7 +314,6 @@ module.exports = app => {
                         '  GROUP BY c.`cid`';
             const sqlParam = [sid];
             const result = await this.db.query(sql, sqlParam);
-            console.log(this.db.format(sql, sqlParam));
             return this._.map(this._.filter(result, 'qty'), 'cid');
         }
     }

app/service/stage_pos.js

@@ -226,7 +226,6 @@ module.exports = app => {
             const datas = data instanceof Array ? data : [data];
             const orgPos = await this.ctx.service.pos.getPosDataByIds(this._.map(datas, 'pid'));
             const orgStagePos = await this.getLastestStageData2(this.ctx.tender.id, this.ctx.stage.id, {pid: this._.map(datas, 'pid')});
-            console.log(orgStagePos);
 
             const transaction = await this.db.beginTransaction();
             try {
@@ -361,7 +360,6 @@ module.exports = app => {
             if ((data.updateType === 'add' || data.upateType === 'delete') && this.ctx.tender.measure_type === measureType.tz) {
                 throw '台账模式下，不可在计量中新增或删除部位明细，如需操作，请进行台账修订';
             }
-            console.log(data);
             let refreshData;
             if (data.updateType === 'add') {
                 refreshData = await this._addStagePosData(data.updateData);

app/service/stage_pos_final.js

@@ -69,8 +69,8 @@ module.exports = app => {
             }
             if (stage.order > 1) {
                 const cur = await this.ctx.service.stagePos.getLastestStageData2(tender.id, stage.id);
-                //if (!cur || cur.length === 0) return;
                 const pre = await this.getFinalData(tender, stage.order - 1);
+                if ((!cur || cur.length === 0) && (!pre || pre.length === 0)) return;
                 for (const c of cur) {
                     delete c.id;
                     delete c.said;
@@ -90,13 +90,12 @@ module.exports = app => {
                         c.used = !this.ctx.helper.checkZero(c.contract_qty) || !this.ctx.helper.checkZero(c.qc_qty);
                     }
                 }
-                //await transaction.insert(this.tableName, cur);
                 for (const p of pre) {
                     p.sid = stage.id;
                     p.sorder = stage.order;
                     p.used = p.used || !this.ctx.helper.checkZero(p.contract_qty) || !this.ctx.helper.checkZero(p.qc_qty);
                 }
-                await transaction.insert(this.tableName, cur.concat(pre));
+                await transaction.insert(this.tableName, cur ? cur.concat(pre) : pre);
             } else {
                 const sql = 'Insert Into ??(tid, sid, lid, pid, sorder, contract_qty, qc_qty, used)' +
                             '  SELECT p.tid, p.sid, p.lid, p.pid, ? As `sorder`, p.contract_qty, p.qc_qty,' +

app/view/layout/layout.ejs

@@ -64,7 +64,7 @@
     }
 
     if (toastInfo !== '') {
-        toastr[type](toastInfo.message);
+        toastr[toastInfo.type](toastInfo.message);
     }
     let user = '<%= ctx.session.sessionUser.name %>';
 </script>