订单管理，一键回传功能

app/Http/Controllers/OrderController.php

@@ -360,7 +360,7 @@ sql;
      */
     public function manualBack(Request $request): array
     {
-//        if(!Gate::allows('订单管理-订单-一键回传'))return["success"=>false,"data"=>"无权操作"];
+        if(!Gate::allows('订单管理-订单-一键回传'))return["success"=>false,"data"=>"无权操作"];
         /** @var OrderService $orderService */
         $orderService=app(OrderService::class);
         $orderNos=$request->input('ordernos');
@@ -375,7 +375,7 @@ sql;
                 array_push($successNo,$no);
             }
         }
-        if (count($orderNos)>count($failNo))return ["success"=>true,"successNo"=>$orderNos,"failNo"=>$failNo];
+        if (count($orderNos)>=count($failNo))return ["success"=>true,"successNo"=>$orderNos,"failNo"=>$failNo];
         else return ["success"=>false,"failNo"=>$failNo];
     }
 

app/Services/OrderService.php

@@ -1513,7 +1513,8 @@ sql;
      * @return bool
      * 一键回传 调用flux的sp
      */
-    public function manualBack($orderno){
+    public function manualBack($orderno): bool
+    {
         $who = 'WAS' . (Auth::user() ? '-' . Auth::user()["name"] : '');
         $host=config('database.connections.oracle.host');
         $serviceName=config('database.connections.oracle.service_name');

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

@@ -39,10 +39,10 @@
                     @can('订单管理-订单-生成工单')
                         <button class="btn btn-sm ml-1 btn-outline-success" @click="showInterceptModel()">生成工单</button>
                     @endcan
-{{--                    @can()--}}
+                    @can('订单管理-订单-一键回传')
                         <button class="btn btn-sm ml-1 btn-success tooltipTarget" title="订单一键回传必须满足条件：订单状态为“分配完成,部分拣货,拣货完成,播种完成”；订单未冻结；订单有快递单号"
                                 @click="manualBack()">一键回传</button>
-{{--                    @endcan--}}
+                    @endcan
                 </div>
                 <div class="modal fade " style="top: 20%" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
                     <div class="modal-dialog">
@@ -1047,6 +1047,7 @@
                             if(order.orderno===checkedId){
                                 if (order.soreference5 //存在快递单号
                                     && order.releasestatus!='H' //订单未冻结
+                                    && order.manualflag=='N' //订单未回传
                                     && (order.sostatus=='40' ||
                                         order.sostatus=='50' ||
                                         order.sostatus=='60' ||
@@ -1079,7 +1080,7 @@
                                 if (failText.length > 0) {
                                     failText = failText.substr(0,failText.length - 1);
                                 }
-                                window.tempTip.setDuration(3000);
+                                window.tempTip.setDuration(4000);
                                 window.tempTip.showSuccess('回传成功!'+'    单号:'+failText+'不满足回传条件，系统已自动筛除');
                                 this.$forceUpdate();
                                 return;
@@ -1090,8 +1091,6 @@
                         window.tempTip.setDuration(3000);
                         window.tempTip.show("网络错误：" + err);
                     })
-                    console.log(checkData,orders)
-                    console.log(start)
                 },
             },
         });