Ver código fonte

Merge branch 'LD'

LD 5 anos atrás
pai
commit
3bee9bffc3

+ 2 - 0
.gitignore

@@ -7,6 +7,8 @@
 /public/images/QRCodeIMG/*
 /resources/images/QRCodeIMG/*
 /public/mix-manifest.json
+/public/js/app.js
+/public/css/app.csscd
 /storage/*.key
 /vendor
 .env

+ 47 - 0
app/Console/Commands/TestTemp.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Http\Controllers\Controller;
+use App\Http\Controllers\TestController;
+use App\OracleDOCOrderHeader;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+
+class TestTemp extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'TestTemp';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'TestTemp';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        return (new TestController())->cleanOrderRepeat();
+    }
+
+}

+ 1 - 0
app/Console/Kernel.php

@@ -19,6 +19,7 @@ class Kernel extends ConsoleKernel
         \App\Console\Commands\InventoryDailyLoggingOwner::class,
         \App\Console\Commands\WASSyncWMSOrderInformation::class,
         \App\Console\Commands\SyncLogCacheTask::class,
+        \App\Console\Commands\TestTemp::class,
     ];
 
     /**

+ 5 - 1
app/Http/Controllers/TestController.php

@@ -999,9 +999,13 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
     public function view(){
         return view('test');
     }
+    public function tdel(){
+        echo '223232323';
+        return 'asdfsadfsdf';
+    }
     public function cleanOrderRepeat(){
 
-        ini_set('max_execution_time',2500);
+        ini_set('max_execution_time',6500);
         ini_set('memory_limit','1526M');
         for($i=0;true;$i++){
             $orders_repeating=Order::query()

+ 2 - 2
public/js/app.js

@@ -2330,7 +2330,7 @@ function fromByteArray (uint8) {
 var BlobBuilder = typeof BlobBuilder !== 'undefined' ? BlobBuilder :
   typeof WebKitBlobBuilder !== 'undefined' ? WebKitBlobBuilder :
   typeof MSBlobBuilder !== 'undefined' ? MSBlobBuilder :
-  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder : 
+  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder :
   false;
 
 /**
@@ -86489,4 +86489,4 @@ module.exports = __webpack_require__(/*! D:\Demo\bswas\resources\sass\app.scss *
 
 /***/ })
 
-/******/ });
+/******/ });