施工单

app/Http/Controllers/Api/SalesOrderController.php

@@ -82,4 +82,16 @@ class SalesOrderController extends BaseController
             return $this->json_return(201,$data);
         }
     }
+
+    public function salesOrderDispatch(Request $request)
+    {
+        $service = new SalesOrderService();
+        list($status,$data) = $service->salesOrderDispatch($request->all());
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
 }

app/Service/ConstructionService.php

@@ -36,6 +36,7 @@ class ConstructionService extends Service
             $model->address2 = $data['address2'] ?? '';
             $model->introduction = $data['introduction'] ?? '';
             $model->depart_id = $data['depart_id'] ?? 0;
+            $model->top_depart_id = $data['top_depart_id'] ?? 0;
             $model->save();
             $time = time();
 
@@ -81,7 +82,7 @@ class ConstructionService extends Service
                         'product_id' => $value['product_id'],
                         'price' => $value['price'],
                         'number' => $value['number'],
-                        'mark' => $value['mark'],
+                        'mark' => $value['mark'] ?? '',
                         'crt_time' => $time,
                     ];
                 }
@@ -122,6 +123,7 @@ class ConstructionService extends Service
             $model->introduction = $data['introduction'] ?? '';
             $model->crt_id = $user['id'];
             $model->depart_id = $data['depart_id'] ?? 0;
+            $model->top_depart_id = $data['top_depart_id'] ?? 0;
             $model->save();
             $time = time();
 
@@ -160,7 +162,7 @@ class ConstructionService extends Service
                         'product_id' => $value['product_id'],
                         'price' => $value['price'],
                         'number' => $value['number'],
-                        'mark' => $value['mark'],
+                        'mark' => $value['mark']?? '',
                         'crt_time' => $time,
                     ];
                 }
@@ -296,9 +298,9 @@ class ConstructionService extends Service
             $res = $this->checkNumber($value['number']);
             if(! $res) return [false,'请输入正确的产品数量'];
 
-            if(empty($value['price'])) return [false,'产品单价不能为空'];
+            if(empty($value['price'])) return [false,'产品价格不能为空'];
             $res = $this->checkNumber($value['price']);
-            if(! $res) return [false,'产品单价请输入不超过两位小数并且大于0的数值'];
+            if(! $res) return [false,'产品价格请输入不超过两位小数并且大于0的数值'];
         }
         if(empty($data['construction_contact'])) return [false,'联系方式不能为空'];
         if(! empty($data['construction_fee'])){

app/Service/EmployeeService.php

@@ -841,14 +841,14 @@ class EmployeeService extends Service
                     if($value['is_main']) {//是总社
                         $top_tmp = $map[$value['depart_id']];
                         if(! empty($depart_map[$top_tmp]['is_main'])){
-                            //顶级部门是总社
-                            //所有部门都有
+                            //顶级部门是总公司  所有部门都有
                             $rule = array_column($list,'id');
                         }else{
-                            $depart_id = array_merge(self::getAllIds($list,$map[$value['depart_id']]),[$map[$value['depart_id']]]);
+                            //顶级部门不是总公司 自己以及自己之下
+                            $depart_id = array_merge(self::getAllIds($list,$value['depart_id']),[$value['depart_id']]);
                             $rule = array_merge_recursive($rule,$depart_id);
                         }
-                    }else{
+                    }else{//不是总社
                         $rule = array_merge($rule,[$value['depart_id']]);
                     }
                 }

app/Service/SalesOrderService.php

@@ -52,6 +52,7 @@ class SalesOrderService extends Service
             $model->original_set = $data['original_set'] ?? '';
             $model->processing = $data['processing'] ?? '';
             $model->depart_id = $data['depart_id'] ?? 0;
+            $model->top_depart_id = $data['top_depart_id'] ?? 0;
             $model->save();
             $time = time();
 
@@ -164,6 +165,7 @@ class SalesOrderService extends Service
             $model->original_set = $data['original_set'] ?? '';
             $model->processing = $data['processing'] ?? '';
             $model->depart_id = $data['depart_id'] ?? 0;
+            $model->top_depart_id = $data['top_depart_id'] ?? 0;
             $model->crt_id = $user['id'];
             $model->save();
             $time = time();
@@ -491,4 +493,13 @@ class SalesOrderService extends Service
 
         return [true, ['order_number' => $order_number]];
     }
+
+    public function salesOrderDispatch($data){
+//        list($status,$msg)
+    }
+
+    public function salesOrderDispatchRule($data){
+
+        return [true,''];
+    }
 }

routes/api.php

@@ -135,6 +135,7 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('salesOrderDetail', 'Api\SalesOrderController@salesOrderDetail');
     $route->any('salesOrderAdd', 'Api\SalesOrderController@salesOrderAdd');
     $route->any('salesOrderDel', 'Api\SalesOrderController@salesOrderDel');
+    $route->any('salesOrderDispatch', 'Api\SalesOrderController@salesOrderDispatch');
 
     //施工单
     $route->any('constructionGet', 'Api\ConstructionController@constructionGet');