修改

app/Http/Controllers/Api/ConstructionController.php

@@ -34,6 +34,19 @@ class ConstructionController extends BaseController
         }
     }
 
+    public function constructionEditOther(Request $request)
+    {
+        $service = new ConstructionService();
+        $userData = $request->userData->toArray();
+        list($status,$data) = $service->constructionEditOther($request->all(),$userData);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
     public function constructionDel(Request $request)
     {
         $service = new ConstructionService();

app/Service/ConstructionService.php

@@ -31,6 +31,7 @@ use App\Model\SeeRange;
 use App\Model\Storehouse;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
 //use Barryvdh\DomPDF\Facade as PDF;
 use Barryvdh\DomPDF\PDF;
@@ -41,6 +42,52 @@ use Barryvdh\DomPDF\PDF;
  */
 class ConstructionService extends Service
 {
+    //小程序端编辑车架号 备注
+    public function constructionEditOther($data,$user){
+        list($status,$msg) = $this->constructionEditOtherRule($data, $user);
+        if(!$status) return [$status, $msg];
+
+        $params = $this->getDataFile($data);
+        (new OperationLogService())->setOperationList($params,$user,2);
+
+        try {
+            DB::beginTransaction();
+
+            $update = [
+                'mark' => $data['mark'] ?? '',
+                'vin_no' => $data['vin_no'] ?? '',
+            ];
+
+            Construction::where('id', $data['id'])->update($update);
+
+            DB::commit();
+        }catch (\Exception $exception){
+            DB::rollBack();
+            return [false,$exception->getMessage()];
+        }
+
+        return [true, ''];
+    }
+
+    public function constructionEditOtherRule(&$data, $user){
+        if(empty($data['id'])) return [false,'ID不能为空'];
+        $construction = Construction::where('del_time',0)
+            ->where('id',$data['id'])
+            ->first();
+        if(empty($construction)) return [false, '施工单不存在或已被删除'];
+        $construction = $construction->toArray();
+        $data['order_number'] = $construction['order_number'];
+
+        if(! Arr::has($data,'mark') && ! Arr::has($data,'vin_no')) return [false, '更新字段不能为空'];
+
+        //订单编辑提交限制
+//        $current_top_depart_id = $this->getMyTopDepart($user);
+//        list($status, $msg) = $this->returnOrderEditErrorCommon($current_top_depart_id, $construction['top_depart_id']);
+//        if(! $status) return [false, $msg];
+
+        return [true, ''];
+    }
+
     /**
      * 施工订单编辑
      * @param $data

app/Service/OperationLogService.php

@@ -209,7 +209,7 @@ class OperationLogService extends Service
     public function setOperationList($data, $user, $type = 1, $menu_id = 18)
     {
 
-        file_put_contents('log.txt', date('Y-m-d H:i:s') . json_encode($data) . PHP_EOL, 8);
+//        file_put_contents('log.txt', date('Y-m-d H:i:s') . json_encode($data) . PHP_EOL, 8);
 
         //获取oa参数
         $key = 'menu_id'; // 要匹配的键
@@ -264,7 +264,7 @@ class OperationLogService extends Service
                 $currentRequest->files->all(),
                 []
             );
-            file_put_contents('log.txt', date('Y-m-d H:i:s') . "入参:".json_encode($request->all()) . PHP_EOL, 8);
+//            file_put_contents('log.txt', date('Y-m-d H:i:s') . "入参:".json_encode($request->all()) . PHP_EOL, 8);
             $detail = $this->oaGetData($menu_id, $request);
 
             $log = new OperationLog();

config/morequery.php

@@ -48,6 +48,7 @@ return [
         "api/ReturnExchangeOrderAdd" => 35,
         "api/ReturnExchangeOrderEdit" => 35,
         "api/constructionList" => 34,
+        "api/constructionEditOther" => 34,
         "api/getSettingGetDetail2" => 34,
         "api/purchaseOrderSubmit" => 44,
         "api/purchaseOrderList" => [
@@ -74,6 +75,7 @@ return [
         "wx/ReturnExchangeOrderAdd" => 35,
         "wx/ReturnExchangeOrderEdit" => 35,
         "wx/constructionList" => 34,
+        "wx/constructionEditOther" => 34,
         "wx/getSettingGetDetail2" => 34,
         "wx/purchaseOrderSubmit" => 44,
         "wx/purchaseOrderList" => [

routes/api.php

@@ -234,6 +234,7 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('constructionDel', 'Api\ConstructionController@constructionDel')->middleware('OssFileDeal');
     $route->any('constructionPdf', 'Api\ConstructionController@constructionPdf');
     $route->any('constructionOperation', 'Api\ConstructionController@constructionOperation');
+    $route->any('constructionEditOther', 'Api\ConstructionController@constructionEditOther');
 
     //交车单
     $route->any('deliveryNoteList', 'Api\ConstructionController@deliveryNoteList');

routes/wx.php

@@ -62,6 +62,7 @@ Route::group(['middleware'=> ['checkWx']],function ($route){
     $route->any('deliveryNoteDetail', 'Api\ConstructionController@deliveryNoteDetail');
     $route->any('deliveryNoteEdit', 'Api\ConstructionController@deliveryNoteEdit')->middleware('OssFileDeal');
     $route->any('deliveryNoteDel', 'Api\ConstructionController@deliveryNoteDel')->middleware('OssFileDeal');
+    $route->any('constructionEditOther', 'Api\ConstructionController@constructionEditOther');
 
     $route->any('employeeList', 'Api\EmployeeController@employeeList');
     $route->any('departList', 'Api\EmployeeController@departList');