合同支付，新增甲供材料到场、扣回计算基数

app/service/phase_pay.js

@@ -30,7 +30,9 @@ const calcBase = [
     {name: '本期应付', code: 'bqyf', limit: true, ptNormalLimit: true, sort: 20},
     {name: '奖金', code: 'bonus', limit: true, sort: 1},
     {name: '罚金', code: 'fine', limit: true, sort: 1},
-    {name: '甲供材料', code: 'jgcl', limit: true, sort: 1},
+    // {name: '甲供材料', code: 'jgcl', limit: true, sort: 1},
+    {name: '甲供材料-本期到场', code: 'jgcldc', limit: true, sort: 1},
+    {name: '甲供材料-本期扣回', code: 'jgclkh', limit: true, sort: 1},
 ];
 
 module.exports = app => {
@@ -145,7 +147,9 @@ module.exports = app => {
             result.bonus_forfeit_tp = bonusSum.forfeit_tp || 0;
             result.bonus_tp = bonusSum.sum_tp || 0;
             const jgclSum = await this.ctx.service.stageJgcl.getSumTp(relaStage);
-            result.jgcl_tp = jgclSum.sum_tp || 0;
+            result.jgcl_arrive_tp = jgclSum.arrive_tp || 0;
+            result.jgcl_deduct_tp = jgclSum.deduct_tp || 0;
+            result.jgcl_tp = this.ctx.helper.add(result.jgcl_arrive_tp, result.jgcl_deduct_tp);
             const otherSum = await this.ctx.service.stageOther.getSumTp(relaStage);
             result.other_tp = otherSum.sum_tp || 0;
             const safeProdSum = await this.ctx.service.stageSafeProd.getSumTp(relaStage);
@@ -169,7 +173,11 @@ module.exports = app => {
                 result.pre_bonus_reward_tp = this.ctx.helper.add(prePhase.calc_base.bonus_reward_tp, prePhase.calc_base.pre_bonus_reward_tp);
                 result.pre_bonus_forfeit_tp = this.ctx.helper.add(prePhase.calc_base.bonus_forfeit_tp, prePhase.calc_base.pre_bonus_forfeit_tp);
                 result.pre_bonus_tp = this.ctx.helper.add(prePhase.calc_base.bonus_tp, prePhase.calc_base.pre_bonus_tp);
+
                 result.pre_jgcl_tp = this.ctx.helper.add(prePhase.calc_base.jgcl_tp, prePhase.calc_base.pre_jgcl_tp);
+                result.pre_jgcl_arrive_tp = this.ctx.helper.add(prePhase.calc_base.jgcl_arrive_tp, prePhase.calc_base.pre_jgcl_arrive_tp);
+                result.pre_jgcl_deduct_tp = this.ctx.helper.add(prePhase.calc_base.jgcl_deduct_tp, prePhase.calc_base.pre_jgcl_deduct_tp);
+
                 result.pre_other_tp = this.ctx.helper.add(prePhase.calc_base.other_tp, prePhase.calc_base.pre_other_tp);
                 result.pre_safe_prod_tp = this.ctx.helper.add(prePhase.calc_base.safe_prod_tp, prePhase.calc_base.pre_safe_prod_tp);
                 result.pre_temp_land_tp = this.ctx.helper.add(prePhase.calc_base.temp_land_tp, prePhase.calc_base.pre_temp_land_tp);
@@ -238,6 +246,12 @@ module.exports = app => {
                     case 'jgcl':
                         cb.value = phasePay.calc_base.jgcl_tp;
                         break;
+                    case 'jgcldc':
+                        cb.value = phasePay.calc_base.jgcl_arrive_tp;
+                        break;
+                    case 'jgclkh':
+                        cb.value = phasePay.calc_base.jgcl_deduct_tp;
+                        break;
                     case 'aqsc':
                         cb.value = phasePay.calc_base.safe_prod_tp;
                         break;