包装计件优化

application/api/controller/PackagingCountDocument.php

@@ -447,7 +447,7 @@ class PackagingCountDocument extends Api
             'sczl_计产系数1', 'sczl_计产系数2', 'sczl_计产系数3', 'sczl_计产系数4', 'sczl_计产系数5', 'sczl_计产系数6',
             'sczl_Jtbh1','sczl_Jtbh2', 'sczl_Jtbh3', 'sczl_Jtbh4', 'sczl_Jtbh5', 'sczl_Jtbh6',
             'sczl_dedh1', 'sczl_dedh2', 'sczl_dedh3', 'sczl_dedh4', 'sczl_dedh5', 'sczl_dedh6',
-            'sczl_desc'
+            'sczl_desc','sczl_type1','sczl_type2','sczl_type3','sczl_type4','sczl_type5','sczl_type6'
         ];
         $data = [];
         foreach ($arr as $key => $value){
@@ -460,7 +460,6 @@ class PackagingCountDocument extends Api
 
         //查询UniqId
         $UniqId = db()->table('db_包装计件')->max('UniqId');
-        $data['UniqId'] = $UniqId < 10000000 ? 10000000 : $UniqId + 1;
 
         //开启事务
         db()->startTrans();
@@ -504,7 +503,7 @@ class PackagingCountDocument extends Api
             'sczl_计产系数1', 'sczl_计产系数2', 'sczl_计产系数3', 'sczl_计产系数4', 'sczl_计产系数5', 'sczl_计产系数6',
             'sczl_Jtbh1','sczl_Jtbh2', 'sczl_Jtbh3', 'sczl_Jtbh4', 'sczl_Jtbh5', 'sczl_Jtbh6',
             'sczl_dedh1', 'sczl_dedh2', 'sczl_dedh3', 'sczl_dedh4', 'sczl_dedh5', 'sczl_dedh6',
-            'sczl_desc'
+            'sczl_desc','sczl_type1','sczl_type2','sczl_type3','sczl_type4','sczl_type5','sczl_type6'
         ];
         $data = [];
         foreach ($arr as $key => $value){

application/api/controller/StaffSalary.php

@@ -369,6 +369,7 @@ class StaffSalary extends Api
                      a.sczl_返工产量1, a.sczl_返工产量2, a.sczl_返工产量3, a.sczl_返工产量4, a.sczl_返工产量5, a.sczl_返工产量6,
                      a.sczl_Jtbh1,a.sczl_Jtbh2,a.sczl_Jtbh3,a.sczl_Jtbh4,a.sczl_Jtbh5,a.sczl_Jtbh6,
                      a.sczl_PgCl1,a.sczl_PgCl2,a.sczl_PgCl3,a.sczl_PgCl4,a.sczl_PgCl5,a.sczl_PgCl6,
+                     a.sczl_type1,a.sczl_type2,sczl_type3,a.sczl_type4,a.sczl_type5,sczl_type6,
 		             a.sczl_计产系数1,a.sczl_计产系数2,a.sczl_计产系数3,a.sczl_计产系数4,a.sczl_计产系数5,a.sczl_计产系数6,
                      c1.工价系数 as 工序难度系数1,c2.工价系数 as 工序难度系数2,c3.工价系数 as 工序难度系数3,c4.工价系数 as 工序难度系数4,c5.工价系数 as 工序难度系数5,c6.工价系数 as 工序难度系数6,
 		             b1.千件工价 as 千件工价1, b2.千件工价 as 千件工价2, b3.千件工价 as 千件工价3, b4.千件工价 as 千件工价4, b5.千件工价 as 千件工价5, b6.千件工价 as 千件工价6,
@@ -398,7 +399,6 @@ class StaffSalary extends Api
             ->where($where)
             ->group('a.UniqId')
             ->select();
-//        halt($result);
         foreach ($result as $value){
             for ($i=1;$i<7;$i++){
                 $item = [];
@@ -415,6 +415,7 @@ class StaffSalary extends Api
                 $pgclKey = 'sczl_PgCl'.$i;
                 $jcxsKey = 'sczl_计产系数'.$i;
                 $cpmcKey = 'cpmc'.$i;
+                $typekey = 'sczl_type'.$i;
                 if (!empty($value[$gdbhKey])){
                     $item['sczl_gdbh'] = $value[$gdbhKey];
                     $item['sczl_yjno'] = ltrim(substr($value[$yjgxKey],0,2), '0');
@@ -426,18 +427,13 @@ class StaffSalary extends Api
                     }
                     $item['sczl_rq'] = $value['sczl_rq'];
                     $item['sczl_jtbh'] = $value[$jtbhKey];
-                    if (strpos($value[$cpmcKey],'条')){
-                        $num = 1000;
-                    }else{
-                        $num = 2500;
-                    }
                     if (!empty($value[$reworkKey]) && $value[$reworkKey] > 0){
                         $cl = $value[$reworkKey];
                     }else{
                         $cl = $value[$clKey];
                     }
                     if ($item['sczl_type'] === '包装'){
-                        $item['班组车头产量'] = $cl * $value[$pgclKey]  / $num;
+                        $item['班组车头产量'] = $cl * $value[$pgclKey] / $value[$typekey];
                     }else{
                         $item['班组车头产量'] = $cl;
                     }
@@ -472,7 +468,6 @@ class StaffSalary extends Api
                 }
             }
         }
-//        halt($data);
         // 用于存储bh对应的工时占比总和
         $bhTotals = [];
         // 遍历原始数据