汇总数据相关

app/public/js/path_tree.js

@@ -1104,7 +1104,7 @@ const createNewPathTree = function (type, setting) {
 
                 if (node.code.indexOf('-') >= 0) {
                     return '07';
-                } else if (node.code.length > 5) {
+                } else if (node.code.length >= 5) {
                     const num = _.toNumber(node.code);
                     if (num && num > 10000) return '18';
                 }

app/service/rpt_gather_memory.js

@@ -1466,7 +1466,7 @@ module.exports = app => {
                 });
                 if (!gd) {
                     gd = { name: d.name, unit: d.unit, unit_price: d.unit_price };
-                    this.resultStageSafeProd.push(d);
+                    this.resultStageSafeProd.push(gd);
                 }
                 gd.s_quantity = helper.add(gd.s_quantity, d.quantity);
                 gd.s_total_price = helper.add(gd.s_total_price, d.total_price);
@@ -1546,7 +1546,7 @@ module.exports = app => {
                 });
                 if (!gd) {
                     gd = { name: d.name, unit: d.unit, unit_price: d.unit_price };
-                    this.resultStageTempLand.push(d);
+                    this.resultStageTempLand.push(gd);
                 }
                 gd.s_qty = helper.add(gd.s_qty, d.qty);
                 gd.s_tp = helper.add(gd.s_tp, d.tp);