Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/Service/CustomerService.php

app/Http/Middleware/CheckLogin.php

@@ -7,6 +7,9 @@ use App\Service\EmployeeService;
 use Closure;
 use App\Service\TokenService;
 
+/**
+ * 用户登陆中间件
+ */
 class CheckLogin
 {
     /**

app/Service/BasicTypeService.php

@@ -4,8 +4,16 @@ namespace App\Service;
 
 use App\Model\BasicType;
 
+/**
+ * 基础分类设置相关
+ */
 class BasicTypeService extends Service
 {
+    /**
+     * 基础类型编辑
+     * @param $data
+     * @return array
+     */
     public function basicTypeEdit($data){
         list($status,$msg) = $this->basicTypeRule($data,false);
         if(!$status) return [$status,$msg];
@@ -16,6 +24,11 @@ class BasicTypeService extends Service
         return [true,''];
     }
 
+    /**
+     * 基础类型新增
+     * @param $data
+     * @return array
+     */
     public function basicTypeAdd($data){
         list($status,$msg) = $this->basicTypeRule($data);
         if(!$status) return [$status,$msg];
@@ -25,6 +38,11 @@ class BasicTypeService extends Service
         return [true,''];
     }
 
+    /**
+     * 基础类型删除
+     * @param $data
+     * @return array
+     */
     public function basicTypeDel($data){
         if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
 
@@ -35,6 +53,11 @@ class BasicTypeService extends Service
         return [true,''];
     }
 
+    /**
+     * 基础类型列表
+     * @param $data
+     * @return array
+     */
     public function basicTypeList($data){
         $model = BasicType::where('del_time',0)
             ->select('title','id','type')
@@ -49,6 +72,12 @@ class BasicTypeService extends Service
         return [true, $list];
     }
 
+    /**
+     * 基础类型参数规则
+     * @param $data
+     * @param $is_check
+     * @return array
+     */
     public function basicTypeRule($data,$is_check = true){
         if($this->isEmpty($data,'data')) return [false,'数据不能为空！'];
 
@@ -105,6 +134,11 @@ class BasicTypeService extends Service
         return [true, $data];
     }
 
+    /**
+     * 拼接数据
+     * @param $data
+     * @return array
+     */
     public function fillData($data){
         if(empty($data['data'])) return $data;
 

app/Service/ConstructionService.php

@@ -11,8 +11,17 @@ use App\Model\Employee;
 use App\Model\SalesOrder;
 use Illuminate\Support\Facades\DB;
 
+/**
+ * 施工订单
+ */
 class ConstructionService extends Service
 {
+    /**
+     * 施工订单编辑
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function constructionEdit($data,$user){
         list($status,$msg) = $this->constructionRule($data, $user, false);
         if(!$status) return [$status,$msg];
@@ -112,6 +121,12 @@ class ConstructionService extends Service
         return [true,''];
     }
 
+    /**
+     * 施工订单新增
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function constructionAdd($data,$user){
         list($status,$msg) = $this->constructionRule($data,$user);
         if(!$status) return [$status,$msg];
@@ -205,6 +220,11 @@ class ConstructionService extends Service
         return [true,''];
     }
 
+    /**
+     * 施工订单删除
+     * @param $data
+     * @return array
+     */
     public function constructionDel($data){
         if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
 
@@ -234,6 +254,11 @@ class ConstructionService extends Service
         return [true,''];
     }
 
+    /**
+     * 施工订单详情
+     * @param $data
+     * @return array
+     */
     public function constructionDetail($data){
         if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
 
@@ -311,6 +336,12 @@ class ConstructionService extends Service
         return [true, $construction];
     }
 
+    /**
+     * 施工订单列表
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function constructionList($data,$user){
         $model = new Construction(['userData' => $user]);
         $model = $model->where('del_time',0)
@@ -325,6 +356,13 @@ class ConstructionService extends Service
         return [true, $list];
     }
 
+    /**
+     * 参数规则
+     * @param $data
+     * @param $user
+     * @param $is_add
+     * @return array
+     */
     public function constructionRule(&$data, $user, $is_add = true){
         if(empty($data['model_type'])) return [false,'工单模板类型不能为空'];
         if(! in_array($data['model_type'],Construction::$model_type)) return [false,'工单模板类型错误'];
@@ -391,6 +429,11 @@ class ConstructionService extends Service
         return [true, [$product_submit, $product_save]];
     }
 
+    /**
+     * 数据拼接
+     * @param $data
+     * @return array
+     */
     public function fillData($data){
         if(empty($data['data'])) return $data;
 
@@ -425,6 +468,11 @@ class ConstructionService extends Service
         return $data;
     }
 
+    /**
+     * 获取施工单号
+     * @param $data
+     * @return array
+     */
     public function constructionGet($data){
         if(empty($data['model_type'])) return [false,'工单模板类型不能为空'];
         if(! isset(Construction::$prefix[$data['model_type']])) return [false,'工单模板类型错误'];
@@ -435,6 +483,11 @@ class ConstructionService extends Service
         return [true,['order_number' => $order_number]];
     }
 
+    /**
+     * 获取保存详情
+     * @param $id
+     * @return array
+     */
     public function getSaveDetail($id){
         $product_save = [];
         $sub = ConstructionProductInfo::where('construction_id',$id)

app/Service/CustomerService.php

@@ -9,8 +9,17 @@ use App\Model\Depart;
 use App\Model\Employee;
 use Illuminate\Support\Facades\DB;
 
+/**
+ * 客户管理相关
+ */
 class CustomerService extends Service
 {
+    /**
+     * 客户编辑
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function customerEdit($data,$user){
         list($status,$msg) = $this->customerRule($data,false);
         if(!$status) return [$status,$msg];
@@ -136,6 +145,12 @@ class CustomerService extends Service
         return [true,''];
     }
 
+    /**
+     * 客户新增
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function customerAdd($data,$user){
         list($status,$msg) = $this->customerRule($data);
         if(!$status) return [$status,$msg];
@@ -258,6 +273,11 @@ class CustomerService extends Service
         return [true,''];
     }
 
+    /**
+     * 客户删除
+     * @param $data
+     * @return array
+     */
     public function customerDel($data){
         if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
 
@@ -280,6 +300,11 @@ class CustomerService extends Service
         return [true,''];
     }
 
+    /**
+     * 客户详情
+     * @param $data
+     * @return array
+     */
     public function customerDetail($data){
         if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
 
@@ -384,6 +409,12 @@ class CustomerService extends Service
         return [true, $customer];
     }
 
+    /**
+     * 客户列表
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function customerList($data,$user){
         $model = Customer::where('del_time',0)
             ->select('title','id','model_type','customer_intention','customer_from','customer_type','car_type','consulting_product','intention_product','progress_stage','address1','address2','crt_id','crt_time','mark','importance','company','company_short_name','depart_id','state_type','customer_state','customer_grade','pond_state')
@@ -421,6 +452,13 @@ class CustomerService extends Service
         return [true, $list];
     }
 
+    /**
+     * 客户参数规则
+     * @param $data
+     * @param $is_add
+     * @return array
+     */
+    public function customerRule($data, $is_add = true){
     public function customerRule(&$data, $is_add = true){
         if(empty($data['model_type'])) return [false,'客户模板类型不能为空'];
         if(! in_array($data['model_type'],Customer::$model_type)) return [false,'客户模板类型错误'];
@@ -455,6 +493,11 @@ class CustomerService extends Service
         return [true, $data];
     }
 
+    /**
+     * 拼接数据
+     * @param $data
+     * @return array
+     */
     public function fillData($data){
         if(empty($data['data'])) return $data;
 

app/Service/EmployeeService.php

@@ -25,6 +25,12 @@ use Mockery\Exception;
  */
 class EmployeeService extends Service
 {
+    /**
+     * 用户编辑
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function employeeEdit($data,$user){
         list($status,$msg) = $this->employeeRule($data,false);
         if(!$status) return [$status,$msg];
@@ -84,6 +90,12 @@ class EmployeeService extends Service
         return [true,''];
     }
 
+    /**
+     * 用户新增
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function employeeAdd($data,$user){
         list($status,$msg) = $this->employeeRule($data);
         if(!$status) return [$status,$msg];
@@ -141,6 +153,11 @@ class EmployeeService extends Service
         return [true,''];
     }
 
+    /**
+     * 用户删除
+     * @param $data
+     * @return array
+     */
     public function employeeDel($data){
         if($this->isEmpty($data,'id')) return [false,'请选择删除的数据！'];
 
@@ -151,6 +168,12 @@ class EmployeeService extends Service
         return [true,'删除成功'];
     }
 
+    /**
+     * 用户列表
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function employeeList($data,$user){
         $model = Employee::where('del_time',0)
             ->select('number','mobile','emp_name','id','entry_time','leave_time','is_admin','state')
@@ -183,6 +206,11 @@ class EmployeeService extends Service
         return [true , $list];
     }
 
+    /**
+     * 用户数据组装
+     * @param $data
+     * @return array
+     */
     public function organizationEmployeeData($data) {
         if (empty($data['data'])) return $data;
 
@@ -228,6 +256,12 @@ class EmployeeService extends Service
         return $data;
     }
 
+    /**
+     * 用户参数规则
+     * @param $data
+     * @param $is_add
+     * @return array
+     */
     public function employeeRule($data,$is_add = true){
         if($this->isEmpty($data,'number')) return [false,'工号不存在！'];
         if($this->isEmpty($data,'emp_name')) return [false,'姓名不存在！'];
@@ -246,6 +280,11 @@ class EmployeeService extends Service
         return [true,''];
     }
 
+    /**
+     * 角色编辑
+     * @param $data
+     * @return array
+     */
     public function roleEdit($data){
         list($status,$msg) = $this->roleRule($data, false);
         if(!$status) return [$status,$msg];
@@ -258,6 +297,12 @@ class EmployeeService extends Service
         return [true,'保存成功！'];
     }
 
+    /**
+     * 角色新增
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function roleAdd($data,$user){
         list($status,$msg) = $this->roleRule($data);
         if(!$status) return [$status,$msg];
@@ -269,6 +314,11 @@ class EmployeeService extends Service
         return [true,'保存成功！'];
     }
 
+    /**
+     * 角色删除
+     * @param $data
+     * @return array
+     */
     public function roleDel($data){
         if($this->isEmpty($data,'id')) return [false,'ID必须！'];
 
@@ -284,6 +334,11 @@ class EmployeeService extends Service
         return [true,'删除成功'];
     }
 
+    /**
+     * 角色列表
+     * @param $data
+     * @return array
+     */
     public function roleList($data){
         $list = Role::where('del_time',0)
             ->select('title','crt_time','id','upd_time')
@@ -295,6 +350,12 @@ class EmployeeService extends Service
         return [200,$list];
     }
 
+    /**
+     * 角色参数规则
+     * @param $data
+     * @param $is_check
+     * @return array
+     */
     public function roleRule($data,$is_check = true){
         if($this->isEmpty($data,'title')) return [false,'名称不能为空！'];
 
@@ -315,6 +376,11 @@ class EmployeeService extends Service
         return [true,''];
     }
 
+    /**
+     * 角色菜单更新
+     * @param $data
+     * @return array
+     */
     public function roleMenu($data){
         if(empty($data['role_id']))  return [false,'角色不能为空！'];
         if(empty($data['menu'])) return [false,'菜单数据不能为空！'];
@@ -355,6 +421,11 @@ class EmployeeService extends Service
         return [true,'保存成功!'];
     }
 
+    /**
+     * 角色详情
+     * @param $data
+     * @return array
+     */
     public function roleDetail($data){
         if(empty($data['role_id'])) return [false,'请选择角色'];
 
@@ -378,6 +449,11 @@ class EmployeeService extends Service
         return [true, $role];
     }
 
+    /**
+     * 部门编辑
+     * @param $data
+     * @return array
+     */
     public function departEdit($data){
         list($status,$msg) = $this->departRule($data,false);
         if(!$status) return [$status,$msg];
@@ -390,6 +466,12 @@ class EmployeeService extends Service
         return [true,'保存成功！'];
     }
 
+    /**
+     * 部门新增
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function departAdd($data,$user){
         list($status,$msg) = $this->departRule($data);
         if(!$status) return [$status,$msg];
@@ -399,6 +481,11 @@ class EmployeeService extends Service
         return [true,'保存成功！'];
     }
 
+    /**
+     * 部门删除
+     * @param $data
+     * @return array
+     */
     public function departDel($data){
         list($status,$msg) = $this->checkDepartDel($data);
         if(! $status) return [false, $msg];
@@ -410,6 +497,11 @@ class EmployeeService extends Service
         return [true,'删除成功'];
     }
 
+    /**
+     * 判断部门是否可以删除
+     * @param $data
+     * @return array
+     */
     public function checkDepartDel($data){
         if($this->isEmpty($data,'id')) return [false,'ID必须！'];
 
@@ -421,6 +513,12 @@ class EmployeeService extends Service
         return [true, ''];
     }
 
+    /**
+     * 部门列表
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function departList($data,$user){
         $model = Depart::where('del_time',0)
             ->select('title','id','code','parent_id','is_main')
@@ -438,6 +536,12 @@ class EmployeeService extends Service
         return [200,['data' => $list,'tree' => $list_tree]];
     }
 
+    /**
+     * 部门参数规则
+     * @param $data
+     * @param $is_check
+     * @return array
+     */
     public function departRule($data, $is_check = true){
         if($this->isEmpty($data,'data')) return [false,'数据不能为空！'];
 
@@ -484,7 +588,11 @@ class EmployeeService extends Service
         return [true, $data];
     }
 
-    //检测部门下是否存在人员
+    /**
+     * 检测部门下是否存在人员
+     * @param $depart_id
+     * @return false
+     */
     public function checkDepartHasPerson($depart_id = []){
         if(empty($depart_id)) return false;
 
@@ -497,6 +605,11 @@ class EmployeeService extends Service
         return $bool;
     }
 
+    /**
+     * 班组编辑
+     * @param $data
+     * @return array
+     */
     public function teamEdit($data){
         list($status,$msg) = $this->teamRule($data,false);
         if(!$status) return [$status,$msg];
@@ -510,6 +623,12 @@ class EmployeeService extends Service
         return [true,'保存成功！'];
     }
 
+    /**
+     * 班组新增
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function teamAdd($data,$user){
         list($status,$msg) = $this->teamRule($data);
         if(!$status) return [$status,$msg];
@@ -522,6 +641,11 @@ class EmployeeService extends Service
         return [true,'保存成功！'];
     }
 
+    /**
+     * 班组删除
+     * @param $data
+     * @return array
+     */
     public function teamDel($data){
         if($this->isEmpty($data,'id')) return [false,'ID必须！'];
 
@@ -532,6 +656,11 @@ class EmployeeService extends Service
         return [true,'删除成功'];
     }
 
+    /**
+     * 班组列表
+     * @param $data
+     * @return array
+     */
     public function teamList($data){
         $list = Team::where('del_time',0)
             ->select('title','id','crt_time','upd_time','code')
@@ -541,6 +670,12 @@ class EmployeeService extends Service
         return [200,$list];
     }
 
+    /**
+     * 班组参数规则
+     * @param $data
+     * @param $is_add
+     * @return array
+     */
     public function teamRule($data,$is_add = true){
         if($this->isEmpty($data,'title')) return [false,'名称不存在！'];
         if($this->isEmpty($data,'code')) return [false,'编码不存在'];
@@ -558,6 +693,11 @@ class EmployeeService extends Service
         return [true,''];
     }
 
+    /**
+     * 班组详情
+     * @param $data
+     * @return array
+     */
     public function teamDetail($data){
         if($this->isEmpty($data,'id')) return [false,'ID不能为空！'];
 
@@ -570,6 +710,11 @@ class EmployeeService extends Service
         return [true,$result];
     }
 
+    /**
+     * 人员权限
+     * @param $data
+     * @return array
+     */
     public function employeeRole($data){
         $role_ids = [];
         $employee_ids = [];
@@ -597,6 +742,11 @@ class EmployeeService extends Service
 
     }
 
+    /**
+     * 人员部门关系更新
+     * @param $data
+     * @return array
+     */
     public function employeeDepart($data){
         if($this->isEmpty($data,'insert')) return [false,'数据不能为空！'];
 
@@ -628,6 +778,11 @@ class EmployeeService extends Service
         return [true,'保存成功!'];
     }
 
+    /**
+     * 人员班组关心更新
+     * @param $data
+     * @return array
+     */
     public function employeeTeam($data){
         if($this->isEmpty($data,'insert')) return [false,'数据不能为空！'];
 
@@ -659,6 +814,11 @@ class EmployeeService extends Service
         return [true,'保存成功!'];
     }
 
+    /**
+     * 登陆参数规则
+     * @param $data
+     * @return array
+     */
     public function loginRule($data){
         if($this->isEmpty($data,'account')) return [false,'账号不能为空！'];
         if($this->isEmpty($data,'password')) return [false,'密码不存在！'];
@@ -677,6 +837,11 @@ class EmployeeService extends Service
         return [true, ['id'=>$res['id'], 'name'=>$res['emp_name'], 'account' => $res['account']]];
     }
 
+    /**
+     * 检查人员信息
+     * @param $userId
+     * @return array
+     */
     public static function checkUser($userId){
         $res = Employee::where('id', $userId)
             ->where('del_time',0)
@@ -687,7 +852,11 @@ class EmployeeService extends Service
         return [true, $res];
     }
 
-    //获取登录账号的角色
+    /**
+     * 获取登录账号的角色
+     * @param $employee_id
+     * @return array
+     */
     public static function getPersonRole($employee_id){
         if(empty($employee_id)) return [];
         $role = EmployeeRole::where('del_time',0)
@@ -703,7 +872,12 @@ class EmployeeService extends Service
         return $role_id;
     }
 
-    //获取登录账号的角色的菜单
+    /**
+     * 获取登录账号的角色的菜单
+     * @param $role_id
+     * @param $user_id
+     * @return array
+     */
     public function getMenuByRole($role_id,$user_id){
         $menu = SysMenu::where('del_time',0)->select('id')->get()->toArray();
         $button = SysMenuButton::where('del_time',0)->select('id','menu_id')->get()->toArray();
@@ -748,7 +922,12 @@ class EmployeeService extends Service
         return $object;
     }
 
-    //人员直接绑定部门
+    /**
+     * 人员直接绑定部门
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function employeeManagerDepart($data,$user){
         if($user['id'] != Employee::SPECIAL_ADMIN) return [false,'非ADMIN账号不能操作'];
 
@@ -773,7 +952,11 @@ class EmployeeService extends Service
         return [true,''];
     }
 
-    //填充角色下的按钮
+    /**
+     * 填充角色下的按钮
+     * @param $role_id
+     * @return array
+     */
     public function fillRoleButton($role_id){
         $button = RoleMenuButton::whereIn('role_id',$role_id)
             ->where('del_time',0)
@@ -791,7 +974,11 @@ class EmployeeService extends Service
         return $button_map;
     }
 
-    //获取登录账号的部门
+    /**
+     * 获取登录账号的部门
+     * @param $employee_id
+     * @return array|string[]
+     */
     public static function getLoginDepart($employee_id){
         if(empty($employee_id)) return ['', '','',''];
 
@@ -859,6 +1046,12 @@ class EmployeeService extends Service
         return [$depart, $top, $map, array_unique($rule)];
     }
 
+    /**
+     * 获取顶级id
+     * @param $id
+     * @param $data
+     * @return int
+     */
     public static function getTopParentId($id, $data) {
         foreach ($data as $item) {
             if ($item['id'] == $id) {
@@ -876,6 +1069,12 @@ class EmployeeService extends Service
         return 0;
     }
 
+    /**
+     * 递归获取所有id
+     * @param $data
+     * @param $id
+     * @return array
+     */
     public static function getAllIds($data, $id) {
         $result = array(); // 存储结果的数组
 

app/Service/InvoiceOrderService.php

@@ -9,8 +9,17 @@ use App\Model\InvoiceOrderInfo;
 use App\Model\SalesOrder;
 use Illuminate\Support\Facades\DB;
 
+/**
+ * 发货单
+ */
 class InvoiceOrderService extends Service
 {
+    /**
+     * 发货单编辑
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function edit($data,$user){
         list($status,$msg) = $this->orderRule($data,false);
         if(!$status) return [$status,$msg];
@@ -65,6 +74,12 @@ class InvoiceOrderService extends Service
         return [true,''];
     }
 
+    /**
+     * 发货单新增
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function add($data,$user){
         list($status,$msg) = $this->orderRule($data);
         if(!$status) return [$status,$msg];
@@ -118,6 +133,11 @@ class InvoiceOrderService extends Service
         return [true,''];
     }
 
+    /**
+     * 发货单详情
+     * @param $data
+     * @return array
+     */
     public function detail($data){
         if($this->isEmpty($data,'order_number')) return [false,'请选择数据'];
 
@@ -146,6 +166,11 @@ class InvoiceOrderService extends Service
         return [true, $order];
     }
 
+    /**
+     * 发货单删除
+     * @param $data
+     * @return array
+     */
     public function del($data){
         if($this->isEmpty($data,'order_number')) return [false,'请选择数据！'];
 
@@ -174,6 +199,12 @@ class InvoiceOrderService extends Service
         return [true,''];
     }
 
+    /**
+     * 获取发货单列表
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function getList($data,$user){
         $model = InvoiceOrder::where('del_time',0)
             ->select('id','order_number','sales_order_id','depart_id','send','send_time','take','take_address','take_phone','logistics_company','logistics_number','crt_id','mark','state','crt_time')
@@ -192,6 +223,11 @@ class InvoiceOrderService extends Service
         return [true, $list];
     }
 
+    /**
+     * 拼接数据
+     * @param $data
+     * @return array
+     */
     public function fillListData($data){
         if(empty($data['data'])) return $data;
 
@@ -218,6 +254,12 @@ class InvoiceOrderService extends Service
         return $data;
     }
 
+    /**
+     * 发货单参数规则
+     * @param $data
+     * @param $is_check
+     * @return array
+     */
     public function orderRule(&$data, $is_check = true){
         if($this->isEmpty($data,'send')) return [false,'发货人不能为空！'];
         if($this->isEmpty($data,'product')) return [false,'产品不能为空！'];
@@ -259,6 +301,11 @@ class InvoiceOrderService extends Service
         return [true, [$product_submit, $product_save]];
     }
 
+    /**
+     * 获取保存详情
+     * @param $order_number
+     * @return array
+     */
     public function getSaveDetail($order_number){
         $product_save = [];
         $sub = InvoiceOrderInfo::where('order_number',$order_number)

app/Service/ProductService.php

@@ -13,8 +13,17 @@ use App\Model\ProductInventory;
 use App\Model\ProductRange;
 use Illuminate\Support\Facades\DB;
 
+/**
+ * 产品管理
+ */
 class ProductService extends Service
 {
+    /**
+     * 产品分类编辑
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function productCategoryEdit($data,$user){
         list($status,$msg) = $this->productCategoryRule($data,false);
         if(!$status) return [$status,$msg];
@@ -27,6 +36,12 @@ class ProductService extends Service
         return [true,''];
     }
 
+    /**
+     * 产品分类新增
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function productCategoryAdd($data,$user){
         list($status,$msg) = $this->productCategoryRule($data);
         if(!$status) return [$status,$msg];
@@ -36,6 +51,11 @@ class ProductService extends Service
         return [true,''];
     }
 
+    /**
+     * 产品分类删除
+     * @param $data
+     * @return array
+     */
     public function productCategoryDel($data){
         if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
 
@@ -60,6 +80,12 @@ class ProductService extends Service
         return [true,''];
     }
 
+    /**
+     * 产品分类列表
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function productCategoryList($data,$user){
         $model = ProductCategory::where('del_time',0)
             ->select('title','id','parent_id')
@@ -71,6 +97,12 @@ class ProductService extends Service
         return [true, $list];
     }
 
+    /**
+     * 产品分类参数规则
+     * @param $data
+     * @param $is_add
+     * @return array
+     */
     public function productCategoryRule($data, $is_add = true){
         if($this->isEmpty($data,'data')) return [false,'数据不能为空！'];
 
@@ -120,6 +152,12 @@ class ProductService extends Service
         return [true, $data];
     }
 
+    /**
+     * 产品编辑
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function productEdit($data,$user){
         list($status,$msg) = $this->productRule($data,false);
         if(!$status) return [$status,$msg];
@@ -224,6 +262,12 @@ class ProductService extends Service
         return [true,''];
     }
 
+    /**
+     * 产品新增
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function productAdd($data,$user){
         list($status,$msg) = $this->productRule($data);
         if(!$status) return [$status,$msg];
@@ -318,6 +362,11 @@ class ProductService extends Service
         return [true,''];
     }
 
+    /**
+     * 产品删除
+     * @param $data
+     * @return array
+     */
     public function productDel($data){
         if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
 
@@ -348,6 +397,12 @@ class ProductService extends Service
         return [true,''];
     }
 
+    /**
+     * 产品详情
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function productDetail($data,$user){
         if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
 
@@ -419,6 +474,12 @@ class ProductService extends Service
         return [true, $customer];
     }
 
+    /**
+     * 产品列表
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function productList($data,$user){
         $model = Product::where('del_time',0)
             ->select('title','id','product_category_id','code','size','unit','bar_code','retail_price','cost','depart_price','state','crt_id','crt_time','mark')
@@ -445,6 +506,12 @@ class ProductService extends Service
         return [true, $list];
     }
 
+    /**
+     * 产品参数规则
+     * @param $data
+     * @param $is_add
+     * @return array
+     */
     public function productRule($data, $is_add = true){
         if(empty($data['title'])) return [false,'产品名称不能为空'];
         if(empty($data['product_category_id'])) return [false,'产品分类不能为空'];
@@ -475,6 +542,11 @@ class ProductService extends Service
         return [true, $data];
     }
 
+    /**
+     * 拼接数据
+     * @param $data
+     * @return array
+     */
     public function fillData($data){
         if(empty($data['data'])) return $data;
 

app/Service/PurchaseOrderService.php

@@ -10,8 +10,17 @@ use App\Model\PurchaseOrderInfo;
 use App\Model\SalesOrder;
 use Illuminate\Support\Facades\DB;
 
+/**
+ * 采购单
+ */
 class PurchaseOrderService extends Service
 {
+    /**
+     * 采购单编辑
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function edit($data,$user){
         list($status,$msg) = $this->orderRule($data,false);
         if(!$status) return [$status,$msg];
@@ -66,6 +75,12 @@ class PurchaseOrderService extends Service
         return [true,''];
     }
 
+    /**
+     * 采购单新增
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function add($data,$user){
         list($status,$msg) = $this->orderRule($data);
         if(!$status) return [$status,$msg];
@@ -117,6 +132,11 @@ class PurchaseOrderService extends Service
         return [true,''];
     }
 
+    /**
+     * 采购单详情
+     * @param $data
+     * @return array
+     */
     public function detail($data){
         if($this->isEmpty($data,'order_number')) return [false,'请选择数据'];
 
@@ -146,6 +166,11 @@ class PurchaseOrderService extends Service
         return [true, $order];
     }
 
+    /**
+     * 采购单删除
+     * @param $data
+     * @return array
+     */
     public function del($data){
         if($this->isEmpty($data,'order_number')) return [false,'请选择数据！'];
 
@@ -171,6 +196,12 @@ class PurchaseOrderService extends Service
         return [true,''];
     }
 
+    /**
+     * 获取采购单列表
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function getList($data,$user){
         $model = PurchaseOrder::where('del_time',0)
             ->select('order_number','id','depart_id','mark','crt_time','state','crt_id','order_type','sales_order_id','supplier','purchase_id','purchase_total','rate','discount_fee','other_fee','total')
@@ -190,6 +221,11 @@ class PurchaseOrderService extends Service
         return [true, $list];
     }
 
+    /**
+     * 拼接数据
+     * @param $data
+     * @return array
+     */
     public function fillListData($data){
         if(empty($data['data'])) return $data;
 
@@ -217,6 +253,12 @@ class PurchaseOrderService extends Service
         return $data;
     }
 
+    /**
+     * 采购单参数规则
+     * @param $data
+     * @param $is_check
+     * @return array
+     */
     public function orderRule(&$data, $is_check = true){
         if(empty($data['order_type'])) return [false,'采购订单类型不能为空'];
         if($this->isEmpty($data,'product')) return [false,'产品不能为空'];
@@ -257,6 +299,12 @@ class PurchaseOrderService extends Service
         return [true, ''];
     }
 
+    /**
+     * 采购单确认
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function purchaseOrderConfirm($data,$user){
         if(empty($data['order_number'])) return [false, '请选择数据'];
 

app/Service/SalesOrderService.php

@@ -15,8 +15,17 @@ use App\Model\SalesOrderProductInfo;
 use App\Model\SalesOrderRange;
 use Illuminate\Support\Facades\DB;
 
+/**
+ * 订单管理
+ */
 class SalesOrderService extends Service
 {
+    /**
+     * 订单编辑
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function salesOrderEdit($data,$user){
         list($status,$msg) = $this->salesOrderRule($data, $user, false);
         if(!$status) return [$status,$msg];
@@ -143,6 +152,12 @@ class SalesOrderService extends Service
         return [true,''];
     }
 
+    /**
+     * 产品新增
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function salesOrderAdd($data,$user){
         list($status,$msg) = $this->salesOrderRule($data,$user);
         if(!$status) return [$status,$msg];
@@ -263,6 +278,11 @@ class SalesOrderService extends Service
         return [true,''];
     }
 
+    /**
+     * 订单删除
+     * @param $data
+     * @return array
+     */
     public function salesOrderDel($data){
         if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
 
@@ -294,6 +314,11 @@ class SalesOrderService extends Service
         return [true,''];
     }
 
+    /**
+     * 订单详情
+     * @param $data
+     * @return array
+     */
     public function salesOrderDetail($data){
         if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
 
@@ -396,6 +421,12 @@ class SalesOrderService extends Service
         return [true, $sales];
     }
 
+    /**
+     * 订单列表
+     * @param $data
+     * @param $user
+     * @return array
+     */
     public function salesOrderList($data,$user){
         $model = new SalesOrder(['userData' => $user]);
         $model = $model->where('del_time',0)
@@ -446,6 +477,13 @@ class SalesOrderService extends Service
         return [true, $list];
     }
 
+    /**
+     * 订单参数规则
+     * @param $data
+     * @param $user
+     * @param $is_add
+     * @return array
+     */
     public function salesOrderRule(&$data, $user, $is_add = true){
         if(empty($data['sales_order_type'])) return [false,'合同类型不能为空'];
         if(empty($data['model_type'])) return [false,'订单模板类型不能为空'];
@@ -527,6 +565,12 @@ class SalesOrderService extends Service
         return [true, $data];
     }
 
+    /**
+     * 数据拼接
+     * @param $data
+     * @param $ergs
+     * @return array
+     */
     public function fillData($data,$ergs){
         if(empty($data['data'])) return $data;
 
@@ -587,6 +631,11 @@ class SalesOrderService extends Service
         return [true, ['order_number' => $order_number]];
     }
 
+    /**
+     * 订单推送
+     * @param $data
+     * @return array
+     */
     public function salesOrderDispatchSale($data){
         list($status,$msg) = $this->salesOrderDispatchSaleRule($data);
         if(! $status) return [false,$msg];
@@ -637,6 +686,11 @@ class SalesOrderService extends Service
         return [true,''];
     }
 
+    /**
+     * 订单推送规则
+     * @param $data
+     * @return array
+     */
     public function salesOrderDispatchSaleRule($data){
         if(empty($data['id'])) return [false,'请选择合同派单'];
         $sale = SalesOrder::where('del_time',0)
@@ -651,6 +705,11 @@ class SalesOrderService extends Service
         return [true, $sale];
     }
 
+    /**
+     * 订单推送公司
+     * @param $data
+     * @return array
+     */
     public function salesOrderDispatchCompany($data){
         list($status,$msg) = $this->salesOrderDispatchCompanyRule($data);
         if(! $status) return [false,$msg];
@@ -698,6 +757,11 @@ class SalesOrderService extends Service
         return [true,''];
     }
 
+    /**
+     * 订单推送公司规则
+     * @param $data
+     * @return array
+     */
     public function salesOrderDispatchCompanyRule($data){
         if(empty($data['id'])) return [false,'请选择合同派单'];
         $sale = SalesOrder::where('del_time',0)