1

.idea/workspace.xml

@@ -3,11 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="b5852db3-28ab-419d-82cf-b6c0f6b99397" name="变更" comment="">
       <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/ProcessController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/ProcessController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Model/BasicProcess.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Model/BasicProcess.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Model/Process.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Model/Process.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/Service/MeasureService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/MeasureService.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/Service/ProcessService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/ProcessService.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/api.php" afterDir="false" />
     </list>
@@ -128,7 +123,7 @@
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/app/Service" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/app/Model" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="nodejs_package_manager_path" value="npm" />
@@ -136,8 +131,9 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\phpstudy_pro\WWW\jf_admin2.0\app\Service" />
       <recent name="D:\phpstudy_pro\WWW\jf_admin2.0\app\Model" />
+      <recent name="D:\phpstudy_pro\WWW\jf_admin2.0\app\Service" />
+      <recent name="D:\phpstudy_pro\WWW\jf_admin2.0\app\Http\Controllers\Api" />
     </key>
   </component>
   <component name="RunManager">
@@ -159,11 +155,35 @@
       <workItem from="1685669123669" duration="2439000" />
       <workItem from="1685952381761" duration="726000" />
       <workItem from="1686021203384" duration="14595000" />
-      <workItem from="1686099374239" duration="11390000" />
+      <workItem from="1686099374239" duration="13709000" />
     </task>
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="php-line-method">
+          <url>file://$PROJECT_DIR$/app/Service/TechnologyService.php</url>
+          <line>14</line>
+          <properties>
+            <option name="className" value="\App\Service\TechnologyService" />
+            <option name="methodName" value="basicProcessList" />
+          </properties>
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="php-line-method">
+          <url>file://$PROJECT_DIR$/app/Service/ProcessService.php</url>
+          <line>108</line>
+          <properties>
+            <option name="className" value="\App\Service\ProcessService" />
+            <option name="methodName" value="processAdd" />
+          </properties>
+          <option name="timeStamp" value="3" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
 </project>

app/Http/Controllers/Api/TechnologyController.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Service\TechnologyService;
+use Illuminate\Http\Request;
+
+class TechnologyController extends BaseController
+{
+    public function technologyList(Request $request)
+    {
+        $service = new TechnologyService();
+        $user = $request->get('auth');
+        list($status,$data) = $service->technologyList($request->all(),$request->all());
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function technologyEdit(Request $request)
+    {
+        $service = new TechnologyService();
+        $user = $request->get('auth');
+        list($status,$data) = $service->technologyEdit($request->all(),$request->all());
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function technologyAdd(Request $request)
+    {
+        $service = new TechnologyService();
+        $user = $request->get('auth');
+        list($status,$data) = $service->technologyAdd($request->all(),$request->all());
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function technologyDel(Request $request)
+    {
+        $service = new TechnologyService();
+        $user = $request->get('auth');
+        list($status,$data) = $service->technologyDel($request->all(),$request->all());
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+}

app/Model/Technology.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * 工艺
+ * Class Unit
+ * @package App\Models
+ */
+class Technology extends Model
+{
+    protected $table = "technology"; //指定表
+    const CREATED_AT = 'crt_time';
+    const UPDATED_AT = 'upd_time';
+    protected $dateFormat = 'U';
+}
+

app/Service/ProcessService.php

@@ -95,7 +95,12 @@ class ProcessService extends Service
         $model = new Process();
         $model = $model->where('id',$data['id'])->first();
         $model->title = $data['title'];
-        $model->p_id = $data['p_id'] ;
+        $model->p_id = $data['p_id'];
+        $model->time = $data['time'];
+        $model->capacity = $data['capacity'];
+        $model->wages_unit = $data['wages_unit'];
+        $model->wages = $data['wages'];
+        $model->team_id = $data['team_id'];
         $model->save();
 
         return [true,'保存成功！'];
@@ -110,7 +115,12 @@ class ProcessService extends Service
         $model = new Process();
 
         $model->title = $data['title'];
-        $model->p_id = $data['p_id'] ;
+        $model->p_id = $data['p_id'];
+        $model->time = $data['time'];
+        $model->capacity = $data['capacity'];
+        $model->wages_unit = $data['wages_unit'];
+        $model->wages = $data['wages'];
+        $model->team_id = $data['team_id'];
         $model->save();
 
         return [true,'保存成功！'];
@@ -120,14 +130,14 @@ class ProcessService extends Service
         if($this->isEmpty($data,'id')) return [false,'ID必须！'];
 
         Process::where('id',$data['id'])->update([
-            'del_time',time()
+            'del_time' => time()
         ]);
 
         return [true,'删除成功'];
     }
 
     public function processList($data){
-        $list = Process::where('del_time',0)->select('title','p_id','crt_time','upd_time','id');
+        $list = Process::where('del_time',0)->select('*');
         $list = $this->limit($list,'',$data);
 
         return [200,$list];

app/Service/TechnologyService.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Service;
+
+use App\Model\BasicProcess;
+use App\Model\Process;
+use App\Model\Technology;
+
+/**
+ * 工艺相关
+ * @package App\Models
+ */
+class TechnologyService extends Service
+{
+    public function technologyEdit($data){
+        list($status,$msg) = $this->technologyRule($data);
+        if(!$status) return [$status,$msg];
+        if($this->isEmpty($data,'id')) return [false,'ID不存在'];
+        $first = Technology::where('title',$data['title'])->where('id','<>',$data['id'])->where('del_time',0)->first();
+        if(!empty($first))return [false,'名称已存在！'];
+
+        $model = new Technology();
+        $model = $model->where('id',$data['id'])->first();
+        $model->title = $data['title'];
+        $model->process_id = $data['process_id'];
+        $model->save();
+
+        return [true,'保存成功！'];
+    }
+
+    public function technologyAdd($data,$user){
+        list($status,$msg) = $this->technologyRule($data);
+        if(!$status) return [$status,$msg];
+        $first = Technology::where('title',$data['title'])->where('del_time',0)->first();
+        if(!empty($first))return [false,'名称已存在！'];
+
+        $model = new Technology();
+
+        $model->title = $data['title'];
+        $model->process_id = $data['process_id'];
+        $model->save();
+
+        return [true,'保存成功！'];
+    }
+
+    public function technologyDel($data){
+        if($this->isEmpty($data,'id')) return [false,'ID必须！'];
+
+        Technology::where('id',$data['id'])->update([
+            'del_time' => time()
+        ]);
+
+        return [true,'删除成功'];
+    }
+
+    public function technologyList($data){
+        $list = Technology::where('del_time',0)->select('*');
+        $list = $this->limit($list,'',$data);
+
+        return [200,$list];
+    }
+
+    public function technologyRule($data){
+        if($this->isEmpty($data,'title')) return [false,'名称不能为空！'];
+        if($this->isEmpty($data,'process_id')) return [false,'工序不能为空！'];
+
+        return [true,''];
+    }
+}

routes/api.php

@@ -77,6 +77,12 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('processAdd', 'Api\ProcessController@processAdd');
     $route->any('processDel', 'Api\ProcessController@processDel');
 
+    //工艺
+    $route->any('technologyList', 'Api\TechnologyController@technologyList');
+    $route->any('technologyEdit', 'Api\TechnologyController@technologyEdit');
+    $route->any('technologyAdd', 'Api\TechnologyController@technologyAdd');
+    $route->any('technologyDel', 'Api\TechnologyController@technologyDel');
+
     $route->any('productList', 'Api\MaterialController@productList');
     $route->any('productEdit', 'Api\MaterialController@edit');
     $route->any('productAdd', 'Api\MaterialController@edd');