cqp 1 ماه پیش
والد
کامیت
88158dbfc1
1فایلهای تغییر یافته به همراه13 افزوده شده و 7 حذف شده
  1. 13 7
      app/Service/ApplyOrderService.php

+ 13 - 7
app/Service/ApplyOrderService.php

@@ -423,11 +423,14 @@ class ApplyOrderService extends Service
                 ->select('dispatch_no as order_no','order_product_id','crt_time')
                 ->get()->toArray();
             foreach ($d_no as $value){
-                if(isset($d_no_map[$value['order_product_id'] . $value['crt_time']])){
-                    if(! in_array($value['order_no'], $d_no_map[$value['order_product_id'] . $value['crt_time']])) $d_no_map[$value['order_product_id'] . $value['crt_time']][] = $value['order_no'];
-                }else{
+                if(! isset($d_no_map[$value['order_product_id'] . $value['crt_time']])){
                     $d_no_map[$value['order_product_id'] . $value['crt_time']][] = $value['order_no'];
                 }
+//                if(isset($d_no_map[$value['order_product_id'] . $value['crt_time']])){
+//                    if(! in_array($value['order_no'], $d_no_map[$value['order_product_id'] . $value['crt_time']])) $d_no_map[$value['order_product_id'] . $value['crt_time']][] = $value['order_no'];
+//                }else{
+//                    $d_no_map[$value['order_product_id'] . $value['crt_time']][] = $value['order_no'];
+//                }
             }
         }elseif ($detail['type'] == ApplyOrder::type_two){
             $d = DispatchSub::where('del_time',0)
@@ -447,11 +450,14 @@ class ApplyOrderService extends Service
                 ->select('dispatch_no as order_no','order_product_id','crt_time')
                 ->get()->toArray();
             foreach ($d_no as $value){
-                if(isset($d_no_map[$value['order_product_id'] . $value['crt_time']])){
-                    if(! in_array($value['order_no'], $d_no_map[$value['order_product_id'] . $value['crt_time']])) $d_no_map[$value['order_product_id'] . $value['crt_time']][] = $value['order_no'];
-                }else{
+                if(! isset($d_no_map[$value['order_product_id'] . $value['crt_time']])){
                     $d_no_map[$value['order_product_id'] . $value['crt_time']][] = $value['order_no'];
                 }
+//                if(isset($d_no_map[$value['order_product_id'] . $value['crt_time']])){
+//                    if(! in_array($value['order_no'], $d_no_map[$value['order_product_id'] . $value['crt_time']])) $d_no_map[$value['order_product_id'] . $value['crt_time']][] = $value['order_no'];
+//                }else{
+//                    $d_no_map[$value['order_product_id'] . $value['crt_time']][] = $value['order_no'];
+//                }
             }
         }elseif ($detail['type'] == ApplyOrder::type_three){
             $d = Box::where('del_time',0)
@@ -505,7 +511,7 @@ class ApplyOrderService extends Service
             $top_product_no = ! empty($t['top_product_no']) ? $t['top_product_no'] : $tmp['product_no'] ?? "";
 
             if(! empty($tmp['order_product_id']) && ! empty($tmp['crt_time']) && isset($d_no_map[$tmp['order_product_id'] . $tmp['crt_time']])){
-                $order_no = implode(',', $d_no_map[$tmp['order_product_id'] . $tmp['crt_time']]);
+                $order_no = implode(',', array_values($d_no_map[$tmp['order_product_id'] . $tmp['crt_time']]));
             }else{
                 $order_no = $tmp['order_no'] ?? "";
             }