添加工单记录

app/Http/Controllers/WeChatApplet/Technician/WashWorkController.php

@@ -659,7 +659,7 @@ class WashWorkController extends Controller
             return response()->json($return_data);
         }
         // 生成操作记录
-        $orlo_res = orderLog($user_info, $return_data['data']['wor_order_id'], $request['wor_id'], '技师验车');
+        $orlo_res = orderLog($user_info, $return_data['data']['wor_order_id'], $request['wor_id'], '技师验件');
         // 工单信息
         $find_wor_data = DB::table('work_order as wo')
             ->leftJoin('work_client as wc', 'wo.wor_id', '=', 'wc.wocl_wor_id')
@@ -1086,7 +1086,7 @@ class WashWorkController extends Controller
         }
 
         // 生成操作记录
-        $orlo_res = orderLog($user_info, 0, $request['wor_id'], '维修完成提交');
+        $orlo_res = orderLog($user_info, $find_wor_data->wor_order_id, $request['wor_id'], '维修完成提交');
         if ($orlo_res) {
             DB::commit();
             $log_data = [
@@ -1169,7 +1169,7 @@ class WashWorkController extends Controller
             return response()->json($return_data);
         }
         // 生成操作记录
-        $orlo_res = orderLog($user_info, 0, $request['wor_id'], '提交施工');
+        $orlo_res = orderLog($user_info, $find_wor_data->wor_order_id, $request['wor_id'], '提交施工');
         if ($orlo_res) {
             DB::commit();
             $log_data = [
@@ -2002,17 +2002,17 @@ class WashWorkController extends Controller
         // 取消订单
         DB::beginTransaction();
         $return_data = WashWorkService::cancelOrder($user_info, $request->all());
-        // 生成操作记录
-        $orlo_res = orderLog($user_info, 0, $request['wor_id'], '取消订单提交');
-        if ($return_data['code'] == 200) {
-            DB::commit();
         // 工单信息
         $find_wor_data = DB::table('work_order as wo')
             ->leftJoin('work_client as wc', 'wo.wor_id', '=', 'wc.wocl_wor_id')
             ->leftJoin('order as o', 'wo.wor_order_id', '=', 'o.ord_id')
             ->where('wor_id', $request['wor_id'])
-                ->select('wocl_client_id', 'wor_shop_id', 'wor_order_id', 'ord_order_number', 'wor_number', '')
+            ->select('wocl_client_id', 'wor_shop_id', 'wor_order_id', 'ord_order_number', 'wor_number')
             ->first();
+        // 生成操作记录
+        $orlo_res = orderLog($user_info, $find_wor_data->wor_order_id, $request['wor_id'], '取消订单提交');
+        if ($return_data['code'] == 200) {
+            DB::commit();
             $log_data = [
                 'oplo_module'=>'工单列表',
                 'oplo_action'=>'取消订单',
@@ -2052,14 +2052,14 @@ class WashWorkController extends Controller
 
         // 工单返工
         $return_data = WashWorkService::returnWork($user_info, $request->all());
-        $orlo_res = orderLog($user_info, 0, $request['wor_id'], '工单返工提交');
         // 工单信息
         $find_wor_data = DB::table('work_order as wo')
             ->leftJoin('work_client as wc', 'wo.wor_id', '=', 'wc.wocl_wor_id')
             ->leftJoin('order as o', 'wo.wor_order_id', '=', 'o.ord_id')
             ->where('wor_id', $request['wor_id'])
-            ->select('wocl_client_id', 'wor_shop_id', 'wor_order_id', 'ord_order_number', 'wor_number', '')
+            ->select('wocl_client_id', 'wor_shop_id', 'wor_order_id', 'ord_order_number', 'wor_number')
             ->first();
+        $orlo_res = orderLog($user_info, $find_wor_data->wor_order_id, $request['wor_id'], '工单返工提交');
         $log_data = [
             'oplo_module'=>'工单列表',
             'oplo_action'=>'工单返工',
@@ -2096,7 +2096,14 @@ class WashWorkController extends Controller
 
         // 工单返工
         $return_data = WashWorkService::returnItem($user_info, $request->all());
-        $orlo_res = orderLog($user_info, 0, $request['wor_id'], '工单还件提交');
+        // 工单信息
+        $find_wor_data = DB::table('work_order as wo')
+            ->leftJoin('work_client as wc', 'wo.wor_id', '=', 'wc.wocl_wor_id')
+            ->leftJoin('order as o', 'wo.wor_order_id', '=', 'o.ord_id')
+            ->where('wor_id', $request['wor_id'])
+            ->select('wocl_client_id', 'wor_shop_id', 'wor_order_id', 'ord_order_number', 'wor_number')
+            ->first();
+        $orlo_res = orderLog($user_info, $find_wor_data->wor_order_id, $request['wor_id'], '工单还件提交');
         $log_data = [
             'oplo_module'=>'工单列表',
             'oplo_action'=>'工单还件',
@@ -2148,11 +2155,18 @@ class WashWorkController extends Controller
             return response()->json(['code'=>200,'msg'=>'success','data'=>$data]);
         }
         $res = WashWorkService::auditWork($user_info,$request);
-        OperationLog::addLog($user_info, getRealIp($request), '技师工单列表', '还件', '还件成功');
+        // 工单信息
+        $find_wor_data = DB::table('work_order as wo')
+            ->leftJoin('work_client as wc', 'wo.wor_id', '=', 'wc.wocl_wor_id')
+            ->leftJoin('order as o', 'wo.wor_order_id', '=', 'o.ord_id')
+            ->where('wor_id', $request['wor_id'])
+            ->select('wocl_client_id', 'wor_shop_id', 'wor_order_id', 'ord_order_number', 'wor_number')
+            ->first();
+        $orlo_res = orderLog($user_info, $find_wor_data->wor_order_id, $request['wor_id'], '工单施工审核提交');
         $log_data = [
             'oplo_module'=>'工单列表',
-            'oplo_action'=>'工单还件',
-            'oplo_content'=>$find_wor_data->wor_number . '工单还件成功',
+            'oplo_action'=>'工单施工审核',
+            'oplo_content'=>$find_wor_data->wor_number . '工单施工审核提交成功',
             'oplo_ip'=>getRealIp($request),
             'order_number'=>$find_wor_data->ord_order_number,
             'work_number'=>$find_wor_data->wor_number,

app/Services/SettleIn/SettleInService.php

@@ -2343,14 +2343,14 @@ class SettleInService extends Service
         if($adm_res && $admin_shop_role_id) {
             if (config('apisystem.SYNC_STATE') && $adm_id) {
                 if($input['type']==3){
-                    $url = config('apisystem.sd_server_name') . '/index.php/api/supplychain/SupplyMz/creatInstallPerson';
-                    $param['install_name'] = $input['adm_name'];
-                    $param['install_phone'] = $input['adm_phone'];
-                    $param['admin_id'] = SettleIn::where('phone',$input['adm_phone'])->value('sd_admin_id');
-                    $param['install_password1'] = $input['adm_password'];
-                    $param['install_password'] = $password;
-                    $doPost_res = Common::doPost($param, $url, 2);
-                    $doPost_res = json_decode($doPost_res,true);
+                    // $url = config('apisystem.sd_server_name') . '/index.php/api/supplychain/SupplyMz/creatInstallPerson';
+                    // $param['install_name'] = $input['adm_name'];
+                    // $param['install_phone'] = $input['adm_phone'];
+                    // $param['admin_id'] = SettleIn::where('phone',$input['adm_phone'])->value('sd_admin_id');
+                    // $param['install_password1'] = $input['adm_password'];
+                    // $param['install_password'] = $password;
+                    // $doPost_res = Common::doPost($param, $url, 2);
+                    // $doPost_res = json_decode($doPost_res,true);
                     if ($doPost_res['code'] != 200) {
                         DB::rollback();
                         return response()->json(['code'=>500, 'msg'=>'同步失败', 'data'=>$doPost_res]);