优化接口

application/api/controller/Product.php

@@ -39,10 +39,10 @@ class Product extends Api
         if (!isset($limit)){
             $limit = 15;
         }
-        if (!isset($pages)){
+        if (!isset($params['page'])){
             $pages = 0;
         }else{
-            $pages = ($params['page']-1) * $limit;
+            $pages = ((int)$params['page'] -1 ) * (int)$limit;
         }
         $total = 0;
         if (isset($params['custom_code']) && !empty($params['custom_code'])){

application/api/controller/StaffSalary.php

@@ -96,7 +96,7 @@ class StaffSalary extends Api
         $delRes = \db('绩效工资汇总')->where('sczl_rq','between',[$startDate,$endDate])->delete();
         $where = [];
         $where['a.sczl_rq'] = ['between',[$startDate,$endDate]];
-        $fields = "a.sczl_gdbh,a.sczl_yjno,a.sczl_gxh,a.sczl_gxmc as sczl_type,a.sczl_rq,a.sczl_jtbh,a.sczl_ms,a.sczl_cl as 班组车头产量,a.sczl_Pgcl,a.sczl_zcfp,
+        $fields = "a.sczl_gdbh,a.sczl_yjno,a.sczl_gxh,a.sczl_gxmc as sczl_type,a.sczl_rq,a.sczl_jtbh,a.sczl_工价系数,a.sczl_ms,a.sczl_cl as 班组车头产量,a.sczl_Pgcl,a.sczl_zcfp,
                 a.sczl_装版工时 as 装版工时,a.sczl_保养工时 as 保养工时,a.sczl_打样工时 as 打样工时,a.sczl_异常停机工时 as 异常停机工时,a.sczl_设备运行工时 as 车头产量占用机时,
                 a.sczl_bh1,a.sczl_bh2,a.sczl_bh3,a.sczl_bh4,a.sczl_bh5,a.sczl_bh6,a.sczl_bh7,a.sczl_bh8,a.sczl_bh9,a.sczl_bh10,
                 a.sczl_rate1,a.sczl_rate2,a.sczl_rate3,a.sczl_rate4,a.sczl_rate5,a.sczl_rate6,a.sczl_rate7,a.sczl_rate8,a.sczl_rate9,a.sczl_rate10,a.sczl_废品率系数,
@@ -134,13 +134,30 @@ class StaffSalary extends Api
                 $value['班组车头产量'] = $value['班组车头产量'] * $value['sczl_Pgcl'];
                 $byThePieceYield = round($value['班组车头产量']  * $value['sczl_废品率系数']);
             }else{
-                if ($value['工序难度系数'] <= 0 || empty($value['工序难度系数'])){
-                    $value['工序难度系数'] = '1.0000';
-                    $byThePieceYield = $value['班组车头产量'];
+                if ($value['sczl_工价系数'] == '0.000' || floatval($value['sczl_工价系数']) <= 0){
+                    //工序难度系数
+                    $gx_rate = $value['工序难度系数'];
+                    if (floatval($value['工序难度系数']) <= 0 || empty($value['工序难度系数'])){
+                        $gx_rate = '1.0000';
+                    }
                 }else{
-                    $byThePieceYield = round($value['班组车头产量'] * $value['工序难度系数']);
+                    $gx_rate = number_format($value['sczl_工价系数'] * $value['工序难度系数'],3);
                 }
+                $byThePieceYield = round($value['班组车头产量'] * $gx_rate);
             }
+//            //计件产量
+//            if (substr($value['sczl_jtbh'],0,2) == 'JP'){
+//                $value['工序难度系数'] = $value['sczl_废品率系数'];
+//                $value['班组车头产量'] = $value['班组车头产量'] * $value['sczl_Pgcl'];
+//                $byThePieceYield = round($value['班组车头产量']  * $value['sczl_废品率系数']);
+//            }else{
+//                if ($value['工序难度系数'] <= 0 || empty($value['工序难度系数'])){
+//                    $value['工序难度系数'] = '1.0000';
+//                    $byThePieceYield = $value['班组车头产量'];
+//                }else{
+//                    $byThePieceYield = round($value['班组车头产量'] * $value['工序难度系数']);
+//                }
+//            }
             //补产产量/班组换算产量
             $afterProductionYield = ($value['装版工时'] + $value['保养工时'] + $value['打样工时']) * $value['补产标准'];
             //核算产量
@@ -166,7 +183,7 @@ class StaffSalary extends Api
                     $item['sczl_jtbh'] = $value['sczl_jtbh'];
                     $item['班组车头产量'] = $value['班组车头产量'];
                     $item['工价系数'] = '0.0000';
-                    $item['工序难度系数'] = $value['工序难度系数'];
+                    $item['工序难度系数'] = $gx_rate;
                     $item['装版工时'] = $value['装版工时'];
                     $item['保养工时'] = $value['保养工时'];
                     $item['打样工时'] = $value['打样工时'];
@@ -187,7 +204,7 @@ class StaffSalary extends Api
                 }
             }
         }
-//        halt($data);
+
         /**
          * 拆片工序数据
         */
@@ -496,7 +513,7 @@ class StaffSalary extends Api
             $data[$key]['法定天数'] = $params['days'];
             $data[$key]['sczl_type'] = trim($item['sczl_type']);
         }
-        $taskIdentifier = md5(json_encode('date'));
+
         // 检查任务是否已经存在于队列中，如果不存在则推送任务到队列
         if (!$redis->has($taskIdentifier)) {
             $job = new InsertDataJob($data); // 创建任务实例