Merge branch 'master' of https://git.7in6.com/Minong/mes-server-api

application/api/controller/Inspect.php

@@ -35,7 +35,18 @@ class Inspect extends Api
 
         foreach ($list as $key => $value){
             $where = [$value['sys_rq'].'00:00:00',$value['sys_rq'].'24:00:00'];
-            $list[$key]['count'] = Db::name('db_手工检验')->where('sys_rq','between time',$where)->count();
+            $dataCount = Db::name('db_手工检验')->where('sys_rq','between time',$where)->field('rtrim(sys_id) as sys_id')->order('sys_id asc')->select();
+            $list[$key]['count'] = count($dataCount);
+            // 提取 sys_id 列成新数组
+            $sysIds = array_column($dataCount, 'sys_id');
+            //统计每个不同的 sys_id 的数量
+            $counts = array_count_values($sysIds);
+            $i = 0;
+            foreach ($counts as $k=>$v){
+                $list[$key]['sys'][$i]['sys_id'] = $k;
+                $list[$key]['sys'][$i]['count'] = $v;
+                $i++;
+            }
         }
         $this->success('请求成功',$list);
     }
@@ -95,7 +106,18 @@ class Inspect extends Api
         $list = Db::query($sql);
         foreach ($list as $key => $value){
             $where = [$value['sys_rq'].'00:00:00',$value['sys_rq'].'24:00:00'];
-            $list[$key]['count'] = Db::name('db_机器检验')->where('sys_rq','between time',$where)->count();
+            $dataCount = Db::name('db_机器检验')->where('sys_rq','between time',$where)->field('rtrim(sys_id) as sys_id')->order('sys_id asc')->select();
+            $list[$key]['count'] = count($dataCount);
+            // 提取 sys_id 列成新数组
+            $sysIds = array_column($dataCount, 'sys_id');
+            //统计每个不同的 sys_id 的数量
+            $counts = array_count_values($sysIds);
+            $i = 0;
+            foreach ($counts as $k=>$v){
+                $list[$key]['sys'][$i]['sys_id'] = $k;
+                $list[$key]['sys'][$i]['count'] = $v;
+                $i++;
+            }
         }
         $this->success('请求成功',$list);
     }
@@ -125,8 +147,9 @@ class Inspect extends Api
         $where['a.sczl_单据类型'] = '初检单';
         $where['a.sys_rq'] = array('between time',[$date.' 00:00:00',$date.' 24:00:00']);
         $field = 'a.sczl_gdbh,trim(a.sczl_yjgx) as sczl_yjgx,rtrim(a.sczl_gxmc) as sczl_gxmc,a.sczl_jtbh,a.sczl_bzdh,DATE(a.sczl_rq) as sczl_rq,a.sczl_cl,rtrim(a.sczl_单据类型) as sczl_单据类型,
-        a.sczl_设备运行工时,a.sczl_dedh,a.sczl_废品率系数,a.sczl_bh1,a.sczl_bh2,a.sczl_bh3,a.sczl_bh4,a.qczl_NumDesc,rtrim(a.sys_id) as sys_id,a.sys_rq,a.mod_rq,a.UniqId,b.千件工价,b.日定额,
-        rtrim(c1.员工姓名) as sczl_bh1_name,rtrim(c2.员工姓名) as sczl_bh2_name,rtrim(c3.员工姓名) as sczl_bh3_name,rtrim(c4.员工姓名) as sczl_bh4_name,rtrim(d.yj_yjmc) as yj_yjmc';
+        a.sczl_设备运行工时,a.sczl_dedh,a.sczl_废品率系数,rtrim(a.sczl_检验类别) as sczl_检验类别,a.sczl_bh1,a.sczl_bh2,a.sczl_bh3,a.sczl_bh4,a.qczl_NumDesc,rtrim(a.sys_id) as sys_id,
+        a.sys_rq,a.mod_rq,a.UniqId,b.千件工价,b.日定额,rtrim(c1.员工姓名) as sczl_bh1_name,rtrim(c2.员工姓名) as sczl_bh2_name,rtrim(c3.员工姓名) as sczl_bh3_name,
+        rtrim(c4.员工姓名) as sczl_bh4_name,rtrim(d.yj_yjmc) as yj_yjmc';
         $list = Db::name('db_机器检验')->alias('a')
             ->join('dic_lzde b','a.sczl_dedh = b.sys_bh','left')
             ->join('人事_基本资料 c1','a.sczl_bh1 = c1.员工编号','left')

application/api/controller/PieceWork.php

@@ -37,8 +37,10 @@ class PieceWork extends Api
             $this->error('参数不能为空');
         }
         $where['sys_bh'] = $code;
-        $field = 'rtrim(sys_bh) as sys_bh,rtrim(sys_mc) as sys_mc,rtrim(适用工序) as 适用工序,rtrim(适用机型) as 适用机型,
-                    日定额,千件工价,补产标准,机长比例,副机比例,调墨比例,二手比例,飞达比例,辅助比例,放卷比例,分切1比例,分切2比例,检验比例';
+        $field = 'rtrim(sys_bh) as sys_bh,rtrim(sys_mc) as sys_mc,rtrim(适用工序) as sygx,rtrim(适用机型) as syjx,
+                    日定额 as daily_quota,千件工价 as thousand_piece ,补产标准 as production_standard,机长比例 as fir_proportion,副机比例 as sec_proportion,
+                    调墨比例 as ink_proportion,二手比例 as second_hand_proportion,飞达比例 as feeder_proportion,辅助比例 as auxiliary_proportion,放卷比例 as unwinder_proportion,
+                    分切1比例 as cutting_one_proportion,分切2比例 as cutting_two_proportion,检验比例 as inspect_proportion';
         $data = Db::name('dic_lzde')->where($where)->field($field)->select();
         $this->success('请求成功',$data);
 
@@ -53,7 +55,7 @@ class PieceWork extends Api
         if (Request::instance()->isGet() == false){
             $this->error('非法请求');
         }
-        $field = 'Key_,Parent,rtrim(sys_bh) as sys_bh, rtrim(sys_mc) as sys_mc,rtrim(适用工序) as 适用工序,rtrim(适用机型) as 适用机型';
+        $field = 'Key_,Parent,rtrim(sys_bh) as sys_bh, rtrim(sys_mc) as sys_mc,rtrim(适用工序) as gx,rtrim(适用机型) as jx';
         $list = Db::name('dic_lzde')->field($field)->order('sys_bh')->select();
         $data = [];
         $machineData = [];

application/api/controller/Process.php

@@ -38,7 +38,7 @@ class Process extends Api
             $this->error('参数不能为空');
         }
         $where['sys_bh'] = $code;
-        $field = 'rtrim(sys_bh) as sys_bh,rtrim(sys_mc) as sys_mc,sys_rate0,sys_rate1,rtrim(适用机型) as 备注（机型）';
+        $field = 'rtrim(sys_bh) as sys_bh,rtrim(sys_mc) as sys_mc,sys_rate0,sys_rate1,rtrim(适用机型) as remark';
         $data = Db::name('dic_lzsh')->where($where)->field($field)->select();
         $this->success('请求成功',$data);
     }