qiuenguang пре 1 година
родитељ
комит
44df2747ff
1 измењених фајлова са 17 додато и 49 уклоњено
  1. 17 49
      application/api/controller/WorkOrder.php

+ 17 - 49
application/api/controller/WorkOrder.php

@@ -35,25 +35,16 @@ class WorkOrder extends Api
         $progressAll = \db('工单_基本资料')->where('成品代号','<>','')->where('行号','1')->where('gd_statu','3-计划中')->cache(true)->count();
         $data = [
             'productingAll' => $productingAll,
-            'progressAll' => $progressAll
+            'progressAll' => $progressAll,
+            '糊盒工单' => [],
+            '印刷工单' => []
         ];
-//        $sql = "SELECT
-//                    SUBSTRING( `成品代号`, 1, 4 ) AS prefix,
-//                    rtrim( Gd_khmc ) AS khmc,
-//                    RTRIM( `Gd_客户名称` ) AS 客户名称
-//                FROM
-//                    `工单_基本资料`
-//                WHERE
-//                    `成品代号` <> ''
-//                    AND ( `Gd_客户名称` <> '' OR Gd_khmc <> '' )
-//                GROUP BY
-//                    prefix
-//                ORDER BY
-//                    prefix";
         $sql = "SELECT DISTINCT
                     (客户编号),rtrim(客户名称 ) as 客户名称
                 FROM
                     `产品_基本资料` 
+                WHERE 
+                    客户编号 <> ''
                 GROUP BY
                     客户编号
                 order by 
@@ -64,11 +55,7 @@ class WorkOrder extends Api
         }
         foreach ($list as $key=>$value){
             $value['客户编号'] = rtrim($value['客户编号']);
-            if ($value['客户编号'] == '1098'){
-                $value['客户名称'] = '打样专用';
-            }
             //这条sql查出来的数据可能不对,试一下以下sql
-            //SELECT COUNT(*) FROM `工单_基本资料` WHERE (SUBSTRING( `成品代号`, 1, 4 ) = '1001' OR (`Gd_客户名称`='浙江中烟' AND `Gd_客户代号` = '1001')) AND gd_statu = '2-生产中' AND `行号` = '1'
             $productIng = \db('工单_基本资料')->where('行号','1')->where('成品代号','LIKE',rtrim($value['客户编号']).'%')->where('gd_statu','2-生产中')->count();
             $proGress = \db('工单_基本资料')->where('行号','1')->where('成品代号','LIKE',rtrim($value['客户编号']).'%')->where('gd_statu','3-计划中')->count();
             $string = '';
@@ -79,11 +66,19 @@ class WorkOrder extends Api
                 $string = $string."计划中:".$proGress;
             }
             if ($string !== ''){
-//                $data[$key] = $value['prefix'].'【'.$string.'】'.($value['客户名称']!==''?$value['客户名称']:$value['khmc']);
-                $data[$key] = $value['客户编号'].'【'.$string.'】'.$value['客户名称'];
+                $name = $value['客户编号'].'【'.$string.'】'.$value['客户名称'];
+                if (strpos($value['客户编号'],'J') !== false){
+                    array_push($data['糊盒工单'],$name);
+                }else{
+                    array_push($data['印刷工单'],$name);
+                }
             }else{
-//                $data[$key] = $value['prefix'].($value['客户名称']!==''?$value['客户名称']:$value['khmc']);
-                $data[$key] = $value['客户编号'].$value['客户名称'];
+                $name = $value['客户编号'].$value['客户名称'];
+                if (strpos($value['客户编号'],'J') !== false){
+                    array_push($data['糊盒工单'],$name);
+                }else{
+                    array_push($data['印刷工单'],$name);
+                }
             }
         }
         $this->success('成功',$data);
@@ -1975,33 +1970,6 @@ class WorkOrder extends Api
         if (empty($param['search'])){
             $this->error('参数错误');
         }
-//        $list = \db('工单_基本资料')
-//            ->alias('a')
-//            ->field([
-//                'rtrim(a.Gd_gdbh)' => '工单编号',
-//                'rtrim(b.客户编号)' => '客户编号',
-//                'rtrim(b.客户名称)' => '客户名称',
-//                'rtrim(b.产品编号)' => '产品编号',
-//                'rtrim(b.产品名称)' => '产品名称'
-//            ])
-//            ->join('产品_基本资料 b','a.成品代号 = b.产品编号')
-//            ->join('产品_工艺资料 c','a.成品代号 = c.Gy0_cpdh')
-//            ->join('产品_印件资料 d','a.成品代号 = d.yj_cpdh')
-//            ->where([
-//                'a.Gd_gdbh' => ['like','%'.$param['search'].'%']
-//            ])
-//            ->whereOr([
-//                'a.成品名称' => ['like','%'.$param['search'].'%'],
-//            ])
-//            ->where([
-//                'c.Gy0_cpdh' => ['<>',null],
-//                'd.yj_cpdh' => ['<>',null],
-//                'b.状态' => ['not like','%停用%'],
-//                'b.产品名称' => ['not like','%停用%']
-//            ])
-//            ->group('a.Gd_gdbh')
-//            ->order('a.Uniqid desc')
-//            ->select();
         $list = \Db('工单_基本资料')
             ->alias('a')
             ->field([