工资计算优化，印版新增优化

application/api/controller/PowerManagement.php

@@ -174,7 +174,7 @@ class PowerManagement extends Api
         $this->success('成功', $data);
     }
 
-// 批量获取电表数据的方法
+    // 批量获取电表数据的方法
     private function getBatchMeterData(array $machineIds, array $months)
     {
         $results = [];

application/api/controller/PrintingPlate.php

@@ -249,7 +249,18 @@ class PrintingPlate extends Api
             ->find();
         if (empty($res)){
             $data['Sys_rq'] = date('Y-m-d H:i:s',time());
-            $sql = db('产品_印版库')->fetchSql(true)->insert($data);
+            if ($param['number'] !== '' || $param['number'] !== '0'){
+                for ($i = 1; $i <= $param['number']; $i++){
+                    if ($i<10){
+                        $number = '0'.$i;
+                    }
+                    $data['供方批号'] = $param['batch'].'-'.$number;
+                    $resData[] = $data;
+                }
+                $sql = db('产品_印版库')->fetchSql(true)->insertAll($resData);
+            }else{
+                $sql = db('产品_印版库')->fetchSql(true)->insert($data);
+            }
         }else{
             $UniqID = $param['UniqID'];
             $data['Mod_rq'] = date('Y-m-d H:i:s',time());
@@ -287,7 +298,7 @@ class PrintingPlate extends Api
         $where['物料代码'] = ['like', $code . '%'];
 
         if (!empty($param['search'])) {
-            $where['物料名称|物料代码'] = ['like', '%' . $param['search'] . '%'];
+            $where['物料代码'] =  $param['search'];
         }
         // 查询物料存货编码
         $list = db('物料_存货编码')

application/api/controller/StaffSalary.php

@@ -102,7 +102,11 @@ class StaffSalary extends Api
         $where = [];
         $where['a.sczl_rq'] = ['between',[$startDate,$endDate]];
         //查询印刷印后车间的机台,添加搜索条件
-        $jtbhs = db('设备_基本资料')->where('sys_sbID','<>','')->column('设备编号');
+        $sist = ['胶印车间','凹丝印车间','印后车间','检验车间'];
+        $jtbhs = db('设备_基本资料')
+            ->where('sys_sbID','<>','')
+            ->where('使用部门','in',$sist)
+            ->column('设备编号');
         $fields = "a.sczl_gdbh,a.sczl_yjno,a.sczl_gxh,a.sczl_type 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_异常工时1 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,
@@ -619,5 +623,4 @@ class StaffSalary extends Api
             $this->success('数据正在处理中,请等待...');
         }
     }
-
 }