生产管理

application/api/controller/Facility.php

@@ -605,11 +605,15 @@ class Facility extends Api
         if ($this->request->isGet() === false){
             $this->error('请求错误');
         }
-        $list = Db::table('设备_基本资料')->column('设备编号');
+        $list = Db::table('设备_基本资料')->field('rtrim(设备编号) as 设备编号,rtrim(设备名称) as 设备名称')->select();
         if (empty($list)){
             $this->error('未找到机台编号');
         }
-        $this->success('成功',$list);
+        $data = [];
+        foreach ($list as $key=>$value){
+            $data[$key] = $value['设备编号'] . '||' . $value['设备名称'];
+        }
+        $this->success('成功',$data);
     }
 
     /**
@@ -832,33 +836,25 @@ class Facility extends Api
         if (empty($param)){
             $this->error('参数错误');
         }
-        $data = [
-            'team' => $param['team'],
-            'machine' => $param['machine'],
-            'unitName' => $param['unitName']
-        ];
-        unset($param['team'],$param['machine'],$param['unitName']);
-        $lastId = Db::table('设备_点检记录')->field('rtrim(Uniqid) as id')->order('Uniqid desc')->find();
-        $unitCode = Db::table('设备_点检项目')->where('部件名称',$data['unitName'])->field('rtrim(部件编号) as 部件编号')->find();
+        $lastId = 10000000;
         $row = [];
-        $param = array_values($param);
         foreach ($param as $key=>$value){
-            $value = explode(';',$value);
+            $unitCode = Db::table('设备_点检项目')->where('部件名称',$value['unitName'])->field('rtrim(部件编号) as 部件编号')->find();
             $row[$key] = [
                 '日期' => date('Y-m-d 00:00:00',time()),
-                '班组编号' => $data['team'],
-                '点检设备' => $data['machine'],
+                '班组编号' => $value['team'],
+                '点检设备' => $value['machine'],
                 '部件编号' => $unitCode['部件编号'],
-                '部件名称' => $data['unitName'],
-                '检验项目' => $value[0],
-                '判定标准' => $value[4],
-                '点检方法' => $value[1],
-                '点检结果' => $value[2],
-                '备注说明' => $value[3],
+                '部件名称' => $value['unitName'],
+                '检验项目' => $value['itemName'],
+                '判定标准' => $value['standard'],
+                '点检方法' => $value['method'],
+                '点检结果' => $value['status'],
+                '备注说明' => $value['remark'],
                 'Sys_id'  =>'',
                 'Sys_rq'  => date('Y-m-d H:i:s',time()),
-                'Mod_rq'  => '',
-                'Uniqid'  => $lastId['id']+$key+1
+                'Mod_rq'  => date('Y-m-d H:i:s',time()),
+                'Uniqid'  => $lastId+$key+1
             ];
 
         }
@@ -1030,4 +1026,6 @@ class Facility extends Api
         $nowTime = date('Y-m-d H:i:s',time());
 
     }
+
+    //
 }

application/api/controller/Manufacture.php

@@ -16,34 +16,6 @@ class Manufacture extends Api
     protected $noNeedLogin = ['*'];
     protected $noNeedRight = ['*'];
 
-    //查找工单
-    public function WorkOrderSearch(){
-        if ($this->request->isGet() === false){
-            $this->error('请求错误');
-        }
-        $workOder = input('workOrder');
-        $printName = input('printName');
-        if (empty($workOder)){
-            $this->error('参数错误');
-        }
-        $where = [
-            'Gd_gdbh' => $workOder
-        ];
-        if (!empty($printName)){
-            $where['成品名称'] = $printName;
-        }
-        $field = 'rtrim(Gd_生产分类) as 生产分类,rtrim(Gd_gdbh) as 工单编号,rtrim(Gd_cpdh) as 产品代号,rtrim(Gd_cpmc) as 产品名称,
-        rtrim(接单日期) as 接单日期,rtrim(交货日期) as 交货日期,rtrim(订单数量) as 订单数量,rtrim(计量单位) as 计量单位,rtrim(Gd_khmc) as 客户名称,
-        rtrim(Gd_客户代号) as 客户编号,rtrim(Gd_desc) as 备注,rtrim(客户料号) as 客户料号,rtrim(Sys_id) as 创建用户,rtrim(Sys_rq) as 创建时间,
-        rtrim(Mod_rq) as 修改时间,rtrim(Uniqid) as UNIQID,rtrim(投料率) as 投料率,rtrim(销售订单号) as 销售订单号';
-        $list = Db::table('工单_基本资料')->where($where)->field($field)->find();
-        if (empty($list)){
-            $this->error('未找到该工单');
-        }
-        $this->success('成功',$list);
-    }
-
-
     /**
      * 计划中工单
      * @ApiMethod （GET）
@@ -70,7 +42,10 @@ class Manufacture extends Api
             'gd_statu' => $status,
             '行号' => '1',
         ];
-        $field = 'rtrim(Gd_生产分类) as 生产分类,rtrim(Gd_gdbh) as 工单编号,rtrim(Gd_cpdh) as 产品代号,rtrim(Gd_cpmc) as 产品名称,
+        if (isset($param['search'])){
+            $where['Gd_lx|Gd_gdbh|Gd_客户代号|Gd_客户名称|Gd_khdh|Gd_khmc|Gd_cpdh|Gd_cpmc|成品代号|成品名称|产品版本号'] = ['like','%'.$param['search'].'%'];
+        }
+        $field = 'rtrim(Gd_生产分类) as 生产分类,rtrim(Gd_gdbh) as 工单编号,rtrim(Gd_cpdh) as 产品代号,rtrim(Gd_cpmc) as 产品名称,rtrim(成品名称) as 成品名称,
         rtrim(接单日期) as 接单日期,rtrim(交货日期) as 交货日期,rtrim(订单数量) as 订单数量,rtrim(计量单位) as 计量单位,rtrim(Gd_khmc) as 客户名称,
         rtrim(Gd_客户代号) as 客户编号,rtrim(Gd_desc) as 备注,rtrim(客户料号) as 客户料号,rtrim(Sys_id) as 创建用户,rtrim(Sys_rq) as 创建时间,
         rtrim(Mod_rq) as 修改时间,rtrim(Uniqid) as UNIQID,rtrim(投料率) as 投料率,rtrim(销售订单号) as 销售订单号';
@@ -80,12 +55,14 @@ class Manufacture extends Api
         }
         foreach ($list as $key=>$value){
             $list[$key]['订单数量'] = rtrim((float)$value['订单数量']);
+            $list[$key]['产品名称'] = $value['产品名称'] != '' ? $value['产品名称']:$value['成品名称'];
             $number = Db::table('工单_工艺资料')->where('Gy0_gdbh',$value['工单编号'])->count();
             if ($number === 0){
                 $list[$key]['status'] = 0;
             }else{
                 $list[$key]['status'] = 1;
             }
+            unset($list[$key]['成品名称']);
         }
         $this->success('成功',$list);
     }
@@ -183,6 +160,9 @@ class Manufacture extends Api
         if (empty($param)){
             $this->error('参数错误');
         }
+//        if (isset($param)){
+//            "Gd_lx|Gd_gdbh|Gd_客户代号|Gd_客户名称|Gd_khdh|Gd_khmc|Gd_cpdh|Gd_cpmc|成品代号|成品名称|产品版本号" LIKE
+//        }
         if ($param['status'] === '排程中'){
             $sql = "SELECT
                 rtrim(a.Gd_gdbh) AS 工单编号,
@@ -206,7 +186,7 @@ class Manufacture extends Api
                 AND a.行号 = '1'
                 AND b.PD_WG = '1900-01-01 00:00:00'
                 AND b.Gy0_sj1 = '1900-01-01 00:00:00'
-                    AND c.状态 = ''
+                AND c.状态 = ''
             GROUP BY a.Gd_gdbh ";
         }else{
             $sql = "SELECT
@@ -231,7 +211,7 @@ class Manufacture extends Api
                 AND a.行号 = '1'
                 AND b.PD_WG = '1900-01-01 00:00:00'
                 AND b.Gy0_sj1 != '1900-01-01 00:00:00'
-                    AND c.状态 = ''
+                AND c.状态 = ''
             GROUP BY a.Gd_gdbh ";
         }
         $list = Db::query($sql);

application/api/controller/WorkOrder.php

@@ -1027,10 +1027,10 @@ class WorkOrder extends Api
      */
     public function PrintJobOrder()
     {
-        if (Request::instance()->isPost() === false) {
+        if ($this->request->isGet() === false) {
             $this->error('请求错误');
         }
-        $param = Request::instance()->post();
+        $param = $this->request->param();
         if (empty($param)){
             $this->error('参数错误');
         }