浏览代码

工资计算

unknown 3 月之前
父节点
当前提交
a4aab4bc89
共有 2 个文件被更改,包括 3 次插入1 次删除
  1. 1 0
      application/api/controller/GluSalaryCalculation.php
  2. 2 1
      application/api/controller/GluingSalary.php

+ 1 - 0
application/api/controller/GluSalaryCalculation.php

@@ -45,6 +45,7 @@ class GluSalaryCalculation extends Api
                         'sczl_gdbh' => $v['工单编号'],
                         'sczl_gxmc' => $v['工序名称'],
                         'sczl_rq' => $v['日期'],
+                        'sczl_cl' => $v['产量'],
                         'sczl_dedh' => $v['定额代号'],
                         '工价系数' => $v['工价系数'],
                         '保养工时' => $v['保养工时'],

+ 2 - 1
application/api/controller/GluingSalary.php

@@ -191,7 +191,8 @@ class GluingSalary extends Api
             $this->error('参数错误');
         }
         $list = \db('糊盒工资汇总')
-            ->field('sczl_gdbh,sczl_gxmc,DATE_FORMAT(sczl_rq, "%Y.%m.%d") as 日期,sczl_jtbh,cpdh,cpmc,保养工时,装版工时,异常工时,设备运行工时,rate as 分配比例')
+            ->field('sczl_gdbh,sczl_gxmc,DATE_FORMAT(sczl_rq, "%Y.%m.%d") as 日期,sczl_jtbh,cpdh,cpmc,保养工时,装版工时,
+            异常工时,设备运行工时,rate as 分配比例,sczl_cl')
             ->where([
                 'sczl_rq' => ['like',$req['date'].'%'],
                 'bh' => $req['code']