|
|
@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
|
|
|
|
|
|
use App\Commodity;
|
|
|
use App\CommodityBarcode;
|
|
|
+use App\Events\ResetProcessStatisticStartDateEvent;
|
|
|
use App\LaborReport;
|
|
|
use App\Owner;
|
|
|
use App\Process;
|
|
|
@@ -20,6 +21,7 @@ use App\UserDutyCheck;
|
|
|
use App\UserLabor;
|
|
|
use Carbon\Carbon;
|
|
|
use Exception;
|
|
|
+use Illuminate\Database\Eloquent\Builder;
|
|
|
use Illuminate\Http\Request;
|
|
|
use Illuminate\Support\Facades\Auth;
|
|
|
use Illuminate\Support\Facades\DB;
|
|
|
@@ -319,6 +321,8 @@ class ProcessController extends Controller
|
|
|
}
|
|
|
return $process_id;
|
|
|
}
|
|
|
+
|
|
|
+ //新增参与人
|
|
|
public function storeProcessDailyParticipant(Request $request){
|
|
|
if(!Gate::allows('二次加工管理-登记工时')){ return redirect(url('/')); }
|
|
|
$errors=$this->validatorProcessDailyParticipant($request)->errors();
|
|
|
@@ -355,6 +359,11 @@ class ProcessController extends Controller
|
|
|
$processDailyParticipant->load(['processDaily'=>function($query){
|
|
|
$query->with('process');
|
|
|
}]);
|
|
|
+
|
|
|
+ // 重置统计开始时间
|
|
|
+ event(new ResetProcessStatisticStartDateEvent($processDailyParticipant->processDaily->process));
|
|
|
+
|
|
|
+
|
|
|
if ($processDailyParticipant->processDaily && $processDailyParticipant->processDaily->process &&
|
|
|
$processDailyParticipant->processDaily->process->status=='交接完成'){
|
|
|
$this->statistic($processDailyParticipant->processDaily->process);
|
|
|
@@ -908,9 +917,13 @@ class ProcessController extends Controller
|
|
|
unset($processDaily);
|
|
|
}
|
|
|
}
|
|
|
- ProcessDaily::destroy($processDailiesId);
|
|
|
- ProcessDailyParticipant::whereIn('process_daily_id',$processDailiesId)->delete();
|
|
|
+
|
|
|
$process=Process::find($process_id);
|
|
|
+ if (count($processDailiesId) > 0){
|
|
|
+ ProcessDaily::destroy($processDailiesId);
|
|
|
+ ProcessDailyParticipant::whereIn('process_daily_id',$processDailiesId)->delete();
|
|
|
+ event(new ResetProcessStatisticStartDateEvent($process));
|
|
|
+ }
|
|
|
if (!$is_process_daily && $process){
|
|
|
$ProcessDailyNow=ProcessDaily::create([
|
|
|
'process_id'=>$process_id,
|
|
|
@@ -920,7 +933,7 @@ class ProcessController extends Controller
|
|
|
]);
|
|
|
$processDailies->push($ProcessDailyNow);
|
|
|
}
|
|
|
- $today=Carbon::now()->format('Y-m-d');
|
|
|
+ $today=Carbon::parse($start_date)->format('Y-m-d');
|
|
|
$this->createDeficiencyData($processDailies,$today);
|
|
|
$processDailies=ProcessDaily::with('processDailyParticipants')->where('process_id',$process_id)
|
|
|
->orderBy('date','DESC')->get();
|
|
|
@@ -963,7 +976,16 @@ class ProcessController extends Controller
|
|
|
|
|
|
//删除临时工工作记录
|
|
|
public function destroyDailyParticipant($id){
|
|
|
- if (ProcessDailyParticipant::destroy($id)) return ['success'=>true];
|
|
|
+ $pro = ProcessDailyParticipant::query()->with(["processDaily"=>function($query){
|
|
|
+ /** @var Builder $query */
|
|
|
+ $query->with("process");
|
|
|
+ }])->find($id);
|
|
|
+ if ($pro->delete()) {
|
|
|
+
|
|
|
+ event(new ResetProcessStatisticStartDateEvent($pro->processDaily->process));
|
|
|
+
|
|
|
+ return ['success'=>true];
|
|
|
+ }
|
|
|
return ['success'=>false , 'data'=>'记录不存在!'];
|
|
|
}
|
|
|
//导入商品数据
|