Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

 Conflicts:

	app/Console/Kernel.php

app/Console/Commands/SyncCarrier.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Logistic;
+use App\Services\common\BatchUpdateService;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class SyncCarrier extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'sync:carrier';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Sync carriers every hour';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $carriers = DB::connection("oracle")->select(DB::raw("SELECT CUSTOMERID,CUSTOMER_TYPE,DESCR_C,CASE DESCR_E WHEN 'WL' THEN '物流' ELSE '快递' END AS TYPE FROM BAS_CUSTOMER WHERE CUSTOMER_TYPE = 'CA'"));
+        $logistics = Logistic::query()->whereIn("code",array_column($carriers,"customerid"))->get();
+        $changes = diff($carriers,$logistics,"code",["code"=>"customerid","name"=>"descr_c","type"=>"type"]);
+        if ($changes['attached'])Logistic::query()->insert($changes['attached']);
+        if ($changes['updated']){
+            array_unshift($changes['updated'],["code","name","type"]);
+            app(BatchUpdateService::class)->batchUpdate("logistics",$changes['updated']);
+        }
+        if ($changes["detached"])Logistic::query()->whereIn("code",$changes["detached"])->delete();
+    }
+}

app/Console/Kernel.php

@@ -11,6 +11,7 @@ use App\Console\Commands\InventoryDailyLoggingOwner;
 use App\Console\Commands\LogExpireDelete;
 use App\Console\Commands\MakeServiceCommand;
 use App\Console\Commands\SyncBatchTask;
+use App\Console\Commands\SyncCarrier;
 use App\Console\Commands\SyncLogCacheTask;
 use App\Console\Commands\SyncOrderPackageLogisticRouteTask;
 use App\Console\Commands\SyncUserVisitMenuLogsCacheTask;
@@ -48,6 +49,7 @@ class  Kernel extends ConsoleKernel
         CreateWeightStatistic::class,
         BeforeCreateOwnerReport::class,
         CreateProcurementTotalBill::class,
+        SyncCarrier::class,
     ];
 
     /**
@@ -74,6 +76,7 @@ class  Kernel extends ConsoleKernel
         $schedule->command('clear:cancelledOrder')->everyTenMinutes();
         $schedule->command('WasSyncWmsAsnInformation')->everyMinute();
         $schedule->command('create:weightStatistic')->dailyAt("00:30");
+        $schedule->command('sync:carrier')->hourlyAt(1);
         $schedule->command('createProcurementTotalBill')->monthlyOn(1);
     }
 

app/Http/Controllers/TestController.php

@@ -128,6 +128,7 @@ use Carbon\CarbonPeriod;
 use ChangeColumnOrderIdToOrderIssues;
 use Doctrine\DBAL\Query\QueryBuilder;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Http\Request;
@@ -161,8 +162,54 @@ class TestController extends Controller
 
     public function test()
     {
+        $a = [[1,2,3]];
+        dd(array_unshift($a,["code","name","type"]),$a);
         return view("test");
     }
+    public function handle()
+    {
+        $carriers = DB::connection("oracle")->select(DB::raw("SELECT CUSTOMERID,CUSTOMER_TYPE,DESCR_C,CASE DESCR_E WHEN 'WL' THEN '物流' ELSE '快递' END AS TYPE FROM BAS_CUSTOMER WHERE CUSTOMER_TYPE = 'CA'"));
+        $logistics = Logistic::query()->whereIn("code",array_column($carriers,"customerid"))->get();
+        $changes = diff($carriers,$logistics,"code",["code"=>"customerid","name"=>"descr_c","type"=>"type"]);
+        dd($changes);
+    }
+
+    private function diff($array1,$array2,$identification,$mapping):array
+    {
+        $changes = [
+            'attached' => [], 'detached' => [], 'updated' => [],
+        ];
+        $map = [];
+        foreach ($array2 as $item){
+            if (is_array($item))$map[$item[$identification]] = $item;
+            else $map[$item->$identification] = json_decode($item,true);
+        }
+        foreach ($array1 as $item){
+            /** @var \stdClass|array|Model $item */
+            if (!is_array($item) && !is_subclass_of($item,Model::class))$item = (array)$item;
+            if (!isset($map[$item[$mapping[$identification]]])){
+                $obj = [];
+                foreach ($mapping as $column2=>$column1)$obj[$column2] = $item[$column1];
+                $changes['attached'][] = $obj;continue;
+            }
+            $sign = false;
+            $obj = [];
+            foreach ($mapping as $column2=>$column1){
+                $obj[$column2] = $item[$column1];
+                if ($map[$item[$mapping[$identification]]][$column2] != $item[$column1])$sign = true;
+            }
+            if ($sign)$changes['updated'][] = $obj;
+            unset($map[$item[$mapping[$identification]]]);
+        }
+        //返回列表跟返回KEY
+        /*foreach ($map as $item){
+            $obj = [];
+            foreach ($mapping as $column2=>$column1)$obj[$column2] = $item[$column2];
+            $changes['detached'][] = $obj;
+        }*/
+        if ($map)$changes['detached'][] = array_keys($map);
+        return $changes;
+    }
     public function assignBatch(){
         $batches = collect([
             [

app/Logistic.php

@@ -10,11 +10,12 @@ use Illuminate\Database\Eloquent\Model;
  */use App\Traits\ModelTimeFormat;
 
 use App\Traits\ModelLogChanging;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Logistic extends Model
 {
     use ModelLogChanging;
-
+    use SoftDeletes;
     use ModelTimeFormat;
     protected $fillable = ['name','code',"type","mobile","remark","delivery_fee"];
 

app/Utils/helpers.php

@@ -1,6 +1,7 @@
 <?php
 
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Model;
 
 function formatExcelDate(int $timestamp)
 {
@@ -8,4 +9,43 @@ function formatExcelDate(int $timestamp)
     $today=new Carbon('1900-01-01');
     $day = $today->addDays($diff-2);
     return $day->toDateString();
+}
+
+function diff($array1,$array2,string $identification,array $mapping,bool $intactDetached = false):array
+{
+    $changes = [
+        'attached' => [], 'detached' => [], 'updated' => [],
+    ];
+    $map = [];
+    foreach ($array2 as $item){
+        if (is_array($item))$map[$item[$identification]] = $item;
+        else $map[$item->$identification] = json_decode($item,true);
+    }
+    foreach ($array1 as $item){
+        /** @var \stdClass|array|Model $item */
+        if (!is_array($item) && !is_subclass_of($item,Model::class))$item = (array)$item;
+        if (!isset($map[$item[$mapping[$identification]]])){
+            $obj = [];
+            foreach ($mapping as $column2=>$column1)$obj[$column2] = $item[$column1];
+            $changes['attached'][] = $obj;continue;
+        }
+        $sign = false;
+        $obj = [];
+        foreach ($mapping as $column2=>$column1){
+            $obj[$column2] = $item[$column1];
+            if ($map[$item[$mapping[$identification]]][$column2] != $item[$column1])$sign = true;
+        }
+        if ($sign)$changes['updated'][] = $obj;
+        unset($map[$item[$mapping[$identification]]]);
+    }
+    if ($map){
+        if ($intactDetached){
+            foreach ($map as $item){
+                $obj = [];
+                foreach ($mapping as $column2=>$column1)$obj[$column2] = $item[$column2];
+                $changes['detached'][] = $obj;
+            }
+        }else $changes['detached'][] = array_keys($map);
+    }
+    return $changes;
 }

database/migrations/2021_03_25_150800_change_logistics_add_column_deleted_at.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ChangeLogisticsAddColumnDeletedAt extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('logistics', function (Blueprint $table) {
+            $table->timestamp("deleted_at")->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('logistics', function (Blueprint $table) {
+            $table->dropColumn("deleted_at");
+        });
+    }
+}

resources/views/process/create.blade.php

@@ -271,10 +271,10 @@
                 </div>
                 <div class="form-group row">
                     <label for="designate_id" class="col-3 col-form-label text-right">指定接单人</label>
-                    <select id="designate_id" class="form-control col-5" v-model="process.designate_id">
+                    <select :disabled="is_hide" id="designate_id" class="form-control col-5" v-model="process.designate_id">
                         <option v-for="user in users" :value="user.id">@{{ user.name }}</option>
                     </select>
-                    <label class="col-3"><input class="text form-control rounded-pill" placeholder="搜索人员" @input="seekUser($event)"></label>
+                    <label class="col-3" v-if="!is_hide"><input class="text form-control rounded-pill" placeholder="搜索人员" @input="seekUser($event)"></label>
                 </div>
                 <div class="form-group row">
                     <label class="col-3 col-form-label text-right" >加工备注(选填)</label>

resources/views/test.blade.php

@@ -1,4 +1,4 @@
-@extends('layouts.app')
+{{--@extends('layouts.app')
 
 @section('content')
     <div>
@@ -71,4 +71,122 @@
             </tr>
         </table>
     </div>
-@endsection
+@endsection--}}
+<html>   
+<head>   
+    <title></title>   
+    <style type="text/css">
+        .Freezing {
+            z-index: 10;
+            position: relative;
+            top: expression(this.offsetParent.scrollTop)
+        }
+        .FreezingCol {
+            z-index: 1;
+            left: expression(document.getElementById("freezingDiv").scrollLeft);
+            position: relative;
+          }   
+    </style>   
+</head>   
+<body>   
+  <br>
+div table固定列<br>
+<div id="freezingDiv" style="overflow:auto; width:400px; height:155px">   
+      <table cellspacing="0" cellpadding="4" rules="all" bordercolor="#3366CC" border="1" id="DataGrid1" style="background-color:White;border-color:#3366CC;border-width:1px;border-style:None;width:900px;border-collapse:collapse;">   
+         
+            <tr class="Freezing" style="color:#CCCCFF;background-color:#003399;font-weight:bold;">
+                    <td class="FreezingCol">ID</td>   
+                    <td class="FreezingCol">姓名</td>   
+                    <td>年龄</td>   
+                    <td>电话</td>   
+                    <td>性别</td>   
+                    <td>住址</td>   
+                </tr>   
+               
+            <tr style="color:#003399;background-color:White;">   
+                    <td class="FreezingCol">   
+                         <span>1</span>    
+                        </td>   
+                    <td class="FreezingCol">   
+                        <span>张三</span>    
+                        </td>   
+                    <td>29</td>   
+                    <td>0000000000000</td>   
+                    <td>男</td>   
+                    <td>北京</td>   
+               </tr>
+           <tr style="color:#003399;background-color:White;">   
+                    <td class="FreezingCol">   
+                           <span>1</span>    
+                        </td>   
+                    <td class="FreezingCol">   
+                          <span>李四</span>    
+                        </td>   
+                    <td>29</td>   
+                    <td>0000000000000</td>   
+                    <td>男</td>   
+                    <td>上海</td>   
+               </tr>
+           <tr style="color:#003399;background-color:White;">   
+                    <td class="FreezingCol">   
+                           <span>1</span>    
+                        </td>   
+                    <td class="FreezingCol">   
+                          <span>王五</span>    
+                        </td>   
+                    <td>50</td>   
+                    <td>0000000000000</td>   
+                    <td>男</td>   
+                    <td>上海</td>   
+               </tr>
+           <tr style="color:#003399;background-color:White;">   
+                    <td class="FreezingCol">   
+                           <span>1</span>    
+                        </td>   
+                    <td class="FreezingCol">   
+                          <span>赵六</span>    
+                        </td>   
+                    <td>29</td>   
+                    <td>0000000000000</td>   
+                    <td>男</td>   
+                    <td>上海</td>   
+               </tr> 
+           <tr style="color:#003399;background-color:White;">   
+                    <td class="FreezingCol">   
+                           <span>1</span>    
+                        </td>   
+                    <td class="FreezingCol">   
+                          <span>赵七</span>    
+                        </td>   
+                    <td>29</td>   
+                    <td>0000000000000</td>   
+                    <td>男</td>   
+                    <td>上海</td>   
+               </tr>        
+          </table>   
+</div>   
+
+
+
+
+<br>
+cellspacing =0<br>
+<table width="200" cellspacing="0" border="1" bordercolor="#000000">
+    <tr> 
+        <td>sd </td>
+        <td>sd </td>
+        <td>sd </td>
+    </tr>
+</table>
+<br>
+cellspacing =8<br>
+<table width="200" cellspacing="8" border="1" bordercolor="#000000">
+    <tr>
+        <td>sd </td>
+        <td> dd</td>
+        <td>dd </td>
+    </tr>
+</table>
+  
+</body>   
+</html>