退回单据增加退回时间

app/Http/Controllers/RejectedController.php

@@ -406,16 +406,14 @@ class RejectedController extends Controller
             config('database.connections.mysql.port'),config('database.connections.mysql.database')
             ,config('database.connections.mysql.username'),config('database.connections.mysql.password'));
         $e->setFileName("退货单列表-".date('ymdHis'));
-        $e->setDatum("id");
-        $e->setMergeFormat([
-//            "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "P",
-//            "Q", "R"
-        ]);
+        //$e->setDatum("logistic_number_return");
+        $e->setDateTimeColumn("record_time");
         return $e->sql($sql,[
             "created_at"=>"日期","checked_numbers"=>"审核号",
             "owner_name"=>"客户名称","order_number"=>"订单号",
             "sender"=>"姓名","mobile_sender"=>"手机",
-            "logistic_number"=>"原单单号","logistic_number_return"=>"退回单号","logistic_name"=>"退回公司",
+            "record_time" => "退回时间","logistic_name"=>"退回公司",
+            "logistic_number"=>"原单单号","logistic_number_return"=>"退回单号",
             "fee_collected"=>"到付费用","loaded"=>"是否入库",
             "item_barcode"=>"商品条码","item_name"=>"商品名称",
             "item_amount"=>"商品数量","quality_label_name"=>"商品质量","item_remark"=>"备注","operator_name"=>"录入人","remark"=>"退单备注"

app/Http/Controllers/TestController.php

@@ -5,10 +5,13 @@ namespace App\Http\Controllers;
 use App\Components\AsyncResponse;
 use App\Components\Database;
 use App\Components\ErrorPush;
+use App\Exceptions\Exception;
 use App\Services\WaybillService;
+use App\User;
 use App\Waybill;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
 
 class TestController extends Controller
 {
@@ -30,21 +33,23 @@ class TestController extends Controller
         }
     }
     public function test(){
-        $sql = <<<SQL
-select * from equipment where id in (
-    select parent_id from equipment where parent_id in (select id from equipment where info like '%"id":2%' and code like 'H%')
-    group by parent_id having (count(*)<5)
-);
-SQL;
-
-        $arr = DB::connection("aliyunMysql")->select(DB::raw($sql));
-        $insert = <<<SQL
-insert into equipment(repository_id, code, parent_id, info, depth, width, height, containers, location_tab, created_at, updated_at, tandem)
-values (?,?,?,null,?,?,1.8,null,'0-0','2022-01-13 16:08:00','2022-01-13 16:08:00',null)
-SQL;
-
-        foreach ($arr as $item){
-            DB::connection("aliyunMysql")->insert($insert, [$item->repository_id,$item->code."-1",$item->id,$item->depth,$item->width]);
+        $a = "12345678";
+        Hash::check($a,$hash);
+        $hash = password_hash($a, PASSWORD_BCRYPT, ['cost' => 10]);
+        $prefix = substr($hash, 0 ,29);
+        //dd(crypt($a, $prefix),$a,$prefix);
+        dd($hash ===  crypt($a, $prefix));
+        $strs="QWERTYUIOPASDFGHJKLZXCVBNM1234567890qwertyuiopasdfghjklzxcvbnm";
+        $users =  User::query()->get();
+        foreach ($users as $user){
+            $name=substr(str_shuffle($strs),mt_rand(0,strlen($strs)-11),6);
+            try {
+                DB::connection("system")->insert("insert into sys_user(id,username,password,email,salt,service,create_time) VALUES(?,?,?,?,?,?,?)",[
+                    $user->id,$user->name,$user->password,$user->email,$name, "SWMS", date('Y-m-d H:i:s')
+                ]);
+            }catch (\Exception $e){
+                dump($user);
+            }
         }
     }
 }

app/Services/RejectedService.php

@@ -177,7 +177,9 @@ class RejectedService
             ->leftJoin('quality_labels','rejected_bill_items.id_quality_label','=','quality_labels.id')
             ->selectRaw('quality_labels.name quality_label_name')
             ->leftJoin('users','rejected_bills.id_operator','=','users.id')
-            ->selectRaw('users.name operator_name');
+            ->selectRaw('users.name operator_name')
+            ->leftJoin('receive_records', 'rejected_bills.logistic_number_return', '=', 'receive_records.logistic_number')
+            ->selectRaw('IFNULL(receive_records.location_at,receive_records.record_at) record_time');
         return $sql->sql();
     }
 

config/database.php

@@ -84,6 +84,25 @@ return [
             ]) : [],
         ],
 
+        'system' => [
+            'driver' => 'mysql',
+            'url' => env('DATABASE_URL'),
+            'host' => 'rm-uf6f5v208b07hp198bo.mysql.rds.aliyuncs.com',
+            'port' => '3306',
+            'database' => 'system',
+            'username' => 'root',
+            'password' => 'baoshiSYSTEM123!',
+            'unix_socket' => env('DB_SOCKET', ''),
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'prefix' => '',
+            'prefix_indexes' => true,
+            'strict' => false,
+            'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
+                \PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
+        ],
         'aliyunMysql' => [
             'driver' => 'mysql',
             'url' => env('DATABASE_URL'),