库存盘点--增加局部盘点并为盘点任务表添加备注字段

人事扫码--日志修改

app/Http/Controllers/LaborReportController.php

@@ -271,7 +271,7 @@ class LaborReportController extends Controller
         if(!Gate::allows('人事管理-临时工报表-编辑备注')){return ['success'=>'false','fail_info'=>'没有权限'];}
         $laborReportId = $request->input('id');
         $laborReportRemark = $request->input('remark');
-        if(is_null($laborReportId) or is_null($laborReportRemark)){
+        if(is_null($laborReportId) ){
             return ['success'=>false,'fail_info'=>'参数异常'];
         }
         $laborReport=LaborReport::find($laborReportId);

app/Http/Controllers/UserDutyCheckController.php

@@ -29,7 +29,6 @@ class UserDutyCheckController extends Controller
     public function importAndExportClock(Request $request)
     {
         $importAndExportQRCodeType = $request->input('importAndExportQRCodeType');
-        $this->log(__METHOD__, "进出场扫码__" . __FUNCTION__, json_encode($importAndExportQRCodeType));
         $qrCode_refresh_everyday = config('hr.qrCode_refresh_everyday');
         $qrCode_refresh = config('hr.qrCode_refresh');
         if ($qrCode_refresh_everyday) {
@@ -47,6 +46,7 @@ class UserDutyCheckController extends Controller
 
         $userLaborToken = $request->cookie('userLaborToken');
         $user_id = Cache::get('dutyCheckTokenStr_'.$userLaborToken);
+        if (!$user_id) $this->log(__METHOD__, "进出场扫码(未绑定设备)__" . __FUNCTION__, json_encode($importAndExportQRCodeType));
         if ($userLaborToken && $user_id) {
             $userDetail = UserDetail::find($user_id);
             if($userDetail){
@@ -60,6 +60,7 @@ class UserDutyCheckController extends Controller
                 $errorMessage = $laborReportService->makeOrChangeLaborReportByUserDutyCheck($userDutyCheck, $importAndExportQRCodeType);
                 if ($errorMessage) return $errorMessage;
                 $laravelEchoPrefix = config('database.redis.options.prefix');
+                $this->log(__METHOD__, "进出场扫码__" . __FUNCTION__, json_encode($importAndExportQRCodeType,$userDetail));
                 return response()->view('personnel/checking-in/importAndExportSuccess', ['full_name' => $userDetail->full_name, 'checked_at' => $userDutyCheck->checked_at, 'type' => $userDutyCheck->type, 'laravelEchoPrefix' => $laravelEchoPrefix]);
 
             }
@@ -281,9 +282,9 @@ class UserDutyCheckController extends Controller
     public function clock(Request $request)
     {
         $userWorkgroupID = $request->input('userWorkgroupID');
-        $this->log(__METHOD__, "进组扫码__" . __FUNCTION__, json_encode($userWorkgroupID));
         $userLaborToken = $request->cookie('userLaborToken');
         $user_id = Cache::get('dutyCheckTokenStr_'.$userLaborToken);
+        if (!$user_id)$this->log(__METHOD__, "进组扫码(未绑定设备)__" . __FUNCTION__, json_encode($userWorkgroupID));
         if ($userLaborToken && $user_id) {
             $dateNow = Carbon::now()->format('Y-m-d');
             $userDutyCheck = UserDutyCheck::where('user_id', $user_id)->where('checked_at', 'like', $dateNow. '%')->orderBy('id', 'desc')->first();
@@ -291,6 +292,7 @@ class UserDutyCheckController extends Controller
             if ($userDutyCheck->type == '登出') return "<h1 style='color: red;text-align:center'>进场是否未打卡？如若未打，请先返回打进场卡！</h1>";
             $html=$this->updateLaborReport($user_id,$userWorkgroupID);
             if ($html)return $html;
+            $this->log(__METHOD__, "进组扫码__" . __FUNCTION__, json_encode($userWorkgroupID,$user_id));
         }else{
             return view("personnel/checking-in/enterGroupClock", compact('userWorkgroupID'));
         }
@@ -336,6 +338,7 @@ class UserDutyCheckController extends Controller
         $userDutyCheck = UserDutyCheck::where('user_id', $userDetail->user_id)->where('checked_at', 'like', $dateNow. '%')->orderBy('id', 'desc')->first();
         if (!$userDutyCheck['verify_user_id']) return "<h1 style='color: red;text-align:center'>进场门卫还未审核，暂无法进组！</h1>";
         if ($userDutyCheck->type == '登出') return "<h1 style='color: red;text-align:center'>进场是否未打卡？如若未打，请先返回打进场卡！</h1>";
+        $this->log(__METHOD__, "进组扫码未绑定设备重新绑定__" . __FUNCTION__, json_encode($userWorkgroupID,$userDetail));
         $html=$this->updateLaborReport($userDetail->user_id,$userWorkgroupID,$userLaborToken);
         if ($html)return $html;
     }