为人事相关增加工作组名字段

app/Http/Controllers/Auth/RegisterController.php

@@ -92,9 +92,9 @@ class RegisterController extends Controller
             $carrierIds=explode(',',$carrierIds);
             $user->carriers()->sync($carrierIds);
         }
-        $userWorkGroupId=$request->input('userWorkGroupID');
-        if ($userWorkGroupId){
-            $user->userWorkGroups()->sync([$userWorkGroupId]);
+        $userWorkgroupId=$request->input('userWorkgroupID');
+        if ($userWorkgroupId){
+            $user->userWorkgroups()->sync([$userWorkgroupId]);
         }
         $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),$user['id']);
         if($headTo){return redirect(url($headTo))->with('successTip',"录入用户 {$user->name} 成功");}

app/Http/Controllers/PackageController.php

@@ -108,6 +108,7 @@ class PackageController extends Controller
         $weight=$request->input('weight');
         $batch_number=$request->input('batch_number');
         $paper_box_id=$request->input('paper_box_id');
+        $isSamePackBatch=$request->input('is_same_pack_batch');
         if($logistic_number&&$batch_number)return redirect('package/create')->with('successError','录入失败！波次号和快递单号只能填一项！');
         $package=null;
         if($batch_number){
@@ -119,7 +120,7 @@ class PackageController extends Controller
         $successTip = '操作成功';
         if ($package){
             $accomplishToWMS=new \App\Http\Controllers\Api\thirdPart\flux\PackageController();
-            if ($package->batch_rule&&strstr($package->batch_rule,'组合')){
+            if ($isSamePackBatch||($package->batch_rule&&strstr($package->batch_rule,'组合'))){
                 $this->log(__METHOD__,'活动波次开始同步_'.__FUNCTION__,json_encode($package),Auth::user()['name']);
                 $this->syncBatch($package->batch_number,$weight,null,null,null,Carbon::now(),$paper_box_id);
             }else{

app/Http/Controllers/PersonnelController.php

@@ -74,7 +74,7 @@ class PersonnelController extends Controller
         $id=$request->input('id');
         $userDutyCheck=UserDutyCheck::find($id);
         $user=User::find($userDutyCheck->user_id);
-        $workGroup=$user->userWorkGroups()->first();
+        $workGroup=$user->userWorkgroups()->first();
         if ($workGroup){
             if(!Gate::allows($workGroup->name)){ return ["success"=>false,"data"=>"您无此权限操作！！!"];  }
         }
@@ -130,14 +130,14 @@ class PersonnelController extends Controller
         if(!Gate::allows('人事管理')){ return redirect(url('/'));  }
         $user=Auth::user();
         if (!$user)return redirect('/');
-        $result=$user->getPermittingWorkGroupIdsAttribute();
-        $userWorkGroupIds=$result['workGroupIds'];
-        $users=User::whereHas("userWorkGroups",function (Builder $query)use(&$userWorkGroupIds){
-            $query->whereIn("id",$userWorkGroupIds);
+        $result=$user->getPermittingWorkgroupIdsAttribute();
+        $userWorkgroupIds=$result['workGroupIds'];
+        $users=User::whereHas("userWorkgroups",function (Builder $query)use(&$userWorkgroupIds){
+            $query->whereIn("id",$userWorkgroupIds);
         })->get();
         $user_ids=array_column($users->toArray(),'id');
         $date=date('Y-m-d');
-        $userDutyChecks=UserDutyCheck::with('userDetail')->whereIn("user_id",$user_ids)
+        $userDutyChecks=UserDutyCheck::with('userDetail.user.userWorkgroups')->whereIn("user_id",$user_ids)
             ->where('checked_at','like',$date."%")->get();
         return view('personnel/checking-in/clockAudit',['userDutyChecks'=>$userDutyChecks,'workGroupSign'=>$result['workGroupSign']]);
     }

app/Http/Controllers/UserController.php

@@ -6,7 +6,7 @@ use App\Carrier;
 use App\Exports\UserExport;
 use App\Role;
 use App\User;
-use App\UserWorkGroup;
+use App\UserWorkgroup;
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -25,7 +25,7 @@ class UserController extends Controller
     public function index()
     {
         if(!Gate::allows('用户-查询')){ return redirect(url('/'));  }
-        $users=User::with(['roles','carriers','userWorkGroups'])->orderBy('id','desc')->paginate(35);
+        $users=User::with(['roles','carriers','userWorkgroups'])->orderBy('id','desc')->paginate(35);
         $users->each(function (User $user){
             $user['isSuperAdmin']=$user->isSuperAdmin();
         });
@@ -42,8 +42,8 @@ class UserController extends Controller
         if(!Gate::allows('用户-录入')){ return redirect(url('/'));  }
         $roles=Role::all();
         $carriers=Carrier::select('id','name')->get();
-        $userWorkGroups=UserWorkGroup::get();
-        return view('maintenance.user.create',['rolesAll'=>$roles,'carriers'=>$carriers,'userWorkGroups'=>$userWorkGroups]);
+        $userWorkgroups=UserWorkgroup::get();
+        return view('maintenance.user.create',['rolesAll'=>$roles,'carriers'=>$carriers,'userWorkgroups'=>$userWorkgroups]);
     }
 
 
@@ -84,9 +84,9 @@ class UserController extends Controller
         $roles=$user->roles()->get();
         $carriers=Carrier::select('id','name')->get();
         $carrierUser=$user->carriers()->get();
-        $userWorkGroups=UserWorkGroup::get();
-        $userWorkGroup=$user->userWorkGroups()->first();
-        return view('maintenance.user.edit',compact('user','rolesAll','roles','carriers','carrierUser','userWorkGroups','userWorkGroup'));
+        $userWorkgroups=UserWorkgroup::get();
+        $userWorkgroup=$user->userWorkgroups()->first();
+        return view('maintenance.user.edit',compact('user','rolesAll','roles','carriers','carrierUser','userWorkgroups','userWorkgroup'));
     }
 
     /**
@@ -116,11 +116,11 @@ class UserController extends Controller
         }else{
             $user->carriers()->sync([]);
         }
-        $userWorkGroupId=$request->input('userWorkGroupID');
-        if($userWorkGroupId){
-            $user->userWorkGroups()->sync([$userWorkGroupId]);
+        $userWorkgroupId=$request->input('userWorkgroupID');
+        if($userWorkgroupId){
+            $user->userWorkgroups()->sync([$userWorkgroupId]);
         }else{
-            $user->userWorkGroups()->sync([]);
+            $user->userWorkgroups()->sync([]);
         }
         $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/user/')->with('successTip',"成功修改用户“{$user['name']}”！");

app/Http/Controllers/UserDutyCheckController.php

@@ -7,7 +7,7 @@ use App\UserDetail;
 use App\UserDutyCheck;
 use App\UserLabor;
 use App\UserToken;
-use App\UserWorkGroup;
+use App\UserWorkgroup;
 use Carbon\Carbon;
 use Endroid\QrCode\QrCode;
 use http\Url;
@@ -20,42 +20,42 @@ use Ramsey\Uuid\Uuid;
 class UserDutyCheckController extends Controller
 {
     public function goGetQRCode(){
-        $userWorkGroups=UserWorkGroup::get();
-        return view("personnel/checking-in/getQRcode",compact('userWorkGroups'));
+        $userWorkgroups=UserWorkgroup::get();
+        return view("personnel/checking-in/getQRcode",compact('userWorkgroups'));
     }
 
     //获取二维码
     public function getQRCode(Request $request){
-        $userWorkGroup_id=$request->input('userWorkGroup_id');
+        $userWorkgroup_id=$request->input('userWorkgroup_id');
         $qrCode_refresh_everyday=config('hr.qrCode_refresh_everyday');
         if ($qrCode_refresh_everyday){
             $date=md5(date('Y-m-d'));
             $url=url("personnel/checking-in/userDutyCheck/clock?key=").$date;
-            if ($userWorkGroup_id)$url=$url."&&userWorkGroupID=".$userWorkGroup_id;
+            if ($userWorkgroup_id)$url=$url."&&userWorkgroupID=".$userWorkgroup_id;
         }else{
             $url=url("personnel/checking-in/userDutyCheck/clock");
-            if ($userWorkGroup_id)$url=$url."?userWorkGroupID=".$userWorkGroup_id;
+            if ($userWorkgroup_id)$url=$url."?userWorkgroupID=".$userWorkgroup_id;
         }
         $qrCode=new QrCode($url);
-        if ($userWorkGroup_id){
-            $fileURL=base_path('public/images/QRCodeIMG/'.$userWorkGroup_id.'.png');
+        if ($userWorkgroup_id){
+            $fileURL=base_path('public/images/QRCodeIMG/'.$userWorkgroup_id.'.png');
             if (file_exists($fileURL)){
-                return url('images/QRCodeIMG/'.$userWorkGroup_id.'.png');
+                return url('images/QRCodeIMG/'.$userWorkgroup_id.'.png');
             }
             $qrCode->writeFile($fileURL);
-            return url('images/QRCodeIMG/'.$userWorkGroup_id.'.png');
+            return url('images/QRCodeIMG/'.$userWorkgroup_id.'.png');
         }
         return (new Response())->header('Content-Type',$qrCode->getContentType())->setContent($qrCode->writeString());
     }
     //进入二维码显示页面
     public function QRCode(Request $request){
-        $userWorkGroup_id=$request->input('userWorkGroup_id');
-        $userWorkGroup=UserWorkGroup::find($userWorkGroup_id);
-        return view('personnel/checking-in/QRcode',compact('userWorkGroup'));
+        $userWorkgroup_id=$request->input('userWorkgroup_id');
+        $userWorkgroup=UserWorkgroup::find($userWorkgroup_id);
+        return view('personnel/checking-in/QRcode',compact('userWorkgroup'));
     }
     //校验二维码进入打卡页面
     public function clock(Request $request){
-        $userWorkGroupID=$request->input('userWorkGroupID');
+        $userWorkgroupID=$request->input('userWorkgroupID');
         $qrCode_refresh_everyday=config('hr.qrCode_refresh_everyday');
         if ($qrCode_refresh_everyday){
             $key=$request->input('key');
@@ -67,28 +67,31 @@ class UserDutyCheckController extends Controller
         if ($userLaborToken && Cache::has('tokenStr_'.$userLaborToken)) {
             $user_id=Cache::get('tokenStr_'.$userLaborToken);
             $userDetail=UserDetail::find($user_id);
-            if (!$userDetail)   return redirect('personnel/checking-in/userDutyCheck/createUserDetail/'.$userDetail->mobile_phone)->with("userWorkGroupID",$userWorkGroupID);
-            if ($userWorkGroupID){
+            if (!$userDetail)   return redirect('personnel/checking-in/userDutyCheck/createUserDetail/'.$userDetail->mobile_phone)->with("userWorkgroupID",$userWorkgroupID);
+            if ($userWorkgroupID){
                 $user=UserToken::getUser($userLaborToken);
-                $user->userWorkGroups()->sync([$userWorkGroupID]);
+                $user->userWorkgroups()->sync([$userWorkgroupID]);
             }
             $userDutyCheck=$this->dutyCheck($userDetail->user_id);
             if (!$userDutyCheck)return "<h1 style='color: red'>打卡异常，请联系相关人员!</h1>";
-            return response()->view('personnel/checking-in/success',['full_name'=>$userDetail->full_name,'checked_at'=>$userDutyCheck->checked_at]);
+            $userWorkgroups=$userDetail->user->userWorkgroups();
+            if($userWorkgroups->count()>0)
+                $group_name=$userDetail->user->userWorkgroups->first()['name'];
+            return response()->view('personnel/checking-in/success',['group_name'=>$group_name??'','full_name'=>$userDetail->full_name,'checked_at'=>$userDutyCheck->checked_at]);
         }
-        return view("personnel/checking-in/clock",compact('userWorkGroupID'));
+        return view("personnel/checking-in/clock",compact('userWorkgroupID'));
     }
 
     //提交打卡
     public function storeClock(Request $request){
         $mobile_phone=$request->input('mobile_phone');
-        $userWorkGroupID=$request->input('userWorkGroupID');
+        $userWorkgroupID=$request->input('userWorkgroupID');
         $this->validator($request)->validate();
         $userDetail=UserDetail::where('mobile_phone',$mobile_phone)->first();
-        if (!$userDetail)   return redirect('personnel/checking-in/userDutyCheck/createUserDetail/'.$mobile_phone)->with("userWorkGroupID",$userWorkGroupID);
+        if (!$userDetail)   return redirect('personnel/checking-in/userDutyCheck/createUserDetail/'.$mobile_phone)->with("userWorkgroupID",$userWorkgroupID);
         $user=User::find($userDetail->user_id);
         if (Cache::has('tokenUser_'.$user->id))return "<h1 style='color: red'>请使用原有设备进行打卡,如无法使用原有设备请联系管理人员解绑设备!</h1>";
-        if ($userWorkGroupID)$user->userWorkGroups()->sync([$userWorkGroupID]);
+        if ($userWorkgroupID)$user->userWorkgroups()->sync([$userWorkgroupID]);
         $userDutyCheck=$this->dutyCheck($userDetail->user_id);
         if (!$userDutyCheck)return "<h1 style='color: red'>打卡异常，请联系相关人员!</h1>";
         $userLaborToken=$user->token(config('users.token_check_in_expire_minutes'));
@@ -97,8 +100,8 @@ class UserDutyCheckController extends Controller
     }
     //去往登记资料页面
     public function createUserDetail($mobile_phone){
-        $userWorkGroupID=session("userWorkGroupID");
-        return view('personnel/checking-in/createUserDetail',['mobile_phone'=>$mobile_phone,'userWorkGroupID'=>$userWorkGroupID]);
+        $userWorkgroupID=session("userWorkgroupID");
+        return view('personnel/checking-in/createUserDetail',['mobile_phone'=>$mobile_phone,'userWorkgroupID'=>$userWorkgroupID]);
     }
 
     //提交登记资料
@@ -106,13 +109,13 @@ class UserDutyCheckController extends Controller
         $this->validator($request)->validate();
         $mobile_phone=$request->input('mobile_phone');
         $full_name=$request->input('full_name');
-        $userWorkGroupID=$request->input('userWorkGroupID');
+        $userWorkgroupID=$request->input('userWorkgroupID');
         $user=new User([
             'name'=>$mobile_phone,
             'password'=>Uuid::uuid1(),
         ]);
         $user->save();
-        if ($userWorkGroupID)$user->userWorkGroups()->sync([$userWorkGroupID]);
+        if ($userWorkgroupID)$user->userWorkgroups()->sync([$userWorkgroupID]);
         $userDetail=new UserDetail([
             'user_id'=>$user->id,
             'full_name'=>$full_name,

app/Http/Controllers/UserWorkGroupController.php

@@ -3,25 +3,25 @@
 namespace App\Http\Controllers;
 
 use App\Authority;
-use App\UserWorkGroup;
+use App\UserWorkgroup;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
 
-class UserWorkGroupController extends Controller
+class UserWorkgroupController extends Controller
 {
     public function index()
     {
         if(!Gate::allows('工作组-查询')){ return redirect(url('/'));  }
-        $UserWorkGroups=UserWorkGroup::orderBy('id',"DESC")->paginate(50);
-        return view('maintenance.userWorkGroup.index',['userWorkGroups'=>$UserWorkGroups]);
+        $UserWorkgroups=UserWorkgroup::orderBy('id',"DESC")->paginate(50);
+        return view('maintenance.userWorkgroup.index',['userWorkgroups'=>$UserWorkgroups]);
     }
 
     public function create()
     {
         if(!Gate::allows('工作组-录入')){ return redirect(url('/'));  }
-        return view('maintenance.userWorkGroup.create');
+        return view('maintenance.userWorkgroup.create');
     }
 
 
@@ -29,12 +29,12 @@ class UserWorkGroupController extends Controller
     {
         if(!Gate::allows('工作组-录入')){ return redirect(url('/'));  }
         $id=false;
-        $this->validatorUserWorkGroup($request,$id)->validate();
-        $UserWorkGroup=new UserWorkGroup($request->input());
-        $UserWorkGroup->save();
-        $this->storeAuthority($UserWorkGroup['name'],$UserWorkGroup->id);
+        $this->validatorUserWorkgroup($request,$id)->validate();
+        $UserWorkgroup=new UserWorkgroup($request->input());
+        $UserWorkgroup->save();
+        $this->storeAuthority($UserWorkgroup['name'],$UserWorkgroup->id);
         $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
-        return redirect('maintenance/userWorkGroup')->with('successTip','新工作组“'.$request->input('name').'”添加成功');
+        return redirect('maintenance/userWorkgroup')->with('successTip','新工作组“'.$request->input('name').'”添加成功');
     }
 
     private function storeAuthority($name,$id){
@@ -49,18 +49,18 @@ class UserWorkGroupController extends Controller
     public function edit($id)
     {
         if(!Gate::allows('工作组-编辑')){ return redirect(url('/'));  }
-        $userWorkGroup=UserWorkGroup::find($id);
-        return view('maintenance.userWorkGroup.edit',['userWorkGroup'=>$userWorkGroup]);
+        $userWorkgroup=UserWorkgroup::find($id);
+        return view('maintenance.userWorkgroup.edit',['userWorkgroup'=>$userWorkgroup]);
     }
 
     public function update(Request $request, $id)
     {
         if(!Gate::allows('工作组-编辑')){ return redirect(url('/'));  }
-        $this->validatorUserWorkGroup($request,$id)->validate();
+        $this->validatorUserWorkgroup($request,$id)->validate();
         $data=$request->input();
-        $userWorkGroup=UserWorkGroup::find($id);
-        if ($data['name']!=$userWorkGroup->name){
-            $authority=Authority::where("name",$userWorkGroup->name)->first();
+        $userWorkgroup=UserWorkgroup::find($id);
+        if ($data['name']!=$userWorkgroup->name){
+            $authority=Authority::where("name",$userWorkgroup->name)->first();
             if ($authority){
                 $authority->name=$data['name'];
                 $authority->alias_name=$data['name'];
@@ -69,23 +69,23 @@ class UserWorkGroupController extends Controller
             if (!$authority){
                 $this->storeAuthority($data['name'],$id);
             }
-            $userWorkGroup->fill($data);
-            $userWorkGroup->save();
+            $userWorkgroup->fill($data);
+            $userWorkgroup->save();
             $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         }
-        return redirect('maintenance/userWorkGroup')->with('successTip','工作组“'.$request->input('name').'”修改成功');
+        return redirect('maintenance/userWorkgroup')->with('successTip','工作组“'.$request->input('name').'”修改成功');
     }
 
     public function destroy($id)
     {
         if(!Gate::allows('工作组-删除')){ return redirect(url('/'));  }
-        $UserWorkGroup=UserWorkGroup::find($id);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($UserWorkGroup),Auth::user()['id']);
-        $result=$UserWorkGroup->delete();
+        $UserWorkgroup=UserWorkgroup::find($id);
+        $this->log(__METHOD__,__FUNCTION__,json_encode($UserWorkgroup),Auth::user()['id']);
+        $result=$UserWorkgroup->delete();
         return ['success'=>$result];
     }
 
-    protected function validatorUserWorkGroup(Request $request,$id){
+    protected function validatorUserWorkgroup(Request $request,$id){
         if ($id){$name=$id;}
         $validator=Validator::make($request->input(),[
             'name'=>['required','max:10',isset($name)?"unique:user_workgroups,name,$name":'unique:user_workgroups,name'],

app/Http/Controllers/api/thirdPart/flux/WaybillController.php

@@ -38,15 +38,16 @@ class WaybillController extends Controller
                     .json_encode($receiveInputting),'resultInfo'=>'']]])
                     ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
             }
-            foreach ($receiveInputting['order_list'] as $orderInputting){
-                $orderInputting['OrderNo']=$receiveInputting['OrderNo'];
-                if(!WMSWaybillOrder::create($orderInputting)){
-                    Controller::logS(__METHOD__,'error_'.__FUNCTION__,'运单订单行WMS写入错误'.'|'.json_encode($orderInputting));
-                    return response()->json(['response'=>['return'=>['returnFlag'=>'0','returnCode'=>'0001','returnDesc'=>'运单订单行WMS写入错误'.'|'
-                        .json_encode($orderInputting),'resultInfo'=>'']]])
-                        ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+            if(isset($receiveInputting['order_list'])&&$receiveInputting['order_list'])
+                foreach ($receiveInputting['order_list'] as $orderInputting){
+                    $orderInputting['OrderNo']=$receiveInputting['OrderNo'];
+                    if(!WMSWaybillOrder::create($orderInputting)){
+                        Controller::logS(__METHOD__,'error_'.__FUNCTION__,'运单订单行WMS写入错误'.'|'.json_encode($orderInputting));
+                        return response()->json(['response'=>['return'=>['returnFlag'=>'0','returnCode'=>'0001','returnDesc'=>'运单订单行WMS写入错误'.'|'
+                            .json_encode($orderInputting),'resultInfo'=>'']]])
+                            ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+                    }
                 }
-            }
             $owner=Owner::where('code',$receiveInputting['CustomerID'])->first();
             if (!$owner){$owner=new Owner(['name'=>$receiveInputting['CustomerID'],'code'=>$receiveInputting['CustomerID']]);$owner->save();}
             $city=City::where('name',$receiveInputting['C_City'])->first();
@@ -104,11 +105,11 @@ class WaybillController extends Controller
             'request.*.C_Province' => ['required', 'string', 'max:191'],
             'request.*.C_City' => ['nullable', 'string', 'max:191'],
             'request.*.C_District' => ['nullable', 'string', 'max:191'],
-            'request.*.order_list' => ['required', 'array', 'min:1'],
+            'request.*.order_list' => ['nullable', 'array', 'min:1'],
             'request.*.order_list.*.SKU_Descr_c' => ['nullable', 'string', 'max:191'],
-            'request.*.order_list.*.SKU' => ['required', 'string', 'max:191'],
-            'request.*.order_list.*.Alternate_sku1' => ['required', 'string', 'max:191'],
-            'request.*.order_list.*.Qtyordered_each' => ['required', 'string', 'max:191'],
+            'request.*.order_list.*.SKU' => ['nullable', 'string', 'max:191'],
+            'request.*.order_list.*.Alternate_sku1' => ['nullable', 'string', 'max:191'],
+            'request.*.order_list.*.Qtyordered_each' => ['nullable', 'string', 'max:191'],
             'request.*.order_list.*.Cubic' => ['nullable', 'string', 'max:191'],
             'request.*.order_list.*.GrossWeight' => ['nullable', 'string', 'max:191'],
             'request.*.order_list.*.NetWeight' => ['nullable', 'string', 'max:191'],

app/User.php

@@ -86,8 +86,8 @@ class User extends Authenticatable
     function carriers(){
         return $this->belongsToMany('App\Carrier','carrier_user','user_id','carrier_id');
     }
-    function userWorkGroups(){
-        return $this->belongsToMany('App\UserWorkGroup','user_workgroup_user','user_id','user_workgroup_id');
+    function userWorkgroups(){
+        return $this->belongsToMany('App\UserWorkgroup','user_workgroup_user','user_id','user_workgroup_id');
     }
 
     function authorities(){
@@ -119,12 +119,12 @@ class User extends Authenticatable
         });
         return array_unique($ownerIds);
     }
-    function getPermittingWorkGroupIdsAttribute(){
+    function getPermittingWorkgroupIdsAttribute(){
         $workGroupIds=[];
         $response=[];
         if ($this->isSuperAdmin()||Gate::allows('人事管理-打卡审核')){
-            $workGroups=UserWorkGroup::all();
-            $workGroups->each(function (UserWorkGroup $workGroup)use(&$workGroupIds){
+            $workGroups=UserWorkgroup::all();
+            $workGroups->each(function (UserWorkgroup $workGroup)use(&$workGroupIds){
                 array_push($workGroupIds,$workGroup['id']);
             });
             if ($this->isSuperAdmin()){$response['workGroupSign']=true;}

app/UserWorkGroup.php → app/UserWorkgroup.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class UserWorkGroup extends Model
+class UserWorkgroup extends Model
 {
     protected $table="user_workgroups";
     protected $fillable=['name'];

resources/views/maintenance/menu.blade.php

@@ -16,7 +16,7 @@
                 </li> @endcan
             @can('工作组')
                 <li class="nav-item">
-                    <a class="nav-link" href="{{url('maintenance/userWorkGroup')}}" :class="{active:isActive('userWorkGroup',2)}">工作组</a>
+                    <a class="nav-link" href="{{url('maintenance/userWorkgroup')}}" :class="{active:isActive('userWorkgroup',2)}">工作组</a>
                 </li> @endcan
             @can('货主')
                 <li class="nav-item">

resources/views/maintenance/user/create.blade.php

@@ -68,12 +68,12 @@
                                 </div>
                             </div>
                             <div class="form-group row">
-                                <label for="userWorkGroupID" class="col-md-3 col-form-label text-md-right">工作组</label>
+                                <label for="userWorkgroupID" class="col-md-3 col-form-label text-md-right">工作组</label>
 
                                 <div class="col-md-7">
-                                    <select class="form-control" name="userWorkGroupID" id="userWorkGroupID">
+                                    <select class="form-control" name="userWorkgroupID" id="userWorkgroupID">
                                         <option></option>
-                                        <option v-for="userWorkGroup in userWorkGroups" :value="userWorkGroup.id">@{{ userWorkGroup.name }}</option>
+                                        <option v-for="userWorkgroup in userWorkgroups" :value="userWorkgroup.id">@{{ userWorkgroup.name }}</option>
                                     </select>
                                 </div>
                             </div>
@@ -153,9 +153,9 @@
         let vueList=new Vue({
             el:"#editPanel",
             data:{
-                userWorkGroups:[
-                    @foreach($userWorkGroups as $userWorkGroup)
-                    {!! $userWorkGroup !!},
+                userWorkgroups:[
+                    @foreach($userWorkgroups as $userWorkgroup)
+                    {!! $userWorkgroup !!},
                     @endforeach
                 ],
                 rolesAll:[

resources/views/maintenance/user/edit.blade.php

@@ -45,10 +45,10 @@
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="userWorkGroup" class="col-2 col-form-label text-right">工作组</label>
+                        <label for="userWorkgroup" class="col-2 col-form-label text-right">工作组</label>
                         <div class="col-8">
-                            <select class="form-control" name="userWorkGroupID" id="userWorkGroupID" v-model="userWorkGroupID">
-                                <option v-for="userWorkGroup in userWorkGroups" :value="userWorkGroup.id">@{{ userWorkGroup.name }}</option>
+                            <select class="form-control" name="userWorkgroupID" id="userWorkgroupID" v-model="userWorkgroupID">
+                                <option v-for="userWorkgroup in userWorkgroups" :value="userWorkgroup.id">@{{ userWorkgroup.name }}</option>
                             </select>
                         </div>
                     </div>
@@ -125,10 +125,10 @@
         let vueList=new Vue({
             el:"#editPanel",
             data:{
-                userWorkGroupID:'{{old('userWorkGroupID')??($userWorkGroup?$userWorkGroup->id:'')}}',
-                userWorkGroups:[
-                    @foreach($userWorkGroups as $userWorkGroup)
-                    {!! $userWorkGroup !!},
+                userWorkgroupID:'{{old('userWorkgroupID')??($userWorkgroup?$userWorkgroup->id:'')}}',
+                userWorkgroups:[
+                    @foreach($userWorkgroups as $userWorkgroup)
+                    {!! $userWorkgroup !!},
                     @endforeach
                 ],
                 rolesAll:[

resources/views/maintenance/user/index.blade.php

@@ -63,7 +63,7 @@
                     @foreach( $users as $user )
                     {id:'{{$user->id}}',name:'{{$user->name}}',email:'{{$user->email}}',
                         isSuperAdmin:'{{$user->isSuperAdmin}}',
-                        roles:{!! $user->roles !!},carriers:{!! $user->carriers !!},workGroup:{!! $user->userWorkGroups !!},created_at:'{{$user->created_at}}'},
+                        roles:{!! $user->roles !!},carriers:{!! $user->carriers !!},workGroup:{!! $user->userWorkgroups !!},created_at:'{{$user->created_at}}'},
                     @endforeach
                 ],
             },

resources/views/maintenance/userWorkGroup/create.blade.php

@@ -4,12 +4,12 @@
 @section('content')
     <div id="nav2">
         @component('maintenance.menu')@endcomponent
-        @component('maintenance.userWorkGroup.menu')@endcomponent
+        @component('maintenance.userWorkgroup.menu')@endcomponent
     </div>
     <div class="container-fluid mt-3">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
-                <form method="POST" action="{{ url('maintenance/userWorkGroup') }}">
+                <form method="POST" action="{{ url('maintenance/userWorkgroup') }}">
                     @csrf
                     <div class="form-group row">
                         <label for="name" class="col-2 col-form-label text-right">工作组名称</label>

resources/views/maintenance/userWorkGroup/edit.blade.php

@@ -4,7 +4,7 @@
 @section('content')
     <div id="nav2">
         @component('maintenance.menu')@endcomponent
-        @component('maintenance.userWorkGroup.menu')
+        @component('maintenance.userWorkgroup.menu')
                 <li class="nav-item">
                     <a class="nav-link" href="{{URL::current()}}" :class="{active:isActive('edit',4)}">修改</a>
                 </li>
@@ -13,14 +13,14 @@
     <div class="container-fluid mt-3">
         <div class="card">
             <div class="card-body">
-                <form method="POST" action='{{url("maintenance/userWorkGroup/{$userWorkGroup->id}")}}'>
+                <form method="POST" action='{{url("maintenance/userWorkgroup/{$userWorkgroup->id}")}}'>
                     @csrf
                     @method('PUT')
                     <div class="form-group row">
                         <label for="name" class="col-2 col-form-label text-right">工作组名称</label>
                         <div class="col-8">
                             <input type="text" class="form-control @error('name') is-invalid @enderror"
-                                   name="name" autocomplete="off" value="{{old('name')?old('name'):$userWorkGroup->name}}" required>
+                                   name="name" autocomplete="off" value="{{old('name')?old('name'):$userWorkgroup->name}}" required>
                             @error('name')
                             <span class="invalid-feedback" role="alert">
                                 <strong>{{ $message }}</strong>

resources/views/maintenance/userWorkGroup/index.blade.php

@@ -4,7 +4,7 @@
 @section('content')
     <span id="nav2">
         @component('maintenance.menu')@endcomponent
-        @component('maintenance.userWorkGroup.menu')@endcomponent
+        @component('maintenance.userWorkgroup.menu')@endcomponent
     </span>
     <div class="container-fluid mt-3">
         <div class="card">
@@ -19,19 +19,19 @@
                         <th>录入时间</th>
                         <th>操作</th>
                     </tr>
-                    <tr v-for="userWorkGroup in userWorkGroups">
-                        <td class="text-muted">@{{userWorkGroup.id}}</td>
-                        <td>@{{userWorkGroup.name}}</td>
-                        <td class="text-muted">@{{userWorkGroup.created_at}}</td>
+                    <tr v-for="userWorkgroup in userWorkgroups">
+                        <td class="text-muted">@{{userWorkgroup.id}}</td>
+                        <td>@{{userWorkgroup.name}}</td>
+                        <td class="text-muted">@{{userWorkgroup.created_at}}</td>
                         <td>
                             @can('工作组-编辑')
-                                <button class="btn btn-sm btn-outline-primary" @click="edit(userWorkGroup.id)">改</button> @endcan
+                                <button class="btn btn-sm btn-outline-primary" @click="edit(userWorkgroup.id)">改</button> @endcan
                             @can('工作组-删除')
-                                <button class="btn btn-sm btn-outline-dark" @click="destroy(userWorkGroup)">删</button> @endcan
+                                <button class="btn btn-sm btn-outline-dark" @click="destroy(userWorkgroup)">删</button> @endcan
                         </td>
                     </tr>
                 </table>
-                {{$userWorkGroups->links()}}
+                {{$userWorkgroups->links()}}
             </div>
         </div>
     </div>
@@ -42,34 +42,34 @@
         new Vue({
             el:"#list",
             data:{
-                userWorkGroups:[
-                    @foreach($userWorkGroups as $userWorkGroup)
-                    {!! $userWorkGroup !!},
+                userWorkgroups:[
+                    @foreach($userWorkgroups as $userWorkgroup)
+                    {!! $userWorkgroup !!},
                     @endforeach
                 ],
             },
             methods:{
                 edit:function(id){
-                    location.href = "{{url('maintenance/userWorkGroup')}}/"+id+"/edit";
+                    location.href = "{{url('maintenance/userWorkgroup')}}/"+id+"/edit";
                 },
-                destroy:function(userWorkGroup){
-                    if(!confirm('确定要删除工作组“' + userWorkGroup.name + '”吗？')){return};
+                destroy:function(userWorkgroup){
+                    if(!confirm('确定要删除工作组“' + userWorkgroup.name + '”吗？')){return};
                     let data=this;
-                    let url = "{{url('maintenance/userWorkGroup')}}/"+userWorkGroup.id;
-                    axios.delete(url,{id:userWorkGroup.id})
+                    let url = "{{url('maintenance/userWorkgroup')}}/"+userWorkgroup.id;
+                    axios.delete(url,{id:userWorkgroup.id})
                         .then(function (response) {
                             if(response.data.success){
-                                for (let i = 0; i < data.userWorkGroups.length; i++) {
-                                    if (data.userWorkGroups[i].id===userWorkGroup.id){
-                                        data.userWorkGroups.splice(i,1);
+                                for (let i = 0; i < data.userWorkgroups.length; i++) {
+                                    if (data.userWorkgroups[i].id===userWorkgroup.id){
+                                        data.userWorkgroups.splice(i,1);
                                         break;
                                     }
                                 }
                                 tempTip.setDuration(3000);
-                                tempTip.showSuccess('删除工作组"'+userWorkGroup.name+'"成功!')
+                                tempTip.showSuccess('删除工作组"'+userWorkgroup.name+'"成功!')
                             }else{
                                 tempTip.setDuration(3000);
-                                tempTip.show('删除工作组"'+userWorkGroup.name+'"失败!')
+                                tempTip.show('删除工作组"'+userWorkgroup.name+'"失败!')
                             }
                         })
                         .catch(function (err) {

resources/views/maintenance/userWorkGroup/menu.blade.php

@@ -4,11 +4,11 @@
         <ul class="nav nav-pills">
             @can('工作组-查询')
             <li class="nav-item">
-                <a class="nav-link" href="{{url('maintenance/userWorkGroup')}}" :class="{active:isActive('',3)}">查询</a>
+                <a class="nav-link" href="{{url('maintenance/userWorkgroup')}}" :class="{active:isActive('',3)}">查询</a>
             </li> @endcan
             @can('工作组-录入')
             <li class="nav-item">
-                <a class="nav-link" href="{{url('maintenance/userWorkGroup/create')}}" :class="{active:isActive('create',3)}">录入</a>
+                <a class="nav-link" href="{{url('maintenance/userWorkgroup/create')}}" :class="{active:isActive('create',3)}">录入</a>
             </li> @endcan
             {{$slot}}
         </ul>

resources/views/personnel/checking-in/QRcode.blade.php

@@ -9,7 +9,7 @@
 <div class="container-fluid mt-3" id="page">
     <div class="card col-md-10 offset-md-1 p-0">
         <div class="card-body">
-            <p class="h3 p-1 m-1" style="text-align:center">扫描进入@{{ userWorkGroup.name }}工作组</p>
+            <p class="h3 p-1 m-1" style="text-align:center">扫描进入@{{ userWorkgroup.name }}工作组</p>
             <div class="col m-0 pull-right mt-5 form-inline" >
                 <img id="img" class="img-thumbnail"   src="" />
                 <div class="pull-right col-6" >
@@ -27,14 +27,14 @@
     new Vue({
         el:"#page",
         data:{
-            userWorkGroup:{
-                id:'{{$userWorkGroup->id}}',name:'{{$userWorkGroup->name}}',
+            userWorkgroup:{
+                id:'{{$userWorkgroup->id}}',name:'{{$userWorkgroup->name}}',
             },
 
         },
         mounted:function () {
             let _this=this;
-            axios.get('{{url("personnel/checking-in/userDutyCheck/getQRCode?userWorkGroup_id=")}}'+_this.userWorkGroup.id)
+            axios.get('{{url("personnel/checking-in/userDutyCheck/getQRCode?userWorkgroup_id=")}}'+_this.userWorkgroup.id)
                 .then(function (response) {
                     console.log(response.data)
                     $("#img").attr('src',response.data);

resources/views/personnel/checking-in/clock.blade.php

@@ -14,7 +14,7 @@
                         <label for="mobile_phone" class="form-check-label col-3 pull-right">手机号：</label>
                         <input name="mobile_phone" id="mobile_phone" class="@error('mobile_phone') is-invalid @enderror col-7 form-control" type="text">
                     </div>
-                    <input hidden name="userWorkGroupID" value="{{$userWorkGroupID}}">
+                    <input hidden name="userWorkgroupID" value="{{$userWorkgroupID}}">
                     <div class="form-group row pt-3">
                         <button type="submit" class="col-7 offset-2 btn btn-success">提交</button>
                     </div>

resources/views/personnel/checking-in/clockAudit.blade.php

@@ -18,6 +18,7 @@
                         <td>打卡时间</td>
                         <td>打卡类型</td>
                         @can('人事管理-打卡审核')<td>操作</td>@endcan
+                        <td>工作组</td>
                         <td v-if="workGroupSign">组长审核</td>
                         <td>异常</td>
                         <td>合计工时</td>
@@ -26,9 +27,9 @@
                     <tbody>
                     <tr v-for="(userDutyCheck,i) in userDutyChecks">
                         <td>@{{ i+1 }}</td>
-                        <td ><p v-if="userDutyCheck.user_detail">@{{ userDutyCheck.user_detail.full_name }}</p></td>
-                        <td ><p v-if="userDutyCheck.user_detail">@{{ userDutyCheck.user_detail.mobile_phone }}</p></td>
-                        <td ><p v-if="userDutyCheck.user_detail">@{{ userDutyCheck.user_detail.user_labor_company }}</p></td>
+                        <td ><span v-if="userDutyCheck.user_detail">@{{ userDutyCheck.user_detail.full_name }}</span></td>
+                        <td ><span v-if="userDutyCheck.user_detail">@{{ userDutyCheck.user_detail.mobile_phone }}</span></td>
+                        <td ><span v-if="userDutyCheck.user_detail">@{{ userDutyCheck.user_detail.user_labor_company }}</span></td>
                         <td>@{{ userDutyCheck.checked_at }}</td>
                         <td>
                             <div v-if="userDutyCheck.verify_user_id" class="text-center">@{{ userDutyCheck.type }}</div>
@@ -41,6 +42,8 @@
                             <b v-if="userDutyCheck.verify_user_id" class="text-success">已审核</b>
                             <button v-else @click="storeClockAudit(userDutyCheck.id,userDutyCheck.type)" class="btn btn-primary w-80">审核</button>
                         </td>@endcan
+                        <td><span v-if="userDutyCheck.userDetail.user.userWorkgroups&&userDutyCheck.userDetail.user.userWorkgroups.length>0">
+                                @{{ userDutyCheck.userDetail.user.userWorkgroups[0].name }}</span></td>
                         <td v-if="workGroupSign">
                             <b v-if="userDutyCheck.group_user_id" class="text-success">已审核</b>
                             <button v-else @click="storeGroupAudit(userDutyCheck.id,userDutyCheck.type)" class="btn btn-primary w-80">组长审核</button>

resources/views/personnel/checking-in/createUserDetail.blade.php

@@ -36,7 +36,7 @@
                 <label for="company" class="form-check-label col-3 pull-left">劳务所：</label>
                 <input name="company" id="company" class="col-7 form-control" type="text">
             </div>
-            <input hidden name="userWorkGroupID" value="{{$userWorkGroupID}}">
+            <input hidden name="userWorkgroupID" value="{{$userWorkgroupID}}">
             <div class="form-group row pt-3">
                 <button type="submit" class="col-7 offset-2 btn btn-success">登记</button>
             </div>

resources/views/personnel/checking-in/getQRcode.blade.php

@@ -9,9 +9,9 @@
         <div class="card col-md-10 offset-md-1 p-0">
             <div class="card-body">
                     <div class="list-group list-group-horizontal-lg" >
-{{--                        @click="getQRCode(userWorkGroup.id)"--}}
-                        <a target="_blank"  class="btn list-group-item" type="button" :href="('{{url('personnel/checking-in/userDutyCheck/QRCode?userWorkGroup.id=')}}'+userWorkGroup.id)"  :class="userWorkGroup==checkedUserWorkGroup ? 'btn-primary' : 'btn-outline-primary'"
-                                v-for="userWorkGroup in userWorkGroups">@{{ userWorkGroup.name }}</a>
+{{--                        @click="getQRCode(userWorkgroup.id)"--}}
+                        <a target="_blank"  class="btn list-group-item" type="button" :href="('{{url('personnel/checking-in/userDutyCheck/QRCode?userWorkgroup.id=')}}'+userWorkgroup.id)"  :class="userWorkgroup==checkedUserWorkgroup ? 'btn-primary' : 'btn-outline-primary'"
+                                v-for="userWorkgroup in userWorkgroups">@{{ userWorkgroup.name }}</a>
                     </div>
             </div>
         </div>
@@ -23,12 +23,12 @@
         new Vue({
             el:"#page",
             data:{
-                userWorkGroups:[
-                    @foreach($userWorkGroups as $userWorkGroup)
-                    {!! $userWorkGroup !!},
+                userWorkgroups:[
+                    @foreach($userWorkgroups as $userWorkgroup)
+                    {!! $userWorkgroup !!},
                     @endforeach
                 ],
-                checkedUserWorkGroup:'',
+                checkedUserWorkgroup:'',
             },
         });
     </script>

resources/views/personnel/checking-in/success.blade.php

@@ -6,10 +6,11 @@
 </head>
 <body>
     <div style="text-align: center">
-        <h2 style="margin-bottom: 0">宝时物流 二次加工管理</h2><br/>
+        <h4 style="margin-bottom: 0">宝时物流 二次加工管理</h4><br/>
         <h5 style="margin-top: 0;color:#B8860B ">临时工作人员</h5><br/>
+        <h2 class="text-danger">小组：{{$group_name}}</h2><br/>
         <h3 style="margin-bottom: 0">姓名：@if($full_name)<b style="color: #2a9055">{{$full_name}}</b>@endif&nbsp;&nbsp;&nbsp;&nbsp;打卡时间：@if($checked_at)<b style="color: #2a9055">{{$checked_at}}</b> @endif</h3><br/>
         <h5 style="margin-top: 0;color: #B8860B">打卡请求已提交！等待确认</h5>
     </div>
 </body>
-</html>
+</html>

resources/views/personnel/menuPersonnel.blade.php

@@ -9,7 +9,7 @@
                 <ul class="nav nav-pills">
                     @can('工作组')
                     <li class="nav-item">
-                        <a class="nav-link text-dark" href="{{url('maintenance/userWorkGroup')}}" :class="{active:isActive('userWorkGroup',2)}">工作组</a>
+                        <a class="nav-link text-dark" href="{{url('maintenance/userWorkgroup')}}" :class="{active:isActive('userWorkgroup',2)}">工作组</a>
                     </li> @endcan
                 </ul>
             </div>

resources/views/weight/package/create.blade.php

@@ -62,6 +62,12 @@
                             @enderror
                         </div>
                     </div>
+                    <div class="form-group row" v-if="windowStatus.batch_input">
+                        <label for="weight" class="col-2 col-form-label text-right">强行当作活动波次</label>
+                        <div class="col-8">
+                            <input type="checkbox" class="form-control-sm" name="is_same_pack_batch" v-model="inputting.is_same_pack_batch">
+                        </div>
+                    </div>
                     <div class="form-group row">
                         <label for="paper_box_id" class="col-2 col-form-label text-right">纸箱</label>
                         <div class="col-8 form-inline">
@@ -73,7 +79,7 @@
                     </div>
                     <div class="form-group row">
                         <div class="col-8 offset-2">
-                            <input type="submit" class="btn btn-success form-control">
+                            <input type="button" @click="x" class="btn btn-success form-control" value="提交"/>
                         </div>
                     </div>
                 </form>
@@ -86,6 +92,7 @@
         let vue=new Vue({
             el:"#package",
             data:{
+                inputting:{is_same_pack_batch:false},
                 paperBoxes:[
                         @foreach($paperBoxes as $paperBox)
                     {id:'{{$paperBox->id}}',model:'{{$paperBox->model}}'},
@@ -109,10 +116,21 @@
                 windowSwitchLogistic:function (e) {
                     this.windowStatus.logistic_input=true;
                     this.windowStatus.batch_input=false;
+                    this.inputting.is_same_pack_batch=false;
                 },
                 windowSwitchBatch:function (e) {
                     this.windowStatus.logistic_input=false;
                     this.windowStatus.batch_input=true;
+                    this.inputting.is_same_pack_batch=false;
+                },
+                x:function (e) {
+                    if(this.inputting.is_same_pack_batch){
+                        if(!confirm('当前波次将被强行当作活动波次处理，该操作会将波次内所有订单重量统一，请确定您的操作无误！')){
+                            return false;
+                        }
+                    }
+                    $(e.target).parents('form').submit();
+                    return true;
                 },
 
             },

routes/api/thirdPart/flux.php

@@ -12,14 +12,14 @@ Route::post('receive/new', "ReceiveController@new_");//增加新波次消息
 /*
 文件地址前缀：/api/thirdPart/flux/package
 */
-Route::post('package/new', "PackageController@new_");//增加新波次消息
+Route::post('package/new', "PackageController@new_");//增加新包裹消息
 //accomplishToWMS() 发往WMS的称重和纸条包裹信息
 
 /*
 文件地址前缀：/api/thirdPart/flux/process
 */
 //请求数据，查询库单据是否存在
-Route::post('process/getProcessContent', "ProcessController@getProcessContent");//增加新波次消息
+Route::post('process/getProcessContent', "ProcessController@getProcessContent");//增加新二次加工
 
 /*
 文件地址前缀：/api/thirdPart/flux/waybill

routes/web.php

@@ -39,7 +39,7 @@ Route::resource('maintenance/province','ProvincesController');
 Route::resource('maintenance/city','CitiesController');
 Route::resource('maintenance/commodity', 'CommodityController');
 Route::resource('maintenance/measuringMachine', 'MeasuringMachineController');
-Route::resource('maintenance/userWorkGroup', 'UserWorkGroupController');
+Route::resource('maintenance/userWorkgroup', 'UserWorkgroupController');
 //教程管理
 Route::resource('maintenance/tutorial', 'TutorialController');
 //教程展示