报表，其他台账，截止本期计算

app/service/report_memory.js

@@ -827,11 +827,11 @@ module.exports = app => {
                         d.pre_arrive_tp = pd.arrive_tp;
                         d.pre_deduct_qty = pd.deduct_qty;
                         d.pre_deduct_tp = pd.deduct_tp;
-                        d.end_arrive_qty = this.ctx.helper.add(d.pre_arrive_qty, d.arrive_qty);
-                        d.end_arrive_tp = this.ctx.helper.add(d.pre_arrive_tp, d.arrive_tp);
-                        d.end_deduct_qty = this.ctx.helper.add(d.pre_deduct_qty, d.deduct_qty);
-                        d.end_deduct_tp = this.ctx.helper.add(d.pre_deduct_tp, d.deduct_tp);
                     }
+                    d.end_arrive_qty = this.ctx.helper.add(d.pre_arrive_qty, d.arrive_qty);
+                    d.end_arrive_tp = this.ctx.helper.add(d.pre_arrive_tp, d.arrive_tp);
+                    d.end_deduct_qty = this.ctx.helper.add(d.pre_deduct_qty, d.deduct_qty);
+                    d.end_deduct_tp = this.ctx.helper.add(d.pre_deduct_tp, d.deduct_tp);
                 }
                 return data;
             } catch (err) {
@@ -862,8 +862,8 @@ module.exports = app => {
                     const pd = this.ctx.helper._.find(preData, {uuid: d.uuid});
                     if (pd) {
                         d.pre_tp = pd.tp;
-                        d.end_tp = this.ctx.helper.add(d.pre_tp, d.tp);
                     }
+                    d.end_tp = this.ctx.helper.add(d.pre_tp, d.tp);
                 }
                 return data;
             } catch (err) {
@@ -883,9 +883,9 @@ module.exports = app => {
                     if (pd) {
                         d.pre_qty = pd.qty;
                         d.pre_tp = pd.tp;
-                        d.end_qty = this.ctx.helper.add(d.pre_qty, d.qty);
-                        d.end_tp = this.ctx.helper.add(d.pre_tp, d.tp);
                     }
+                    d.end_qty = this.ctx.helper.add(d.pre_qty, d.qty);
+                    d.end_tp = this.ctx.helper.add(d.pre_tp, d.tp);
                 }
                 return data;
             } catch (err) {
@@ -905,9 +905,9 @@ module.exports = app => {
                     if (pd) {
                         d.pre_qty = pd.qty;
                         d.pre_tp = pd.tp;
-                        d.end_qty = this.ctx.helper.add(d.pre_qty, d.qty);
-                        d.end_tp = this.ctx.helper.add(d.pre_tp, d.tp);
                     }
+                    d.end_qty = this.ctx.helper.add(d.pre_qty, d.qty);
+                    d.end_tp = this.ctx.helper.add(d.pre_tp, d.tp);
                 }
                 return data;
             } catch (err) {

builder_report_index_define.js

@@ -74,11 +74,11 @@ const stage_jgcl = {
         { name: 'uuid', field: 'uuid', type: dataType.str },
         { name: '名称', field: 'name', type: dataType.str },
         { name: '单位', field: 'unit', type: dataType.str },
-        { name: '单价', field: 'unit_price', type: dataType.currency, tag: { type: 'up' } },
-        { name: '本期到场-数量', field: 'arrive_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 4 } },
-        { name: '本期到场-金额', field: 'arrive_tp', type: dataType.currency, tag: { type: 'tp' } },
-        { name: '本期扣回-数量', field: 'deduct_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 4 } },
-        { name: '本期扣回-金额', field: 'deduct_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '单价', field: 'unit_price', type: dataType.currency },
+        { name: '本期到场-数量', field: 'arrive_qty', type: dataType.currency },
+        { name: '本期到场-金额', field: 'arrive_tp', type: dataType.currency },
+        { name: '本期扣回-数量', field: 'deduct_qty', type: dataType.currency },
+        { name: '本期扣回-金额', field: 'deduct_tp', type: dataType.currency },
         { name: '材料来源', field: 'source', type: dataType.str },
         { name: '单据号', field: 'bills_code', type: dataType.str },
         { name: '检验单编号', field: 'check_code', type: dataType.str },
@@ -88,11 +88,15 @@ const stage_jgcl = {
         { name: '期历史记录', field: 'shistory', type: dataType.str },
         { name: '排序', field: 'order', type: dataType.int },
         { name: '往期是否已用', field: 'pre_used', type: dataType.int },
-        { name: '截止上期到场-数量', field: 'pre_arrive_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 4 } },
-        { name: '截止上期到场-金额', field: 'pre_arrive_tp', type: dataType.currency, tag: { type: 'tp' } },
-        { name: '截止上期扣回-数量', field: 'pre_deduct_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 4 } },
-        { name: '截止上期扣回-金额', field: 'pre_deduct_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '截止上期到场-数量', field: 'pre_arrive_qty', type: dataType.currency },
+        { name: '截止上期到场-金额', field: 'pre_arrive_tp', type: dataType.currency },
+        { name: '截止上期扣回-数量', field: 'pre_deduct_qty', type: dataType.currency },
+        { name: '截止上期扣回-金额', field: 'pre_deduct_tp', type: dataType.currency },
         { name: '备注', field: 'memo', type: dataType.str },
+        { name: '截止本期到场-数量', field: 'end_arrive_qty', type: dataType.currency },
+        { name: '截止本期到场-金额', field: 'end_arrive_tp', type: dataType.currency },
+        { name: '截止本期扣回-数量', field: 'end_deduct_qty', type: dataType.currency },
+        { name: '截止本期扣回-金额', field: 'end_deduct_tp', type: dataType.currency },
     ],
 };
 const stage_bonus = {
@@ -136,15 +140,16 @@ const stage_other = {
         { name: '新增期id', field: 'add_sid', type: dataType.int },
         { name: '创建时间', field: 'add_time', type: dataType.time },
         { name: '名称', field: 'name', type: dataType.str },
-        { name: '金额', field: 'total_price', type: dataType.currency, tag: { type: 'tp' } },
-        { name: '本期金额', field: 'tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '金额', field: 'total_price', type: dataType.currency },
+        { name: '本期金额', field: 'tp', type: dataType.currency },
         { name: '时间', field: 'real_time', type: dataType.time },
         { name: '备注', field: 'memo', type: dataType.str },
         { name: '期历史记录', field: 'shistory', type: dataType.str },
         { name: '排序', field: 'order', type: dataType.int },
         { name: '往期是否已用', field: 'pre_used', type: dataType.int },
-        { name: '截止上期-金额', field: 'pre_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '截止上期-金额', field: 'pre_tp', type: dataType.currency },
         { name: '类型', field: 'o_type', type: dataType.str },
+        { name: '截止本期-金额', field: 'end_tp', type: dataType.currency},
     ],
 };
 const stage_safe_prod = {