根据多期计量变更调整

app/controller/change_controller.js

@@ -428,7 +428,7 @@ module.exports = app => {
                     removeSettleNum,
                 };
                 // 获取是否已存在调用变更令
-                let changeUsedData = await ctx.service.stageChange.getFinalUsedData(ctx.tender.id, change.cid);
+                let changeUsedData = await ctx.service.stageChange.getAllFinalUsedData(ctx.tender.id, change.cid);
                 changeUsedData = ctx.helper._.orderBy(ctx.helper._.filter(changeUsedData, function(item) {
                     return item.qty !== null;
                 }), ['sorder'], ['desc']);
@@ -443,7 +443,6 @@ module.exports = app => {
                         }
                     }
                 }
-                console.log(useChangeUsedData);
                 renderData.changeUsedData = useChangeUsedData;
                 renderData.stageChangeNum = this.ctx.helper.sum(changeUsedData.map(x => { return Math.abs(x.qty); }));
                 if (!change.readOnly || ctx.session.sessionUser.is_admin) {

app/service/stage_change.js

@@ -601,6 +601,7 @@ module.exports = app => {
                     result.push(...cur);
                 }
             }
+            return result;
         }
 
         /**