fyy

app/Http/Controllers/Api/BoxController.php

@@ -72,4 +72,32 @@ class BoxController extends BaseController
         }
 
     }
+    public function boxOrderDetailByTop(Request $request)
+    {
+
+
+        $service = new BoxService();
+        list($status,$data) = $service->boxOrderDetailByTop($request->all());
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+
+    }
+    public function boxOrderDetailByOrderNo(Request $request)
+    {
+
+
+        $service = new BoxService();
+        list($status,$data) = $service->boxOrderDetailByOrderNo($request->all());
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+
+    }
 }

app/Model/BoxDetail.php

@@ -13,7 +13,7 @@ use Illuminate\Support\Facades\Schema;
  */
 class BoxDetail extends Model
 {
-    protected $table = "box_detail"; //指定表
+    public $table = "box_detail"; //指定表
     const CREATED_AT = 'crt_time';
     const UPDATED_AT = 'upd_time';
     protected $dateFormat = 'U';

app/Service/Box/BoxService.php

@@ -339,6 +339,54 @@ class BoxService extends Service
         return [true, $data];
     }
 
+    /**
+     * 通过销售单号获取包装单
+     * @param $data
+     * @return array
+     */
+    public function boxOrderDetailByTop($data){
+
+        $top_order_no = $data['top_order_no'];
+        $list = new Box();
+        $list = $list->where('top_order_no',$top_order_no)->select('top_order_no','order_no','crt_time')->get()->toArray();
+
+
+        return [true,$list];
+    }
+
+
+    /**
+     * 通过包装单获取包装详情
+     * @param $data
+     * @return array
+     */
+    public function boxOrderDetailByOrderNo($data){
+
+        $order_nos = $data['order_nos'];
+        $top_order_no = $data['top_order_no'];
+
+        $list = new BoxDetail(['channel'=>$top_order_no]);
+        $list = $list->wherein('order_no',$order_nos)->get()->toArray();
+        $ids = [];
+        foreach ($list as $v){
+            $ids[] = $v['top_id'];
+        }
+        $sale_orders_product = SaleOrdersProduct::wherein('id',$ids)->get()->toArray();
+        $sale_orders_key_product = [];
+        foreach ($sale_orders_product as $v){
+            $sale_orders_key_product[$v['id']] = $v;
+        }
+        foreach ($list as &$v){
+            $detail = $sale_orders_key_product[$v['top_id']];
+            $v['customer_name'] = $detail['customer_name'];
+            $v['technology_name'] = $detail['technology_name'];
+            $v['wood_name'] = $detail['wood_name'];
+            $v['team_name'] = '';
+        }
+
+        return [true,$list];
+    }
+
 
 
 

routes/api.php

@@ -199,6 +199,8 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('boxOrderDetail', 'Api\BoxController@boxOrderDetail');
     $route->any('boxProductList', 'Api\BoxController@boxProductList');
     $route->any('box_in', 'Api\BoxController@boxIn');
+    $route->any('boxOrderDetailByTop', 'Api\BoxController@boxOrderDetailByTop');
+    $route->any('boxOrderDetailByOrderNo', 'Api\BoxController@boxOrderDetailByOrderNo');
     //包装扫码出库
     $route->any('fyySaveOutOrder','Api\FyyOrderController@fyySaveOutOrder');
 });