1

.idea/workspace.xml

@@ -2,11 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b5852db3-28ab-419d-82cf-b6c0f6b99397" name="变更" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Api/MaterialController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/MaterialController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Kernel.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Kernel.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Service/EmployeeService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/EmployeeService.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Model/Depart.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Model/Depart.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Model/Employee.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Model/Employee.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/Service/MaterialService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/MaterialService.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/api.php" afterDir="false" />
     </list>
@@ -151,7 +149,7 @@
       <workItem from="1685595177391" duration="2533000" />
       <workItem from="1685669123669" duration="2439000" />
       <workItem from="1685952381761" duration="726000" />
-      <workItem from="1686021203384" duration="3798000" />
+      <workItem from="1686021203384" duration="5682000" />
     </task>
     <servers />
   </component>

app/Model/Depart.php

@@ -15,5 +15,5 @@ class Depart extends Model
     const CREATED_AT = 'crt_time';
     const UPDATED_AT = 'upd_time';
     protected $dateFormat = 'U';
-
+    const RULE_DEPART = "ALL";
 }

app/Model/Employee.php

@@ -15,5 +15,22 @@ class Employee extends Model
     const CREATED_AT = 'crt_time';
     const UPDATED_AT = 'upd_time';
     protected $dateFormat = 'U';
+    const USE = 1;
+    const NOT_USE = 2;
+    const IS_ADMIN = 1;
+    const IS_NOT_ADMIN = 0;
+    const SPECIAL_ADMIN = 1;
+    const IS_TECHNICAL = [
+        0 => '否',
+        1 => '是'
+    ];
 
+    //人员状态
+    const STATUS_ONE = 1;
+    const STATUS_TWO = 2;
+
+    const STATUS = [
+        1 => '正常',
+        2 => '停用'
+    ];
 }

app/Service/MaterialService.php

@@ -2,7 +2,6 @@
 
 namespace App\Service;
 
-
 use App\Model\BasicMaterial;
 use App\Model\Material;
 use App\Model\MaterialDetail;
@@ -14,11 +13,9 @@ class MaterialService extends Service
         list($status,$msg) = $this->basicMaterialRule($data, false);
         if(!$status) return [$status,$msg];
 
-        $model = new BasicMaterial();
-        $model = $model->where('id',$data['id'])->first();
-        $model->title = $data['title'];
+        $update = $msg['data'][0];
+        BasicMaterial::where('id',$data['id'])->update($update);
 
-        $model->save();
         return [true,'保存成功！'];
     }
 
@@ -26,9 +23,7 @@ class MaterialService extends Service
         list($status,$msg) = $this->basicMaterialRule($data);
         if(!$status) return [$status,$msg];
 
-        $model = new BasicMaterial();
-        $model->title = $data['title'];
-        $model->save();
+        BasicMaterial::insert($msg['data']);
 
         return [true,'保存成功！'];
     }
@@ -54,18 +49,35 @@ class MaterialService extends Service
     }
 
     public function basicMaterialRule($data, $is_add = true){
-        if($this->isEmpty($data,'title')) return [false,'名称不存在！'];
+        if($this->isEmpty($data,'data')) return [false,'数据不能为空！'];
+        $title = array_column($data['data'],'title');
+        $title = array_map(function($val) {
+            return $val !== null ? $val : 0;
+        }, $title);
+        $title_count = array_count_values($title);
+        foreach ($title as $value){
+            if(empty($value)) return [false,'名称不能为空！'];
+            if($title_count[$value] > 1) return [false,'名称不能重复'];
+        }
 
-        $model = BasicMaterial::where('title',$data['title'])
-            ->where('del_time',0);
-        if(! $is_add){
-            if($this->isEmpty($data,'id')) return [false,'ID不存在！'];
-            $model->where('id','<>',$data['id']);
+        foreach ($data['data'] as $key => $value){
+            $data['data'][$key]['upd_time'] = time();
+            if($is_add){
+                $bool = BasicMaterial::where('title',$value['title'])
+                    ->where('del_time',0)
+                    ->exists();
+                $data['data'][$key]['crt_time'] = time();
+            }else{
+                if($this->isEmpty($data,'id')) return [false,'id不能为空！'];
+                $bool = BasicMaterial::where('title',$value['title'])
+                    ->where('id','<>',$data['id'])
+                    ->where('del_time',0)
+                    ->exists();
+            }
+            if($bool) return [false,'名称不能重复'];
         }
-        $bool = $model->exists();
-        if($bool) return [false,'名称已存在！'];
 
-        return [true,''];
+        return [true,$data];
     }
 
     public function MaterialEdit($data){

routes/api.php

@@ -19,79 +19,79 @@ Route::middleware('auth:api')->get('/user', function (Request $request) {
 
 Route::any('login', 'Api\LoginController@login');
 Route::group(['middleware'=> ['checkLogin']],function ($route){
-    Route::any('menuAdd', 'Api\SysMenuController@add');
-    Route::any('menuEdit', 'Api\SysMenuController@edit');
-    Route::any('menuDel', 'Api\SysMenuController@del');
-    Route::any('menuList', 'Api\SysMenuController@menuList');
-
-    Route::any('employeeAdd', 'Api\EmployeeController@employeeAdd');
-    Route::any('employeeEdit', 'Api\EmployeeController@employeeEdit');
-    Route::any('employeeDel', 'Api\EmployeeController@employeeDel');
-    Route::any('employeeList', 'Api\EmployeeController@employeeList');
-
-
-    Route::any('departAdd', 'Api\EmployeeController@departAdd');
-    Route::any('departEdit', 'Api\EmployeeController@departEdit');
-    Route::any('departDel', 'Api\EmployeeController@departDel');
-    Route::any('departList', 'Api\EmployeeController@departList');
-
-
-    Route::any('roleAdd', 'Api\EmployeeController@roleAdd');
-    Route::any('roleEdit', 'Api\EmployeeController@roleEdit');
-    Route::any('roleDel', 'Api\EmployeeController@roleDel');
-    Route::any('roleList', 'Api\EmployeeController@roleList');
-
-
-
-    Route::any('teamAdd', 'Api\EmployeeController@teamAdd');
-    Route::any('teamEdit', 'Api\EmployeeController@teamEdit');
-    Route::any('teamDel', 'Api\EmployeeController@teamDel');
-    Route::any('teamList', 'Api\EmployeeController@teamList');
-
-    Route::any('employeeDepart', 'Api\EmployeeController@employeeDepart');
-    Route::any('employeeTeam', 'Api\EmployeeController@employeeTeam');
-    Route::any('employeeRole', 'Api\EmployeeController@employeeRole');
-
-    Route::any('measureAdd', 'Api\MeasureController@Add');
-    Route::any('measureEdit', 'Api\MeasureController@Edit');
-    Route::any('measureDel', 'Api\MeasureController@Del');
-    Route::any('measureList', 'Api\MeasureController@measureList');
-
-    Route::any('basicMaterialList', 'Api\MaterialController@basicMaterialList');
-    Route::any('basicMaterialEdit', 'Api\MaterialController@basicMaterialEdit');
-    Route::any('basicMaterialAdd', 'Api\MaterialController@basicMaterialAdd');
-    Route::any('basicMaterialDel', 'Api\MaterialController@basicMaterialDel');
-
-    Route::any('materialList', 'Api\MaterialController@materialList');
-    Route::any('materialDetail', 'Api\MaterialController@materialDetail');
-    Route::any('materialEdit', 'Api\MaterialController@materialEdit');
-    Route::any('materialAdd', 'Api\MaterialController@materialAdd');
-    Route::any('materialDel', 'Api\MaterialController@materialDel');
-
-
-    Route::any('productList', 'Api\MaterialController@productList');
-    Route::any('productEdit', 'Api\MaterialController@edit');
-    Route::any('productAdd', 'Api\MaterialController@edd');
-    Route::any('productDel', 'Api\MaterialController@del');
-
-    Route::any('bomList', 'Api\BomController@bomList');
-    Route::any('bomDetail', 'Api\BomController@bomDetail');
-    Route::any('bomEdit', 'Api\BomController@edit');
-    Route::any('bomAdd', 'Api\BomController@add');
-    Route::any('bomDel', 'Api\BomController@del');
-
-    Route::any('orderList', 'Api\OrderController@orderList');
-    Route::any('orderAdd', 'Api\OrderController@add');
-    Route::any('orderEdit', 'Api\OrderController@add');
-    Route::any('orderDel', 'Api\OrderController@del');
-    Route::any('orderDetail', 'Api\OrderController@orderDetail');
-
-    Route::any('tagDetail', 'Api\OrderTagController@tagDetail');
-    Route::any('boxDetail', 'Api\OrderBoxController@boxDetail');
-    Route::any('transportDetail', 'Api\OrderTransportController@transportDetail');
-    Route::any('boxIn', 'Api\OrderBoxController@boxIn');
-    Route::any('boxOut', 'Api\OrderBoxController@boxOut');
-    Route::any('boxTransport', 'Api\OrderTransportController@boxTransport');
-    Route::any('transportConfirm', 'Api\OrderTransportController@transportConfirm');
-    Route::any('deviceList', 'Api\Device\DeviceController@deviceList');
+    $route->any('menuAdd', 'Api\SysMenuController@add');
+    $route->any('menuEdit', 'Api\SysMenuController@edit');
+    $route->any('menuDel', 'Api\SysMenuController@del');
+    $route->any('menuList', 'Api\SysMenuController@menuList');
+
+    $route->any('employeeAdd', 'Api\EmployeeController@employeeAdd');
+    $route->any('employeeEdit', 'Api\EmployeeController@employeeEdit');
+    $route->any('employeeDel', 'Api\EmployeeController@employeeDel');
+    $route->any('employeeList', 'Api\EmployeeController@employeeList');
+
+
+    $route->any('departAdd', 'Api\EmployeeController@departAdd');
+    $route->any('departEdit', 'Api\EmployeeController@departEdit');
+    $route->any('departDel', 'Api\EmployeeController@departDel');
+    $route->any('departList', 'Api\EmployeeController@departList');
+
+
+    $route->any('roleAdd', 'Api\EmployeeController@roleAdd');
+    $route->any('roleEdit', 'Api\EmployeeController@roleEdit');
+    $route->any('roleDel', 'Api\EmployeeController@roleDel');
+    $route->any('roleList', 'Api\EmployeeController@roleList');
+
+
+
+    $route->any('teamAdd', 'Api\EmployeeController@teamAdd');
+    $route->any('teamEdit', 'Api\EmployeeController@teamEdit');
+    $route->any('teamDel', 'Api\EmployeeController@teamDel');
+    $route->any('teamList', 'Api\EmployeeController@teamList');
+
+    $route->any('employeeDepart', 'Api\EmployeeController@employeeDepart');
+    $route->any('employeeTeam', 'Api\EmployeeController@employeeTeam');
+    $route->any('employeeRole', 'Api\EmployeeController@employeeRole');
+
+    $route->any('measureAdd', 'Api\MeasureController@Add');
+    $route->any('measureEdit', 'Api\MeasureController@Edit');
+    $route->any('measureDel', 'Api\MeasureController@Del');
+    $route->any('measureList', 'Api\MeasureController@measureList');
+
+    $route->any('basicMaterialList', 'Api\MaterialController@basicMaterialList');
+    $route->any('basicMaterialEdit', 'Api\MaterialController@basicMaterialEdit');
+    $route->any('basicMaterialAdd', 'Api\MaterialController@basicMaterialAdd');
+    $route->any('basicMaterialDel', 'Api\MaterialController@basicMaterialDel');
+
+    $route->any('materialList', 'Api\MaterialController@materialList');
+    $route->any('materialDetail', 'Api\MaterialController@materialDetail');
+    $route->any('materialEdit', 'Api\MaterialController@materialEdit');
+    $route->any('materialAdd', 'Api\MaterialController@materialAdd');
+    $route->any('materialDel', 'Api\MaterialController@materialDel');
+
+
+    $route->any('productList', 'Api\MaterialController@productList');
+    $route->any('productEdit', 'Api\MaterialController@edit');
+    $route->any('productAdd', 'Api\MaterialController@edd');
+    $route->any('productDel', 'Api\MaterialController@del');
+
+    $route->any('bomList', 'Api\BomController@bomList');
+    $route->any('bomDetail', 'Api\BomController@bomDetail');
+    $route->any('bomEdit', 'Api\BomController@edit');
+    $route->any('bomAdd', 'Api\BomController@add');
+    $route->any('bomDel', 'Api\BomController@del');
+
+    $route->any('orderList', 'Api\OrderController@orderList');
+    $route->any('orderAdd', 'Api\OrderController@add');
+    $route->any('orderEdit', 'Api\OrderController@add');
+    $route->any('orderDel', 'Api\OrderController@del');
+    $route->any('orderDetail', 'Api\OrderController@orderDetail');
+
+    $route->any('tagDetail', 'Api\OrderTagController@tagDetail');
+    $route->any('boxDetail', 'Api\OrderBoxController@boxDetail');
+    $route->any('transportDetail', 'Api\OrderTransportController@transportDetail');
+    $route->any('boxIn', 'Api\OrderBoxController@boxIn');
+    $route->any('boxOut', 'Api\OrderBoxController@boxOut');
+    $route->any('boxTransport', 'Api\OrderTransportController@boxTransport');
+    $route->any('transportConfirm', 'Api\OrderTransportController@transportConfirm');
+    $route->any('deviceList', 'Api\Device\DeviceController@deviceList');
 });