价差相关

app/lib/rm/material.js

@@ -325,16 +325,18 @@ class ReportMemoryMaterial {
                     return m.gcl_id === x.org_gcl_id && m.xmj_id === x.id && (x.mx_id && x.mx_id !== x.id  ? x.mx_id === m.mx_id : true);
                 });
                 x.is_join = !mnj;
-                if (mnj) continue;
                 const list = materialGl.filter(gl => {
                     return gl.gcl_id === x.org_gcl_id && gl.xmj_id === x.id && (x.mx_id && x.mx_id !== x.id ? x.mx_id === gl.mx_id : true);
                 });
+                list.forEach(l => { l.gather_gcl_id = x.gcl_id});
+
+                if (mnj) continue;
                 for (const l of list) {
-                    x.gather_gcl_id = x.gcl_id;
                     x.jiacha = helper.add(x.jiacha, helper.mul(helper.mul(x.gather_qty, l.quantity), l.m_spread));
                 }
                 x.jiacha = helper.round(x.jiacha, decimal.tp);
                 g.jiacha = helper.add(g.jiacha, x.jiacha);
+                g.jiacha_qty = helper.add(g.jiacha_qty, x.gather_qty);
             }
         }
         return [gatherUtil.gclList, gatherUtil.leafXmjs];

app/lib/rpt_data_analysis.js

@@ -1915,7 +1915,7 @@ const masterCross = {
             prefix: 's_',
             fields: ['code', 'name', 'units'],
             quoteFields: ['quantity'],
-            gatherFields: ['quantity'],
+            gatherFields: [],
         },
         target: 'master_converse'
     },
@@ -1938,7 +1938,7 @@ const masterCross = {
             for (const f of options.main.fields) {
                 temp[options.main.prefix + f] = m[f];
             }
-            const rela = subTable.filter(x => { return x[options.sub.subKey] === m[options.masterKey]; });
+            const rela = subTable.filter(x => { return x[options.sub.subKey] === m[options.sub.masterKey]; });
             for (const cd of converseData) {
                 const nd = JSON.parse(JSON.stringify(temp));
                 nd.quote = false;