Explorar o código

汇总表相关

MaiXinRong hai 1 ano
pai
achega
dd9b8b6b10
Modificáronse 1 ficheiros con 6 adicións e 2 borrados
  1. 6 2
      app/service/rpt_gather_memory.js

+ 6 - 2
app/service/rpt_gather_memory.js

@@ -72,6 +72,7 @@ const gatherUtils = {
 
         gatherNode[prefix + "due_qc_qty"] = helper.add(gatherNode[prefix + "due_qc_qty"], sourceNode.due_qc_qty);
         gatherNode[prefix + "due_qc_tp"] = helper.add(gatherNode[prefix + "due_qc_tp"], sourceNode.due_qc_tp);
+        gatherNode[prefix + "due_qc_minus_qty"] = helper.add(gatherNode[prefix + "due_qc_minus_qty"], sourceNode.due_qc_minus_qty);
         gatherNode[prefix + "due_final_qty"] = helper.add(gatherNode[prefix + "due_final_qty"], sourceNode.due_final_qty);
         gatherNode[prefix + "due_final_tp"] = helper.add(gatherNode[prefix + "due_final_tp"], sourceNode.due_final_tp);
 
@@ -112,6 +113,7 @@ const gatherUtils = {
 
         gatherNode.s_due_qc_qty = helper.add(gatherNode.s_due_qc_qty, sourceNode.due_qc_qty);
         gatherNode.s_due_qc_tp = helper.add(gatherNode.s_due_qc_tp, sourceNode.due_qc_tp);
+        gatherNode.s_due_qc_minus_qty = helper.add(gatherNode.s_due_qc_minus_qty, sourceNode.due_qc_minus_qty);
         gatherNode.s_due_final_qty = helper.add(gatherNode.s_due_final_qty, sourceNode.due_final_qty);
         gatherNode.s_due_final_tp = helper.add(gatherNode.s_due_final_tp, sourceNode.due_final_tp);
     },
@@ -200,6 +202,7 @@ const gatherUtils = {
 
         gatherNode[prefix + "due_qc_qty"] = helper.add(gatherNode[prefix + "due_qc_qty"], sourceNode.due_qc_qty);
         gatherNode[prefix + "due_final_qty"] = helper.add(gatherNode[prefix + "due_final_qty"], sourceNode.due_final_qty);
+        gatherNode[prefix + "due_qc_minus_qty"] = helper.add(gatherNode[prefix + "due_qc_minus_qty"], sourceNode.due_qc_minus_qty);
 
         gatherNode.s_qty = helper.add(gatherNode.s_qty, sourceNode.quantity);
 
@@ -217,6 +220,7 @@ const gatherUtils = {
 
         gatherNode.s_due_qc_qty = helper.add(gatherNode.s_due_qc_qty, sourceNode.due_qc_qty);
         gatherNode.s_due_final_qty = helper.add(gatherNode.s_due_final_qty, sourceNode.due_final_qty);
+        gatherNode.s_due_qc_minus_qty = helper.add(gatherNode.s_due_qc_minus_qty, sourceNode.due_qc_minus_qty);
     },
     gatherZonePos: function (tender, gatherNode, sourceNode, prefix, helper) {
         gatherNode[prefix + 'id'] = tender.id;
@@ -581,7 +585,7 @@ module.exports = app => {
             });
             const billsData = await this.ctx.service.ledger.getData(tender.id);
             const dgnData = await this.ctx.service.stageBillsDgn.getDgnData(tender.id);
-            const changeBillsData = await this.ctx.service.changeAuditList.getBillsSum(this.ctx.tender.id);
+            const changeBillsData = await this.ctx.service.changeAuditList.getBillsSum(tender.id);
             this.ctx.helper.assignRelaData(billsData, [
                 { data: dgnData, fields: ['deal_dgn_qty1', 'deal_dgn_qty2', 'c_dgn_qty1', 'c_dgn_qty2'], prefix: '', relaId: 'id' },
                 { data: changeBillsData, fields: ['qc_qty', 'qc_tp', 'qc_minus_qty'], prefix: 'due_', relaId: 'gcl_id' },
@@ -598,7 +602,7 @@ module.exports = app => {
                 },
             });
             const posData = await this.ctx.service.pos.getPosData({ tid: tender.id });
-            const changePosData = await this.ctx.service.changeAuditList.getPosSum(this.ctx.tender.id);
+            const changePosData = await this.ctx.service.changeAuditList.getPosSum(tender.id);
             this.ctx.helper.assignRelaData(posData, [
                 { data: changePosData, fields: ['qc_qty', 'qc_minus_qty'], prefix: 'due_', relaId: 'mx_id' },
             ]);