Merge branch 'master' into Haozi

app/Http/Controllers/TestController.php

@@ -106,14 +106,46 @@ class TestController extends Controller
 
     }
 
+    function tFixWithoutWaveno(Request $request)
+    {
+        $re=OracleDOCWaveDetails::select(['doc_wave_details.waveno','doc_wave_details.orderno'])->where('doc_order_header.WAVENO','*')
+            ->leftJoin('DOC_ORDER_HEADER','DOC_ORDER_HEADER.orderno','doc_wave_details.orderno')->get();
+        dd($re);
+        $re->each(function($waveDetail){
+            $o=OracleDOCOrderHeader::where('orderno',$waveDetail['orderno'])->update(['waveno'=>$waveDetail['waveno']]);
+        });
+//        $orderHeader=OracleDOCOrderHeader::where('waveno',)
+    }
     function t1(Request $request)
     {
-        dd(OracleDOCOrderHeader::select('addtime')->where('edisendflag','W')->where('edisendtime','>',Carbon::now()->subWeek())
-            ->orderBy('edisendtime','desc')
-            ->get()->
-        map(function($order){
-            return $order['addtime'];
-        }));
+        {
+            $username=config('database.connections.oracle.username');
+            $password=config('database.connections.oracle.password');
+            $host=config('database.connections.oracle.host');
+            $service_name=config('database.connections.oracle.service_name');
+            $conn=oci_connect($username,$password,$host.'/'.$service_name); //连接oracle数据库
+            $IN_WarehouseID='';
+            $IN_TraceID='' ;
+            $IN_Process_By_C='By OrderNO';
+            $IN_WavenNo='';
+            $IN_OrderNO_C=$orderno;
+            $IN_Language='';
+            $IN_UserID='';
+            $IN_Language='';
+            $OUT_Return_Code='';
+            $sql_sp="begin SPCUS_EDI_WCS001(:IN_WarehouseID,:IN_Process_Action_C,:IN_Process_By_C,
+        :IN_WaveNO_C,:IN_OrderNO_C,:IN_OrderLineNO_C,:IN_AllocationDetailsID,:IN_Language,:IN_UserID,:OUT_Return_Code); end;";
+            $stmt = oci_parse($conn, $sql_sp);
+            oci_bind_by_name($stmt,':IN_Warehouse',$IN_Process_Action_C);
+            oci_bind_by_name($stmt,':IN_TraceID',$IN_Warehouse);
+            oci_bind_by_name($stmt,':IN_WavenNo',$IN_WaveNO_C);
+            oci_bind_by_name($stmt,':IN_Language',$IN_OrderNO_C);
+            oci_bind_by_name($stmt,':IN_UserID',$IN_OrderLineNO_C);
+            oci_bind_by_name($stmt,':OUT_Return_Code',$IN_AllocationDetailsID);
+            return oci_execute($stmt);
+
+        }
+
 
     }