订单--取消分配修改

app/Http/Controllers/OrderController.php

@@ -256,7 +256,7 @@ class OrderController extends Controller
         $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数据库
+        $conn=oci_connect($username,$password,$host.'/'.$service_name,'utf8'); //连接oracle数据库
         $IN_Warehouse='';
         $IN_Process_Action_C='' ;
         $IN_Process_By_C='By OrderNO';
@@ -279,9 +279,15 @@ class OrderController extends Controller
         oci_bind_by_name($stmt,':IN_AllocationDetailsID',$IN_AllocationDetailsID);
         oci_bind_by_name($stmt,':IN_Language',$IN_Language);
         oci_bind_by_name($stmt,':IN_UserID',$IN_UserID);
-        oci_bind_by_name($stmt,':OUT_Return_Code',$OUT_Return_Code);
-        $this->log(__METHOD__,'调用sp根据订单取消分配'.__FUNCTION__,json_encode($orderno),Auth::user()['id']);
-        return oci_execute($stmt);
+        oci_bind_by_name($stmt,':OUT_Return_Code',$OUT_Return_Code,300);
+        oci_execute($stmt);
+        if (substr($OUT_Return_Code,0,3) != '000'){
+            $this->log(__METHOD__,'调用sp根据订单取消分配失败'.__FUNCTION__,"ORDERNO:".$orderno."ERROR：".$OUT_Return_Code);
+            return false;
+        }
+        oci_close($conn);
+        return true;
+
     }
 
 }

resources/views/inventory/stockInventory/inventoryMission.blade.php

@@ -784,15 +784,11 @@
                     let scrollHeight = $(document).height();//当前页面的总高度
                     let clientHeight=window.innerHeight;//当前可视的页面高度
                     let count = parseFloat(clientHeight) + parseFloat(scrollTop);//浏览器底部位置
-                    //console.log("浏览器底部位置",count);
-                    //console.log("页面高度",scrollHeight);
-                    //console.log("滚动条高度",scrollTop);
                     if (scrollHeight - count < 40) {
                             if (_this.显示记录列.length < _this.inventoryMissions.length) {
                                 _this.加载下方数据并置空上方数据()
                             }
                     }
-                    //console.log(_this.显示记录列.length)
                     //可视区域高度(浏览器页面的高度)
                     //let height=window.innerHeight;
                     //滚动区域高度