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

app/Http/Controllers/OrderIssueController.php

@@ -172,6 +172,10 @@ class OrderIssueController extends Controller
         /** @var OrderIssueService $orderIssueService */
         $orderIssueService = app(OrderIssueService::class);
         $exits_orderNos = $orderIssueService->校验问题件是否存在_WMS订单号_返回存在的订单号($request->input('orderNos'));
+        $count = OracleDOCOrderHeader::query()->with('oracleBASCode')->whereIn('OrderNo',$request['orderNos'])->whereHas('oracleBASCode',function($query){
+            $query->whereNotIn('codename_c',['完全装箱','订单完成','完全发运','分配完成']);
+        })->count();
+        if($count>0)return ['success'=>false,'fail_info'=>'勾选的订单中有没有完成的订单，请取消勾选'];
         if(count($exits_orderNos)>0){
             return ['success'=>false,'fail_info'=>'标记问题件存在已有订单号','exitsOrderNos' =>$exits_orderNos];
         }

app/Services/OrderIssueService.php

@@ -305,7 +305,7 @@ class OrderIssueService
         if ($bool) {
             return ['success' => $bool];
         } else {
-            return ['success' => $bool, 'fail_info' => '问题件创建失败'];
+            return ['success' => $bool, 'fail_info' => '问题件创建失败,请检查勾选订单的状态'];
         }
     }
 
@@ -317,23 +317,21 @@ class OrderIssueService
 //        $orders = $orderService->getByWmsOrders($orderHeaders);
         $orderService->createByWmsOrder($orderHeaders);
         $orders = Order::query()->whereIn('code',data_get($orderHeaders,'*.orderno'))->whereHas('packages')->get();
-
+        if($orders->count()==0)return false;
         $innerParams = [];
-        if($orders->count()>0){
-            foreach ($orderHeaders as $orderHeader) {
-                $order = $orders->where('code',$orderHeader->orderno)->first();
-                if($order==null){
-                    $order = Order::query()->where('code',$orderHeader->orderno)->first();
-                }
-                $innerParams[] = [
-                    'order_id' => $order->id,
-                    'order_issue_type_id' => $order_issue_type_id,
-                    'result_explain' => $result_explain,
-                    'imported_status' => $imported_status,
-                    'custom_code' => $custom_code,
-                    'hidden_tag' => $hiddenTag
-                ];
+        foreach ($orderHeaders as $orderHeader) {
+            $order = $orders->where('code',$orderHeader->orderno)->first();
+            if($order==null){
+                $order = Order::query()->where('code',$orderHeader->orderno)->first();
             }
+            $innerParams[] = [
+                'order_id' => $order->id,
+                'order_issue_type_id' => $order_issue_type_id,
+                'result_explain' => $result_explain,
+                'imported_status' => $imported_status,
+                'custom_code' => $custom_code,
+                'hidden_tag' => $hiddenTag
+            ];
         }
         try {
             $this->insert($innerParams);

app/Services/OrderPackageService.php

@@ -437,7 +437,6 @@ class OrderPackageService
             $params = $this->getInnerParams($orderHeader,$order,$packages_maps);
             $inner_params = array_merge($inner_params,$params);
         }
-
         if(count($inner_params)>0){
             try {
                 $bool = $this->insert($inner_params);

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

@@ -637,16 +637,29 @@
                 isUnfold(order){
                     if (!order.is_unfold){
                         this.$set(order,'is_unfold',true);
-                        return
+                        return;
                     }
                     order.is_unfold=false;
                 },
                 orderIssueTag(){
                     if( this.checkData.length === 0){
+                        tempTip.setDuration(2000);
                         tempTip.show('没有勾选记录');
-                        return
+                        return;
                     }
-                    this.isExistByOrderNos()
+                    let bool = false;
+                    let _this = this;
+                    this.orders.forEach(function(item){
+                        if(!_this.checkData.includes(item.orderno))return;
+                        if(!['完全装箱','订单完成','完全发运','分配完成'].includes(item.ordercodename)){console.log(item.ordercodename);
+                            tempTip.setDuration(2000);
+                            tempTip.show('勾选的订单中有没有完成的订单，请取消勾选');
+                            bool = true;
+                            return;
+                        }
+                    });
+                    if(bool)return;
+                    this.isExistByOrderNos();
                 },
                 orderIssueTagSubmit(){
                     if(this.typeId === ''){