|
|
@@ -14,7 +14,6 @@ use App\ProcessesContent;
|
|
|
use App\ProcessMethod;
|
|
|
use App\ProcessStatistic;
|
|
|
use App\Services\OwnerService;
|
|
|
-use App\Services\ProcessService;
|
|
|
use App\Sign;
|
|
|
use App\Tutorial;
|
|
|
use App\User;
|
|
|
@@ -22,14 +21,15 @@ use App\UserDetail;
|
|
|
use App\UserDutyCheck;
|
|
|
use App\UserLabor;
|
|
|
use Carbon\Carbon;
|
|
|
-use Exception;
|
|
|
+use Illuminate\Contracts\Foundation\Application;
|
|
|
+use Illuminate\Contracts\View\Factory;
|
|
|
use Illuminate\Database\Eloquent\Builder;
|
|
|
use Illuminate\Http\Request;
|
|
|
use Illuminate\Support\Facades\Auth;
|
|
|
use Illuminate\Support\Facades\DB;
|
|
|
use Illuminate\Support\Facades\Gate;
|
|
|
-use Illuminate\Support\Facades\Http;
|
|
|
use Illuminate\Support\Facades\Validator;
|
|
|
+use Illuminate\View\View;
|
|
|
use Oursdreams\Export\Export;
|
|
|
use Ramsey\Uuid\Uuid;
|
|
|
|
|
|
@@ -39,11 +39,10 @@ class ProcessController extends Controller
|
|
|
* Display a listing of the resource.
|
|
|
* @param Request $request
|
|
|
* @param OwnerService $ownerService
|
|
|
- * @return void
|
|
|
+ * @return Application|Factory|View
|
|
|
*/
|
|
|
public function index(Request $request,OwnerService $ownerService)
|
|
|
{
|
|
|
- if(!Gate::allows('二次加工管理-查询')){ return redirect(url('/')); }
|
|
|
$paginateParams = $request->input();
|
|
|
$processes = app('ProcessService')->paginate($paginateParams);
|
|
|
$owners=$ownerService->getIntersectPermitting();
|
|
|
@@ -201,9 +200,8 @@ class ProcessController extends Controller
|
|
|
public function accomplish(Request $request){
|
|
|
if(!Gate::allows('二次加工管理-交接完成')){ return ['success'=>false,'data'=>'您无权进行该操作!']; }
|
|
|
$process=Process::with('processDailies')->find($request->id);
|
|
|
- if (!$process)return ['success'=>false];
|
|
|
+ if (!$process || $process->status == '交接完成')return ['success'=>false];
|
|
|
$result=$this->statistic($process);
|
|
|
-// if (!$result['success'])return $result;
|
|
|
$process->update(['status'=>'交接完成']);
|
|
|
$process->createOperatorLog('交接完成');
|
|
|
$processStatistic=$result['data'];
|
Zhouzhendong