系统优化

application/api/controller/EmployeeDailySalary.php

@@ -238,7 +238,7 @@ class EmployeeDailySalary extends Api
             sum(异常停机工时) as 异常停机工时, sum(车头产量占用机时) as 车头产量占用机时, 日定额,
             sum(达标定额) as 达标定额, 千件工价, 补产标准, bh, rtrim(xm) as xm, Rate')
             ->join('工单_印件资料 g','g.Yj_Gdbh = 绩效工资汇总.sczl_gdbh AND g.yj_Yjno = 绩效工资汇总.sczl_yjno','LEFT')
-            ->group('LEFT(sczl_rq, 10),sczl_gdbh,CONCAT(sczl_yjno, "-", sczl_gxh),千件工价,工序难度系数')
+            ->group('LEFT(sczl_rq, 10),sczl_gdbh,CONCAT(sczl_yjno, "-", sczl_gxh),千件工价,工序难度系数,Rate')
             ->where(['sys_ny'=>$req['date'],'bh'=>$req['code']])
             ->select();
         if(!$res){

application/api/controller/Facility.php

@@ -1533,7 +1533,7 @@ class Facility extends Api
                 '检验项目' => $value['item'],
                 '相关标准' => $value['standard'],
                 '量测仪器' => $value['instrument'],
-                '检验结果' => $value['result'],
+                '检验结果' => $value['selected'],
                 '检验备注' => $value['remark'],
                 '提交时间' => date('Y-m-d H:i:s',time()),
                 '开工时间' => rtrim($startTime['开工时间']),

application/api/controller/FinishedProductWarehousing.php

@@ -142,12 +142,10 @@ class FinishedProductWarehousing extends Api
             rtrim(c.客户料号) as 客户料号, rtrim(c.jjcp_desc) as jjcp_desc, LEFT(c.成品编码,'.config('product_code_digit').') as 客户编号, rtrim(g.Gd_客户名称) as Gd_客户名称, 
             rtrim(c.机型备注) as 机型备注, rtrim(c.Sys_id) as Sys_id, c.Sys_rq, c.Mod_rq, c.UniqId')
             ->where($where)
-            ->where('g.Gd_cpdh=c.jjcp_cpdh')
-            ->join('工单_基本资料 g','g.Gd_gdbh=c.jjcp_gdbh')
+            ->join('工单_基本资料 g','g.Gd_gdbh=c.jjcp_gdbh AND g.行号 = c.jjcp_yjno AND g.Gd_cpdh=c.jjcp_cpdh')
             ->order('c.UniqId desc')
-//            ->page($page,$limit)
+            ->fetchSql(true)
             ->select();
-
         $total = db('成品入仓')->where($option)->count();
         foreach ($rows as $key=>$value) {
             $row = db('成品入仓')
@@ -367,6 +365,7 @@ class FinishedProductWarehousing extends Api
             ->group('j.yj_yjno')
             ->order('j.yj_yjno asc')
             ->select();
+
         // $rows = db()->table('工单_印件资料')->alias('j')
         //     ->field('g.Gd_gdbh, j.yj_Yjno as yj_yjno, rtrim(g.销售订单号) as 销售订单号, rtrim(j.yj_Yjdh) as yj_Yjdh, 
         //     rtrim(j.yj_yjmc) as yj_yjmc, rtrim(g.成品代号) as 成品代号, rtrim(g.成品名称) as 成品名称, rtrim(g.客户料号) as 客户料号')

application/api/controller/LargeWasteRewardPunish.php

@@ -299,10 +299,34 @@ class LargeWasteRewardPunish extends Api
         if ($this->request->isGet() === false){
             $this->error('非法请求');
         }
-        $list = \db('设备_基本资料')
-            ->field('rtrim(设备编号) as 设备编号')
-            ->where('sys_sbID','<>','')
+        $param = $this->request->param();
+        $list = \db('设备_产量计酬')
+            ->alias('a')
+            ->join('人事_基本资料 b1','a.sczl_bh1 = b1.员工编号','left')
+            ->join('人事_基本资料 b2','a.sczl_bh2 = b2.员工编号','left')
+            ->join('人事_基本资料 b3','a.sczl_bh3 = b3.员工编号','left')
+            ->join('人事_基本资料 b4','a.sczl_bh4 = b4.员工编号','left')
+            ->join('人事_基本资料 b5','a.sczl_bh5 = b5.员工编号','left')
+            ->join('人事_基本资料 b6','a.sczl_bh6 = b6.员工编号','left')
+            ->join('人事_基本资料 b7','a.sczl_bh7 = b7.员工编号','left')
+            ->join('人事_基本资料 b8','a.sczl_bh8 = b8.员工编号','left')
+            ->join('人事_基本资料 b9','a.sczl_bh9 = b9.员工编号','left')
+            ->join('人事_基本资料 b10','a.sczl_bh10 = b10.员工编号','left')
+            ->field('a.sczl_gxmc as 工序名称,a.sczl_jtbh as 机台编号,a.sczl_bh1 as 员工编号1,rtrim(b1.员工姓名) as 员工姓名1
+            ,a.sczl_bh2 as 员工编号2,rtrim(b2.员工姓名) as 员工姓名2,a.sczl_bh3 as 员工编号3,rtrim(b3.员工姓名) as 员工姓名3
+            ,a.sczl_bh4 as 员工编号4,rtrim(b4.员工姓名) as 员工姓名4,a.sczl_bh5 as 员工编号5,rtrim(b5.员工姓名) as 员工姓名5
+            ,a.sczl_bh6 as 员工编号6,rtrim(b6.员工姓名) as 员工姓名6,a.sczl_bh7 as 员工编号7,rtrim(b7.员工姓名) as 员工姓名7
+            ,a.sczl_bh8 as 员工编号8,rtrim(b8.员工姓名) as 员工姓名8,a.sczl_bh9 as 员工编号9,rtrim(b9.员工姓名) as 员工姓名9
+            ,a.sczl_bh10 as 员工编号10,rtrim(b10.员工姓名) as 员工姓名10')
+            ->where('a.sczl_gdbh',$param['gdbh'])
+            ->where('a.sczl_yjno',$param['yjno'])
+            ->where('a.sczl_bzdh','like',substr($param['bzdh'],0,1).'%')
+            ->group('机台编号,员工编号1,员工编号2,员工编号3,员工编号4,员工编号5,员工编号6,员工编号7,员工编号8,员工编号9,员工编号10')
             ->select();
+//        $list = \db('设备_基本资料')
+//            ->field('rtrim(设备编号) as 设备编号')
+//            ->where('sys_sbID','<>','')
+//            ->select();
         if (empty($list)){
             $this->success('未找到机台编号');
         }

application/api/controller/OvertimeVerification.php

@@ -219,7 +219,7 @@ class OvertimeVerification extends Api
             as 达标定额,千件工价,补产标准,sum(个人计件工资) as 个人计件工资,sum(个人加班工资) as 个人加班工资,Rate as 个人比例,
             sum(装版工时) as 装版工时,sum(保养工时) as 保养工时,sum(打样工时) as 打样工时,sum(计时补差额工资) as 计时补差')
             ->join('工单_印件资料 g','g.Yj_Gdbh = 绩效工资汇总.sczl_gdbh AND g.yj_Yjno = 绩效工资汇总.sczl_yjno','LEFT')
-            ->group('LEFT(sczl_rq, 10),sczl_gdbh,CONCAT(sczl_yjno, "-", sczl_gxh, "-", sczl_type)')
+            ->group('LEFT(sczl_rq, 10),sczl_gdbh,CONCAT(sczl_yjno, "-", sczl_gxh, "-", sczl_type),千件工价,工序难度系数,个人比例')
             ->where(['sys_ny'=>$req['date'],'bh'=>$req['code']])
             ->select();
         if(!$res){

application/api/controller/StaffSalary.php

@@ -249,12 +249,6 @@ class StaffSalary extends Api
             ->select();
         foreach ($query as $value){
             $num = 1;
-            if ((int)$value['拆片联拼系数'] === 0){
-                $value['拆片联拼系数'] = 1;
-            }
-            if ((int)$value['拆片条小盒系数'] === 0){
-                $value['拆片条小盒系数'] = 1;
-            }
             $value['班组车头产量'] = ($value['班组车头产量'] - $value['sczl_zcfp']) * $value['拆片联拼系数'] * $value['拆片条小盒系数'];
             //计件产量
             if ($value['sczl_jtbh'] === 'YSY02#' || $value['sczl_jtbh'] === 'YSY08#' || $value['sczl_jtbh'] === 'YSY10#' || $value['sczl_jtbh'] === 'SY03#'){
@@ -541,6 +535,8 @@ class StaffSalary extends Api
             $bh = substr($item['sczl_rq'],0,10) . '-' .$item['bh'];
             //达标定额
             if ($item['工时占比'] > 0){
+                var_dump($item['sczl_gdbh']);
+                var_dump($item['sczl_gxh']);
                 $standardQuota = floatval($item['工时占比'] / $bhTotals[$bh] * $item['日定额']);
                 $data[$key]['达标定额'] = number_format($standardQuota,2,'.', '');
             }else{
@@ -576,6 +572,7 @@ class StaffSalary extends Api
             $data[$key]['法定天数'] = $params['days'];
             $data[$key]['sczl_type'] = trim($item['sczl_type']);
         }
+//        halt($data);
         // 检查任务是否已经存在于队列中，如果不存在则推送任务到队列
         if (!$redis->has($taskIdentifier)) {
             $job = new InsertDataJob($data); // 创建任务实例

application/api/controller/WorkOrderVerification.php

@@ -917,7 +917,7 @@ class WorkOrderVerification extends Api
         ';
         $where['a.qczl_gdbh'] = $params['order'];
         $where['a.qczl_yjno'] = $params['yjno'];
-        $where['b.行号'] = 1;
+//        $where['b.行号'] = 1;
         $data = db('db_qczl')->alias('a')
             ->join('工单_基本资料 b','a.qczl_gdbh = b.Gd_gdbh','left')
             ->join('工单_印件资料 c','a.qczl_gdbh = c.Yj_Gdbh','left')
@@ -926,7 +926,9 @@ class WorkOrderVerification extends Api
             ->field($field)
 //            ->where('a.qczl_yjno','1')
             ->group('qczl_yjno,qczl_num')
+            ->fetchSql(true)
             ->select();
+        halt($data);
         $list = [];
         $j = 0;
         foreach ($data as $entry) {