代码优化, 工单核检单,工单抽查记录显示方式功能

application/api/controller/FinishedProductWarehousing.php

@@ -42,7 +42,7 @@ class FinishedProductWarehousing extends Api
             ->where('sys_rq','>=',$rows[count($rows)-1]['date'])
             ->count();
         $arr = db('成品入仓')
-            ->field('LEFT(sys_rq, 10) as date, rtrim(sys_id) as sys_id, COUNT(sys_id) as count')
+            ->field('LEFT(sys_rq, 10) as date, rtrim(sys_id) as sys_id, COUNT(*) as count')
             ->where('sys_rq','>=',$rows[count($rows)-1]['date'])
             ->group('date, sys_id')
             ->limit($num)
@@ -460,7 +460,7 @@ class FinishedProductWarehousing extends Api
 
         //查询UniqId
         $UniqId = db('成品入仓')->max('UniqId');
-        $data['UniqId'] = $UniqId+1;
+        $data['UniqId'] = $UniqId < 10000000 ? 10000000 : $UniqId + 1;
 
         //开启事务
         db()->startTrans();

application/api/controller/Inspect.php

@@ -41,7 +41,7 @@ class Inspect extends Api
             ->where('sys_rq','>=',$rows[count($rows)-1]['date'])
             ->count();
         $arr = db('db_手工检验')
-            ->field('LEFT(sys_rq, 10) as date, rtrim(sys_id) as sys_id, COUNT(sys_id) as count')
+            ->field('LEFT(sys_rq, 10) as date, rtrim(sys_id) as sys_id, COUNT(*) as count')
             ->where('sys_rq','>=',$rows[count($rows)-1]['date'])
             ->group('date, sys_id')
             ->limit($num)
@@ -801,7 +801,7 @@ class Inspect extends Api
 
         //查询UniqId
         $UniqId = db('db_手工检验')->max('UniqId');
-        $data['UniqId'] = $UniqId+1;
+        $data['UniqId'] = $UniqId < 10000000 ? 10000000 : $UniqId + 1;
 
         //开启事务
         db()->startTrans();
@@ -856,7 +856,7 @@ class Inspect extends Api
 
         //查询UniqId
         $UniqId = db('db_机器检验')->max('UniqId');
-        $data['UniqId'] = $UniqId+1;
+        $data['UniqId'] = $UniqId < 10000000 ? 10000000 : $UniqId + 1;
 
         //开启事务
         db()->startTrans();

application/api/controller/MachineProductionReport.php

@@ -33,7 +33,7 @@ class MachineProductionReport extends Api
         }
 
         $time = date('Y-m-d',time()-8640000);
-        $sql = 'SELECT date, COUNT(date) as counts
+        $sql = 'SELECT date, COUNT(*) as counts
             FROM (
                 SELECT LEFT(sys_rq, 10) as date FROM db_sczl WHERE sys_rq > "'.$time.'"
             UNION ALL
@@ -45,7 +45,7 @@ class MachineProductionReport extends Api
         $rows = db()->query($sql);
 
         if(count($rows) < 30){
-            $sql = 'SELECT date, COUNT(date) as counts
+            $sql = 'SELECT date, COUNT(*) as counts
             FROM (
                 SELECT LEFT(sys_rq, 10) as date FROM db_sczl WHERE sys_rq > "2023-11-01"
             UNION ALL
@@ -57,7 +57,7 @@ class MachineProductionReport extends Api
         $rows = db()->query($sql);
        }
 
-        $sql = 'SELECT date, sys_id, COUNT(sys_id) as count
+        $sql = 'SELECT date, sys_id, COUNT(*) as count
             FROM (
                 SELECT LEFT(sys_rq, 10) as date, rtrim(sys_id) as sys_id 
                 FROM db_sczl WHERE sys_rq >= "'.$rows[count($rows)-1]['date'].'"
@@ -668,7 +668,7 @@ class MachineProductionReport extends Api
 
         //查询UniqId
         $UniqId = db('db_sczl')->max('UniqId');
-        $data['UniqId'] = $UniqId+1;
+        $data['UniqId'] = $UniqId < 10000000 ? 10000000 : $UniqId + 1;
 
         //开启事务
         db()->startTrans();

application/api/controller/MachineProductionReportAdd.php

@@ -40,7 +40,7 @@ class MachineProductionReportAdd extends Api
             ->select();
 
         $arr = db('db_sczladd')
-            ->field('LEFT(sys_rq, 10) as date, rtrim(sys_id) as sys_id, COUNT(sys_id) as count')
+            ->field('LEFT(sys_rq, 10) as date, rtrim(sys_id) as sys_id, COUNT(*) as count')
             ->where('sys_rq','>=',$rows[count($rows)-1]['date'])
             ->group('date, sys_id')
             ->select();
@@ -203,7 +203,7 @@ class MachineProductionReportAdd extends Api
 
         //查询UniqId
         $UniqId = db('db_sczladd')->max('UniqId');
-        $data['UniqId'] = $UniqId+1;
+        $data['UniqId'] = $UniqId < 10000000 ? 10000000 : $UniqId + 1;
 
         //开启事务
         db()->startTrans();

application/api/controller/PackagingCountDocument.php

@@ -41,7 +41,7 @@ class PackagingCountDocument extends Api
             ->select();
 
         $arr = db()->table('db_包装计件')->cache(true,300)
-            ->field('LEFT(sys_rq, 10) as date, rtrim(sys_id) as sys_id, COUNT(sys_id) as count')
+            ->field('LEFT(sys_rq, 10) as date, rtrim(sys_id) as sys_id, COUNT(*) as count')
             ->where('sys_rq','>=',$rows[count($rows)-1]['date'])
             ->group('date, sys_id')
             ->select();
@@ -329,7 +329,7 @@ class PackagingCountDocument extends Api
 
         //查询UniqId
         $UniqId = db()->table('db_包装计件')->max('UniqId');
-        $data['UniqId'] = $UniqId+1;
+        $data['UniqId'] = $UniqId < 10000000 ? 10000000 : $UniqId + 1;
 
         //开启事务
         db()->startTrans();

application/api/controller/PackagingProcessOutput.php

@@ -39,7 +39,7 @@ class PackagingProcessOutput extends Api
             ->select();
 
         $arr = db()->table('db_包装产量预报')
-            ->field('LEFT(sys_rq, 10) as date, rtrim(sys_id) as sys_id, COUNT(sys_id) as count')
+            ->field('LEFT(sys_rq, 10) as date, rtrim(sys_id) as sys_id, COUNT(*) as count')
             ->where('sys_rq','>=',$rows[count($rows)-1]['date'])
             ->group('date, sys_id')
             ->select();
@@ -290,7 +290,7 @@ class PackagingProcessOutput extends Api
 
         //查询UniqId
         $UniqId = db()->table('db_包装产量预报')->max('UniqId');
-        $data['UniqId'] = $UniqId+1;
+        $data['UniqId'] = $UniqId < 10000000 ? 10000000 : $UniqId + 1;
 
         //开启事务
         db()->startTrans();

application/api/controller/WorkOrderSpotCheck.php

@@ -39,7 +39,7 @@ class WorkOrderSpotCheck extends Api
             ->select();
 
         $arr = db()->table('db_抽检记录')
-            ->field('LEFT(Sys_rq, 10) as date, rtrim(Sys_id) as Sys_id, COUNT(Sys_id) as count')
+            ->field('LEFT(Sys_rq, 10) as date, rtrim(Sys_id) as Sys_id, COUNT(*) as count')
             ->where('Sys_rq','>=',$rows[count($rows)-1]['date'])
             ->group('date, Sys_id')
             ->order('UniqId desc')
@@ -59,6 +59,45 @@ class WorkOrderSpotCheck extends Api
         $this->success('成功',$rows);
     }
 
+    /**
+     * 获取侧边栏通过工单编号
+     * @ApiMethod (GET)
+     */
+    public function getTabByGdbh()
+    {
+        //get请求
+        if(!$this->request->isGet()){
+            $this->error('请求方式错误');
+        }
+        $date = date('Y-m-d',strtotime("-1 year"));
+
+        $rows = db()->table('db_抽检记录')->alias('d')->cache(true)
+            ->field('d.Sczl_gdbh, rtrim(y.Gd_cpmc) as Gd_cpmc')
+            ->join('工单_基本资料 y','y.Gd_gdbh = d.Sczl_gdbh','left')
+            // ->where('d.sys_rq','>=',$date)
+            ->group('d.Sczl_gdbh')
+            ->order('d.Sczl_gdbh desc')
+            ->limit(65)
+            ->select();
+        $arr = db()->table('db_抽检记录')->cache(true)
+            ->field('Sczl_gdbh, rtrim(Sys_id) as Sys_id, COUNT(*) as count')
+            ->where('Sczl_gdbh','>=',$rows[count($rows)-1]['Sczl_gdbh'])
+            ->group('Sczl_gdbh, Sys_id')
+            ->select();
+        foreach($rows as $key=>$value){
+            $rows[$key]['sys'] = [];
+            foreach($arr as $k=>$v){
+                if($value['Sczl_gdbh'] == $v['Sczl_gdbh']){
+                    unset($v['Sczl_gdbh']);
+                    array_push($rows[$key]['sys'],$v);
+                    unset($arr[$k]);
+                }
+            }
+        }
+
+        $this->success('成功',$rows);
+    }
+
     /**
      * 获取工单抽检记录列表
      * @ApiMethod (GET)
@@ -80,7 +119,11 @@ class WorkOrderSpotCheck extends Api
 
         $where = [];
         if (isset($req['date']) && !empty($req['date'])){
-            $where['Sys_rq'] = ['LIKE',$req['date'].'%'];
+            if(strpos($req['date'],'-')){
+                $where['Sys_rq'] = ['like',$req['date'].'%'];
+            }else{
+                $where['Sczl_gdbh'] = $req['date'];
+            }
         }else{
             $this->error('参数错误');
         }

application/api/controller/WorkOrderVerification.php

@@ -43,7 +43,7 @@ class WorkOrderVerification extends Api
                 ->select();
 
             $arr = db()->table('db_qczl')
-                ->field('LEFT(sys_rq, 10) as date, rtrim(sys_id) as sys_id, COUNT(sys_id) as count')
+                ->field('LEFT(sys_rq, 10) as date, rtrim(sys_id) as sys_id, COUNT(*) as count')
                 ->where('sys_rq','>=',$rows[count($rows)-1]['date'])
                 ->group('date, sys_id')
                 ->select();
@@ -88,7 +88,7 @@ class WorkOrderVerification extends Api
             ->limit(65)
             ->select();
         $arr = db()->table('db_qczl')->cache(true)
-            ->field('qczl_gdbh, rtrim(sys_id) as sys_id, COUNT(sys_id) as count')
+            ->field('qczl_gdbh, rtrim(sys_id) as sys_id, COUNT(*) as count')
             ->where('qczl_gdbh','>=',$rows[count($rows)-1]['qczl_gdbh'])
             ->group('qczl_gdbh, sys_id')
             ->select();