|
|
@@ -127,7 +127,6 @@ use App\Services\PrintTemplateService;
|
|
|
use Illuminate\Database\Eloquent\Builder;
|
|
|
use Illuminate\Queue\Events\JobFailed;
|
|
|
use Illuminate\Queue\Events\JobProcessed;
|
|
|
-use Illuminate\Queue\Events\JobProcessing;
|
|
|
use Illuminate\Support\Facades\Queue;
|
|
|
use Illuminate\Support\Facades\Schema;
|
|
|
use Illuminate\Support\Facades\View;
|
|
|
@@ -247,7 +246,6 @@ class AppServiceProvider extends ServiceProvider
|
|
|
app()->singleton('InventoryCompareService', InventoryCompareService::class);
|
|
|
app()->singleton('InventoryDailyLogService', InventoryDailyLogService::class);
|
|
|
app()->singleton('JDDeliveryService',JDDeliveryService::class);
|
|
|
- app()->singleton('LaborCompanyService',LaborCompanyService::class);
|
|
|
app()->singleton('LaborReportsCountingRecordService', LaborReportsCountingRecordService::class);
|
|
|
app()->singleton('LogService', LogService::class);
|
|
|
app()->singleton('LogisticAliJiSuApiService',LogisticAliJiSuApiService::class);
|
|
|
@@ -401,7 +399,7 @@ class AppServiceProvider extends ServiceProvider
|
|
|
return preg_match('/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$)/', $value);
|
|
|
});
|
|
|
View::share('pageUuid',Uuid::uuid4());
|
|
|
- Builder::macro('sql', function () {
|
|
|
+ \Illuminate\Database\Query\Builder::macro('sql', function () {
|
|
|
$bindings = $this->getBindings();
|
|
|
$sql = str_replace('?',"'%s'",$this->toSql());
|
|
|
return vsprintf($sql, $bindings);
|