fyy

app/Service/FyyOrderService.php

@@ -114,6 +114,10 @@ class FyyOrderService extends Service
             }
         }
         if(! empty($data['customer_name'])) $model->where('customer_name', 'LIKE', '%'.$data['customer_name'].'%');
+        if(! empty($data['shipment_order_no'])) {
+            $out_order_nos = Box::where('shipment_order_no','like','%'.$data['shipment_order_no'].'%')->pluck('out_order_no')->toArray();
+            $model->wherein('out_order_no', $out_order_nos);
+        }
         if(! empty($data['product_no'])) $model->where('product_no', 'LIKE', '%'.$data['product_no'].'%');
         if(! empty($data['product_title'])) $model->where('product_title', 'LIKE', '%'.$data['product_title'].'%');
         if(! empty($data['product_size'])) $model->where('product_size', 'LIKE', '%'.$data['product_size'].'%');
@@ -152,6 +156,8 @@ class FyyOrderService extends Service
 
             foreach ($list['data'] as &$v){
                 if(isset($transport_key_nos[$v['out_order_no']])) $v['shipment_order_no'] = implode(',',$transport_key_nos[$v['out_order_no']]);
+
+                $v['shipment_order_no'] = '';
             }
         }
 
@@ -396,6 +402,7 @@ class FyyOrderService extends Service
                         'cdlcode' => $value['cdlcode'],
                         'product_no' => $value['cinvcode'],//产品编码
                         'product_title' => $value['product_title'],
+                        'product_size' => $value['product_size'],
                         'technology_name' => $cfree1 ?? '',
                         'wood_name' => $cfree2 ?? '',
                         'num' => $n,