Merge branch 'master' into zengjun

app/Http/Controllers/TestController.php

@@ -65,6 +65,7 @@ use Illuminate\Support\Facades\Cache;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Redis;
 use Zttp\Zttp;
 
 class TestController extends Controller
@@ -105,6 +106,7 @@ class TestController extends Controller
                      'OUT_Return_Code：'.$result
                  );*/
     public function test4(){
+        $r=Redis::connection();
         $controller = new \App\Http\Controllers\Api\thirdPart\flux\StoreController();
         return $controller->quickStorage('JSCS202010210001');
     }
@@ -646,15 +648,15 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
         Commodity::destroy($deleteCommodities);
     }
 
-    public function test2()
-    {
-        $owner = Owner::where('name', 'B站')->first();
-        $commodities = Commodity::query()->where('owner_id', $owner->id)->get();
-        $comID = array_column($commodities->toArray(), 'id');
-        CommodityBarcode::query()->whereIn('commodity_id', $comID)->delete();
-        Commodity::destroy($comID);
-        return $comID;
-    }
+//    public function test2()
+//    {
+//        $owner = Owner::where('name', 'B站')->first();
+//        $commodities = Commodity::query()->where('owner_id', $owner->id)->get();
+//        $comID = array_column($commodities->toArray(), 'id');
+//        CommodityBarcode::query()->whereIn('commodity_id', $comID)->delete();
+//        Commodity::destroy($comID);
+//        return $comID;
+//    }
 
     /*1*/
     function socket(Request $request)

app/Http/Controllers/api/thirdPart/flux/StoreController.php

@@ -247,7 +247,7 @@ class StoreController extends Controller
                     oci_bind_by_name($stmt,':IN_RCVStation',$IN_RCVStation);
                     oci_bind_by_name($stmt,':In_Language',$In_Language);
                     oci_bind_by_name($stmt,':In_UserID',$doc_asn_detail->addwho);
-                    oci_bind_by_name($stmt,':OUT_Return_Code',$result);dd($stmt);
+                    oci_bind_by_name($stmt,':OUT_Return_Code',$result);
                     oci_execute($stmt);
                     if (substr($result,1,3) == '000'){
                         $query = DB::raw("update cus_bs_asndetails t set t.rcvflag = 'Y' where t.asnno = ? and t.asnlineno = ?");

public/css/app.css

@@ -228,28 +228,38 @@ table.table-striped tbody tr:hover.td-yellow {
   background: #fdf3db;
 }
 
-table tr.focusing td,
-table.table-striped tbody tr.focusing td {
+table .table-striped > tr.focusing,
+table tr.focusing > td,
+table.table-striped tbody .table-striped > tr.focusing,
+table.table-striped tbody tr.focusing > td {
   background: #d5aba1;
 }
 
-table tr.focusing td.td-warm,
-table.table-striped tbody tr.focusing td.td-warm {
+table .table-striped > tr.focusing.td-warm,
+table tr.focusing > td.td-warm,
+table.table-striped tbody .table-striped > tr.focusing.td-warm,
+table.table-striped tbody tr.focusing > td.td-warm {
   background: #e7ae80;
 }
 
-table tr.focusing td.td-cool,
-table.table-striped tbody tr.focusing td.td-cool {
+table .table-striped > tr.focusing.td-cool,
+table tr.focusing > td.td-cool,
+table.table-striped tbody .table-striped > tr.focusing.td-cool,
+table.table-striped tbody tr.focusing > td.td-cool {
   background: #5f8fcd;
 }
 
-table tr.focusing td.td-helpful,
-table.table-striped tbody tr.focusing td.td-helpful {
+table .table-striped > tr.focusing.td-helpful,
+table tr.focusing > td.td-helpful,
+table.table-striped tbody .table-striped > tr.focusing.td-helpful,
+table.table-striped tbody tr.focusing > td.td-helpful {
   background: #69cb9c;
 }
 
-table tr.focusing td.td-yellow,
-table.table-striped tbody tr.focusing td.td-yellow {
+table .table-striped > tr.focusing.td-yellow,
+table tr.focusing > td.td-yellow,
+table.table-striped tbody .table-striped > tr.focusing.td-yellow,
+table.table-striped tbody tr.focusing > td.td-yellow {
   background: #d9c290;
 }
 

public/t.php

@@ -1,2 +1,6 @@
 <?php
 
+$a = '11';
+echo $a;
+$a = '\\' . $a . '\\';
+echo trim($a, '\\');

resources/views/order/issue/index.blade.php

@@ -49,7 +49,7 @@
                     <tr class="tr-yellow" align="center" >
                         <th class=" font-weight-bolder header-1" ></th>
                         <th class="td-yellow  font-weight-bolder original-class table-head-warning  header-2">
-                            <span>原始运单号</span>
+                            <span>原始运单</span>
                             <button class="btn btn-sm btn-outline-secondary float-right" v-if="isShowOrderInfo" @click="hideOrderInfo">
                                 隐藏运单列
                             </button>