Merge remote-tracking branch 'origin/fyy' into fyy

app/Http/Controllers/Api/BoxController.php

@@ -188,6 +188,17 @@ class BoxController extends BaseController
         $service = new BoxService();
         list($status,$data) = $service->boxFhDel($request->all());
 
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+    public function transportDetail(Request $request)
+    {
+        $service = new BoxService();
+        list($status,$data) = $service->transportDetail($request->all());
+
         if($status){
             return $this->json_return(200,'',$data);
         }else{

app/Service/Box/BoxService.php

@@ -334,10 +334,8 @@ class BoxService extends Service
 
         foreach ($data as &$v){
             $detail =  $key_list[$v['top_id']];
-            $v['process'] = $detail['technology_material'];
-            $v['process_title'] = $detail['technology_name'];
-            $v['material_name'] = $detail['wood_name'];
-            $v['process_mark'] = $detail['process_mark'];
+            $v['customer_no'] = $detail['customer_no'];
+            $v['customer_name'] = $detail['customer_name'];
         }
         return [true, $data];
     }
@@ -681,6 +679,25 @@ class BoxService extends Service
         return [true,''];
     }
 
+    public function transportDetail($data){
+        if(empty($data['order_nos'])) return [false,'包装单号不能为空'];
+        $order_nos = $data['order_nos'];
+        $list = BoxDetail::wherein('order_no',$order_nos)->select('ext_1','ext_2','ext_3','ext_4','ext_5','ext_6','ext_7','ext_8','ext_9','num','order_no','shipment_order_no')->get()->toArray();
+        foreach ($list as &$v){
+            $v['product_no'] = $v['ext_1'];
+            $v['technology_material'] = $v['ext_2'];
+            $v['technology_name'] = $v['ext_3'];
+            $v['wood_name'] = $v['ext_4'];
+            $v['process_mark'] = $v['ext_5'];
+            $v['customer_no'] = $v['ext_6'];
+            $v['customer_name'] = $v['ext_7'];
+            $v['product_title'] = $v['ext_8'];
+            $v['product_size'] = $v['ext_9'];
+        }
+        return [200,$list];
+
+    }
+
     public function boxFhBzDetail($data){
         if(empty($data['order_no'])) return [false,'请选择包装单数据'];
 

routes/api.php

@@ -236,6 +236,7 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('transportNo', 'Api\BoxController@transportNo');
     $route->any('delBoxDetail', 'Api\BoxController@delBoxDetail');
     $route->any('transportBoxList', 'Api\BoxController@transportBoxList');
+    $route->any('transportDetail', 'Api\BoxController@transportDetail');
     //包装扫码出库
     $route->any('fyySaveOutOrder','Api\FyyOrderController@fyySaveOutOrder');