root 2 tahun lalu
induk
melakukan
3df1206f40

+ 51 - 9
app/Http/Controllers/Api/ScreenController.php

@@ -15,9 +15,18 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 
+/**
+ * 大屏数据展示
+ * Class ScreenController
+ * @package App\Http\Controllers\Api
+ */
 class ScreenController extends BaseController
 {
-    //产值数据全览
+    /**
+     * 产值数据全览
+     * @param Request $request
+     * @return array
+     */
     public function output_value(Request $request){
         $currentYear = Carbon::now()->year;
         $lastYear = $currentYear - 1;
@@ -30,7 +39,11 @@ class ScreenController extends BaseController
         return $this->json_return(200,'',['total_time'=>$totalValueAllTime, 'total_last_year'=>$totalValueLastYear, 'total_current_month'=>$totalValueCurrentYearMonth]);
     }
 
-    //项目进度
+    /**
+     * 项目进度
+     * @param Request $request
+     * @return array
+     */
     public function order_process1(Request $request) {
         $result = SaleOrdersProduct::where('del_time',0)
             ->select(DB::raw('sum(order_quantity) as total'), DB::raw('sum(finished_num) as finished_num'),'out_order_no as Code','customer_name as CustomerName')
@@ -50,7 +63,11 @@ class ScreenController extends BaseController
         return $this->json_return(200,'',$result);
     }
 
-    //历史项目 在手项目
+    /**
+     * 历史项目 在手项目
+     * @param Request $request
+     * @return array
+     */
     public function project_region(Request $request){
         $all = SaleOrdersProduct::where('del_time',0)
             ->whereColumn('order_quantity','=','finished_num')
@@ -76,7 +93,11 @@ class ScreenController extends BaseController
         return $this->json_return(200,'',$arr);
     }
 
-    //本月质量
+    /**
+     * 本月质量
+     * @param Request $request
+     * @return array
+     */
     public function output_value_month1(Request $request){
         $date = date('Ymd',time());
 
@@ -109,7 +130,11 @@ class ScreenController extends BaseController
         return $this->json_return(200,'',$return);
     }
 
-    //产量趋势图
+    /**
+     * 产量趋势图
+     * @param Request $request
+     * @return array
+     */
     public function output_value_efficiency(Request $request){
         // 获取当前时间戳
         $currentTimestamp = time();
@@ -150,7 +175,11 @@ class ScreenController extends BaseController
         return $this->json_return(200,'',$result);
     }
 
-    //工序负荷全览
+    /**
+     * 工序负荷全览
+     * @param Request $request
+     * @return array
+     */
     public function capacity(Request $request){
         $date = date('Ymd',time());
 
@@ -215,7 +244,11 @@ class ScreenController extends BaseController
 
     }
 
-    //设备信息
+    /**
+     * 设备信息
+     * @param Request $request
+     * @return array
+     */
     public function product_num(Request $request){
         //数据模型
         $models = [];
@@ -336,7 +369,11 @@ class ScreenController extends BaseController
         return $this->json_return(200,'',$result);
     }
 
-    //待加工
+    /**
+     * 待加工
+     * @param Request $request
+     * @return array
+     */
     public function nu_work_order(Request $request){
         $date = date('Ymd',time());
 
@@ -370,7 +407,12 @@ class ScreenController extends BaseController
         return [false, []];
     }
 
-    //数据填充
+    /**
+     * 数据填充
+     * @param $list
+     * @param $type
+     * @param $models
+     */
     public function fillData($list,$type,&$models){
         if(empty($list)) return;
 

+ 5 - 0
app/Service/CloudDataService.php

@@ -5,6 +5,11 @@ namespace App\Service;
 use App\Model\SystemL;
 use Illuminate\Support\Facades\Redis;
 
+/**
+ * 获取机器数据
+ * Class CloudDataService
+ * @package App\Service
+ */
 class CloudDataService extends Service
 {
     //密钥

+ 26 - 0
app/Service/EquipmentService.php

@@ -10,6 +10,11 @@ use App\Model\Equipment;
  */
 class EquipmentService extends Service
 {
+    /**
+     * 设备编辑
+     * @param $data
+     * @return array
+     */
     public function equipmentEdit($data){
         list($status,$msg) = $this->equipmentRule($data,false);
         if(!$status) return [$status,$msg];
@@ -20,6 +25,11 @@ class EquipmentService extends Service
         return [true,'保存成功!'];
     }
 
+    /**
+     * 设备新增
+     * @param $data
+     * @return array
+     */
     public function equipmentAdd($data){
         list($status,$msg) = $this->equipmentRule($data);
         if(!$status) return [$status,$msg];
@@ -29,6 +39,11 @@ class EquipmentService extends Service
         return [true,'保存成功!'];
     }
 
+    /**
+     * 设备删除
+     * @param $data
+     * @return array
+     */
     public function equipmentDel($data){
         if($this->isEmpty($data,'id')) return [false,'ID必须!'];
 
@@ -39,6 +54,11 @@ class EquipmentService extends Service
         return [true,'删除成功'];
     }
 
+    /**
+     * 设备列表
+     * @param $data
+     * @return array
+     */
     public function equipmentList($data){
         $model = Equipment::where('del_time',0)
             ->select('*');
@@ -51,6 +71,12 @@ class EquipmentService extends Service
         return [200,$list];
     }
 
+    /**
+     * 设备规则
+     * @param $data
+     * @param bool $is_add
+     * @return array
+     */
     public function equipmentRule($data,$is_add = true){
         if($this->isEmpty($data,'data')) return [false,'数据不能为空!'];
 

+ 60 - 9
app/Service/ReportFormsService.php

@@ -10,9 +10,18 @@ use App\Model\SystemL;
 use App\Model\Team;
 use Illuminate\Support\Facades\DB;
 
+/**
+ * 设备相关设置报表
+ * Class ReportFormsService
+ * @package App\Service
+ */
 class ReportFormsService extends Service
 {
-    //生产进度
+    /**
+     * 生产进度
+     * @param $data
+     * @return array
+     */
     public function productionReport($data){
         if(empty($data['production_time'][0]) || empty($data['production_time'][1])) return [false, '生产订单时间必须选择!'];
 
@@ -106,7 +115,11 @@ class ReportFormsService extends Service
         return $out_time;
     }
 
-    //班组
+    /**
+     * 班组
+     * @param $data
+     * @return array
+     */
     public function teamReport($data){
         if(empty($data['finish_time'][0]) || empty($data['finish_time'][1])) return [false, '完工时间必须选择!'];
 
@@ -193,6 +206,11 @@ class ReportFormsService extends Service
         return [true,['list'=>array_values($return_team),'chart'=>$return_team_time]];
     }
 
+    /**
+     * 时间特殊处理
+     * @param $time_area
+     * @return array
+     */
     private function increaseTimeArea($time_area){
         // 增加三个月的时间戳
         $newStartTimestamp = strtotime('-3 months', $time_area[0]);
@@ -201,6 +219,11 @@ class ReportFormsService extends Service
         return [$newStartTimestamp,$newEndTimestamp];
     }
 
+    /**
+     * 获取时间区间数据
+     * @param $time_area
+     * @return array
+     */
     private function getTimeAreaData($time_area){
         $startYear = date('Y', $time_area[0]);
         $endYear = date('Y', $time_area[1]);
@@ -222,7 +245,11 @@ class ReportFormsService extends Service
         return $return;
     }
 
-    //班组 详情
+    /**
+     * 班组 详情
+     * @param $data
+     * @return array
+     */
     public function teamReportDetail($data){
         if(empty($data['production_no'])) return [false,'生产订单号不能为空!'];
 
@@ -238,7 +265,11 @@ class ReportFormsService extends Service
         return [true,$list];
     }
 
-    //不良品
+    /**
+     * 不良品
+     * @param $data
+     * @return array
+     */
     public function badGoodsReport($data){
         if(empty($data['production_time'][0]) || empty($data['production_time'][1])) return [false, '生产订单时间必须选择!'];
 
@@ -306,7 +337,11 @@ class ReportFormsService extends Service
         return [true,array_values($list)];
     }
 
-    //不良品 详情
+    /**
+     * 不良品 详情
+     * @param $data
+     * @return array
+     */
     public function badGoodsReportDetail($data){
         if(empty($data['production_no'])) return [false,'生产订单号不能为空!'];
 
@@ -366,7 +401,11 @@ class ReportFormsService extends Service
         return [true, $list];
     }
 
-    //不良品原因
+    /**
+     * 不良品原因
+     * @param $data
+     * @return array
+     */
     public function badGoodsReasonReport($data){
         if(empty($data['production_time'][0]) || empty($data['production_time'][1])) return [false, '生产订单时间必须选择!'];
 
@@ -635,7 +674,11 @@ class ReportFormsService extends Service
         return [true, $return];
     }
 
-    //数据分析图
+    /**
+     * 数据分析图
+     * @param $data
+     * @return array
+     */
     public function deviceStatisticsReportChart($data){
         if(empty($data['time'][0]) || empty($data['time'][1])) return [false, '时间必须选择!'];
 
@@ -690,7 +733,11 @@ class ReportFormsService extends Service
         return [true, $return];
     }
 
-    //数据OEE分析图
+    /**
+     * 数据OEE分析图
+     * @param $data
+     * @return array
+     */
     public function deviceStatisticsReportOEEChart($data){
         if(empty($data['time'][0]) || empty($data['time'][1])) return [false, '时间必须选择!'];
 
@@ -796,7 +843,11 @@ class ReportFormsService extends Service
         return [true,$final];
     }
 
-    //用于计算时间
+    /**
+     * 用于计算时间
+     * @param $minute
+     * @return string
+     */
     public function calTimeReturnMin($minute){
         return number_format($minute * 1.5 / 60,2);
     }