fyy

app/Service/Box/BoxService.php

@@ -223,12 +223,12 @@ class BoxService extends Service
 
         $product_key_num_list = [];
         foreach ($product_list as $v){
-            if(!isset($product_key_num_list[$v['sale_orders_product_id']]))$product_key_num_list[$v['sale_orders_product_id']] = [
+            if(!isset($product_key_num_list[$v['sale_orders_product_id']][$v['id']]))$product_key_num_list[$v['sale_orders_product_id']][$v['id']] = [
                 'product_num' => 0 ,
                 'box_num' => 0 ,
             ];
-            $product_key_num_list[$v['sale_orders_product_id']]['product_num'] += $v['production_quantity'];
-            $product_key_num_list[$v['sale_orders_product_id']]['box_num'] += $v['box_num'];
+            $product_key_num_list[$v['sale_orders_product_id']][$v['id']]['product_num'] += $v['production_quantity'];
+            $product_key_num_list[$v['sale_orders_product_id']][$v['id']]['box_num'] += $v['box_num'];
             $detail = $model_key_list[$v['sale_orders_product_id']];
             $detail['box_type'] = 1;
             $detail['id'] = $v['id'];
@@ -238,13 +238,21 @@ class BoxService extends Service
             $model[] = $detail;
         }
 
-
         $return = [];
         $product_key_list = [];
         foreach ($model as $v){
             if(!isset($v['box_type'])) {
-                $product_num = isset($product_key_num_list[$v['id']]) ? $product_key_num_list[$v['id']]['product_num'] : 0;
-                $box_num = isset($product_key_num_list[$v['id']]) ? $product_key_num_list[$v['id']]['box_num'] : 0;
+                $product_num = 0;
+                $box_num = 0;
+                if(isset($product_key_num_list[$v['id']])){
+                    foreach ($product_key_num_list[$v['id']] as $vv){
+                        $product_num += $vv['product_num'];
+                        $box_num += $vv['box_num'];
+                    }
+                }
+
+//                $product_num = isset($product_key_num_list[$v['id']]) ? $product_key_num_list[$v['id']]['product_num'] : 0;
+//                $box_num = isset($product_key_num_list[$v['id']]) ? $product_key_num_list[$v['id']]['box_num'] : 0;
                 if(($v['order_quantity'] - $product_num) === 0) continue;
 //                var_dump($v['order_quantity']);
 //                var_dump($v['order_quantity']);