系统功能优化

application/api/controller/EmployeeDailySalary.php

@@ -95,12 +95,11 @@ class EmployeeDailySalary extends Api
         //获取工资汇总表数据
         $res=db('绩效工资汇总')
             ->join('人事_基本资料','人事_基本资料.员工编号=绩效工资汇总.bh')
-            ->group('绩效工资汇总.bh,LEFT(sczl_rq, 10),绩效工资汇总.工序难度系数')
+            ->group('绩效工资汇总.bh,LEFT(sczl_rq, 10)')
             ->where('sys_ny',$req['date'])
             ->where(['人事_基本资料.所在部门'=>['like',$req['department'].'%']])
             ->column('CONCAT(bh, "-", DATE_FORMAT(sczl_rq,"%Y/%m/%d")) AS rq_bh,bh,rtrim(xm) as 员工姓名,DATE_FORMAT(sczl_rq,"%Y/%m/%d") as sczl_rq,sum(个人计件工资) as 计件工资,
             sum(个人加班工资) as 加班工资,sum(异常停机工时) as 计时时数');
-
         $year=substr($req['date'],0,4);
         $month=substr($req['date'],-2);
         $start_time = $year . '-' . $month . '-01 00:00:00';

application/api/controller/Facility.php

@@ -105,16 +105,16 @@ class Facility extends Api
         //机台信息
         $machineDetail = \db('设备_基本资料')->where('设备编号',$machine)->field('rtrim(千件工价) as 千件工价,rtrim(日定额) as 日定额')->find();
         //组员信息
-        $list = \db('设备_产量计酬')->where($where)->field($field)->select();
+        $list = \db('设备_产量计酬')->where($where)->field($field)->order('bzdh desc')->select();
         $totalA = \db('设备_产量计酬')
             ->where($where)
             ->where('sczl_bzdh','like','A%')
-            ->field('SUM(sczl_cl) as 产量, SUM(sczl_zcfp) as 制程废品, SUM(sczl_zccp) as 制程次品, SUM(sczl_来料少数) as 来料异常, SUM(sczl_装版工时) as 装版工时')
+            ->field('SUM(sczl_cl) as 产量, SUM(sczl_zcfp) as 制程废品, SUM(sczl_zccp) as 制程次品, SUM(sczl_来料少数) as 来料异常, SUM(sczl_装版工时) as 装版工时, SUM(sczl_保养工时) as 保养工时, SUM(sczl_打样工时) as 打样工时,SUM(sczl_异常停机工时) as 异常工时,SUM(sczl_异常工时1) as 异常补时工时,SUM(sczl_设备运行工时) as 通电工时,SUM(sczl_前工序废) as 前工序废')
             ->select();
         $totalB = \db('设备_产量计酬')
             ->where($where)
             ->where('sczl_bzdh','like','B%')
-            ->field('SUM(sczl_cl) as 产量, SUM(sczl_zcfp) as 制程废品, SUM(sczl_zccp) as 制程次品, SUM(sczl_来料少数) as 来料异常, SUM(sczl_装版工时) as 装版工时')
+            ->field('SUM(sczl_cl) as 产量, SUM(sczl_zcfp) as 制程废品, SUM(sczl_zccp) as 制程次品, SUM(sczl_来料少数) as 来料异常, SUM(sczl_装版工时) as 装版工时, SUM(sczl_保养工时) as 保养工时, SUM(sczl_打样工时) as 打样工时,SUM(sczl_异常停机工时) as 异常工时,SUM(sczl_异常工时1) as 异常补时工时,SUM(sczl_设备运行工时) as 通电工时,SUM(sczl_前工序废) as 前工序废')
             ->select();
         if (empty($list)){
             $this->success('',[]);
@@ -186,6 +186,18 @@ class Facility extends Api
         $list['来料异常B'] = $totalB[0]['来料异常'];
         $list['装版工时A'] = $totalA[0]['装版工时'];
         $list['装版工时B'] = $totalB[0]['装版工时'];
+        $list['保养工时A'] = $totalA[0]['保养工时'];
+        $list['保养工时B'] = $totalB[0]['保养工时'];
+        $list['打样工时A'] = $totalA[0]['打样工时'];
+        $list['打样工时B'] = $totalB[0]['打样工时'];
+        $list['异常工时A'] = $totalA[0]['异常工时'];
+        $list['异常工时B'] = $totalB[0]['异常工时'];
+        $list['异常补时工时A'] = $totalA[0]['异常补时工时'];
+        $list['异常补时工时B'] = $totalB[0]['异常补时工时'];
+        $list['通电工时A'] = $totalA[0]['通电工时'];
+        $list['通电工时B'] = $totalB[0]['通电工时'];
+        $list['前工序废A'] = $totalA[0]['前工序废'];
+        $list['前工序废B'] = $totalB[0]['前工序废'];
         $this->success('成功',$list);
     }
 
@@ -359,7 +371,6 @@ class Facility extends Api
             ->group('a.Gy0_gdbh,a.Gy0_yjno,a.Gy0_gxh')
             ->order('a.Gy0_sj1')
             ->select();
-        halt($orderList);
         if (!empty($orderList)){
             $data = \db('设备_产量采集')->where('设备编号',$machine)->order('UniqId desc')->find();
             foreach ($orderList as $key=>$value){
@@ -759,9 +770,8 @@ class Facility extends Api
         if (empty($param['start'])){
             $startTime = date('Y-m-d 08:30:00',time());
         }else{
-            $startTime = $param['start'];
+            $startTime = date('Y-m-d H:i:s',strtotime($param['start']));
         }
-
         if ($date<$startTime){
             $startTime = date('Y-m-d H:i:s',strtotime($startTime)-86400);
         }
@@ -769,7 +779,7 @@ class Facility extends Api
             '工单编号' => $param['workOrder'],
             '开工时间' => $startTime,
             '类别' => '现场巡查记录',
-            '班组编号' => $param['team']
+            '班组编号' => ['like',substr($param['team'],0,1).'%']
         ];
         $filed = 'rtrim(工单编号) as 工单编号,rtrim(印件号) as 印件号,rtrim(工序名称) as 工序名称,rtrim(流程单号) as 流程单号,
         rtrim(设备编号) as 设备编号,rtrim(班组编号) as 班组编号,rtrim(检验项目) as 现场管理人员,rtrim(检验备注) as 检验备注,

application/api/controller/FinishedProductWarehousing.php

@@ -1068,6 +1068,7 @@ class FinishedProductWarehousing extends Api
             ')
             ->where('sczl_rq','>=',$date)
             ->select();
+
         $data1 = [];
         foreach ($arr1 as $k=>$v){
             for ($i=1;$i<=6;$i++){
@@ -1091,9 +1092,8 @@ class FinishedProductWarehousing extends Api
         $rows2 = db('成品入仓')
             ->where('jjcp_sj','>=',$date)
             ->group('jjcp_gdbh, jjcp_cpdh')
-            ->column("CONCAT( jjcp_gdbh, '-',  jjcp_yjno) AS gdyj, jjcp_smb,
-            sum(jjcp_sl) as jjcp_sls, left(max(jjcp_sj),10) as jjcp_sj");
-
+            ->column("CONCAT( jjcp_gdbh, '-',  jjcp_yjno) AS gdyj, max(jjcp_smb) as jjcp_smb,
+            sum(jjcp_sl) as jjcp_sls, left(max(jjcp_sj),10) as jjcp_sj,UniqId");
 //        $rows3 = db('工单_印件资料')->cache(true,86400)
 //            ->group('Yj_Gdbh, yj_Yjno')
 //            ->column("CONCAT( Yj_Gdbh, '-',  yj_Yjno) AS gdyj,

application/api/controller/LargeWasteRewardPunish.php

@@ -89,12 +89,12 @@ class LargeWasteRewardPunish extends Api
             $this->error('请求方式错误');
         }
         $req = $this->request->param();
-
         $page = 1;
         $limit = 15;
         if (isset($req['page']) && !empty($req['page'])) $page = $req['page'];
         if (isset($req['limit']) && !empty($req['limit'])) $limit = $req['limit'];
-
+        $date = substr($req['date'],0,10);
+        $req['date'] = str_replace('.','-',$date);
         $where = [];
         if (isset($req['date']) && !empty($req['date'])){
             $where['sys_rq'] = ['LIKE',$req['date'].'%'];

application/api/controller/Manufacture.php

@@ -829,7 +829,7 @@ class Manufacture extends Api
             ->join('设备_产量计酬 d','a.Gy0_gdbh = d.sczl_gdbh AND a.Gy0_yjno = d.sczl_yjno AND a.Gy0_gxh = d.sczl_gxh AND a.Gy0_sbbh = d.sczl_jtbh','LEFT')
             ->where([
                 'b.gd_statu' => '2-生产中',
-                'a.Gy0_sbbh' => ['LIKE','%'.$param['machine'].'%'],
+                'a.Gy0_sbbh' => ['LIKE',$param['machine'].'%'],
                 'a.PD_WG' => '1900-01-01 00:00:00',
             ])
             ->where($where)

application/api/controller/ReportingWork.php

@@ -402,10 +402,12 @@ class ReportingWork extends Api
         $data['sczl_废品率系数'] = '';
         $data['sczl_desc'] = '';
         $data['sczl_wgsj'] = '1900-01-01 00:00:00';
-        $data['码开始行'] = 0;
-        $data['码结束行'] = 0;
+        $data['码开始行'] = $params['ma_start'];
+        $data['码结束行'] = $params['ma_end'];
         $data['mod_rq'] = '1900-01-01 00:00:00';
         $data['sys_rq'] = date('Y-m-d H:i:s');
+        unset($data['ma_start']);
+        unset($data['ma_end']);
         if (!empty($batch)){
             $batchData = explode(',',$batch);
             $newData = [];
@@ -428,7 +430,6 @@ class ReportingWork extends Api
                 $newData[$key]['UniqID'] = $batchUniqId;
             }
         }
-
         $res = false;
         $batch_res = false;
         Db::startTrans();

application/api/controller/WorkOrderVerification.php

@@ -344,7 +344,7 @@ class WorkOrderVerification extends Api
             $where['名称'] = array('like','%'.$params['search'].'%');
         }
 
-        $data = db('erp_常用字典')->where($where)->column('名称');
+        $data = db('erp_常用字典')->where($where)->order('次序 desc')->column('名称');
         // 分割字符串并合并相同项
         $resultArray = [];
         foreach ($data as $item) {