fyy

app/Http/Controllers/Api/BoxController.php

@@ -174,7 +174,7 @@ class BoxController extends BaseController
     public function boxFhDetail(Request $request)
     {
         $service = new BoxService();
-        list($status,$data) = $service->boxIn($request->all());
+        list($status,$data) = $service->boxFhBzDetail($request->all());
 
         if($status){
             return $this->json_return(200,'',$data);
@@ -205,4 +205,16 @@ class BoxController extends BaseController
             return $this->json_return(201,$data);
         }
     }
+
+    public function boxFhBzList(Request $request)
+    {
+        $service = new BoxService();
+        list($status,$data) = $service->boxFhBzList($request->all());
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
 }

app/Service/Box/BoxService.php

@@ -699,10 +699,10 @@ class BoxService extends Service
     }
 
     public function boxFhBzDetail($data){
-        if(empty($data['order_no'])) return [false,'请选择包装单数据'];
+        if(empty($data['idlsid'])) return [false,'请选择包装单数据'];
 
         $result = DB::table('box_detail')->where('del_time',0)
-            ->whereIn('order_no',$data['order_no'])
+            ->whereIn('top_id',$data['idlsid'])
             ->select('order_no','ext_6','ext_7','ext_1','ext_8','ext_9','num','ext_2','ext_3','ext_4','ext_5')
             ->get()->toArray();
         if(! empty($result)){
@@ -713,4 +713,24 @@ class BoxService extends Service
 
         return [true,$result];
     }
+
+    public function boxFhBzList($data){
+        $model = DB::table('box_detail')->where('del_time',0)
+            ->select('order_no','crt_time');
+        if(! empty($data['out_order_no'])) $model->whereIn('out_order_no',$data['out_order_no']);
+        if(! empty($data['shipment_order_no'])) $model->whereIn('shipment_order_no',$data['shipment_order_no']);
+
+        $return = [];
+        $result = $model->get()->toArray();
+        if(! empty($result)){
+            foreach ($result as $value){
+                $return[$value->order_no] = [
+                    'order_no' => $value->order_no,
+                    'crt_time' => date("Y-m-d H:i:s",$value->crt_time)
+                ];
+            }
+        }
+
+        return [true,array_values($return)];
+    }
 }

routes/api.php

@@ -246,4 +246,5 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('boxFhDetail','Api\BoxController@boxFhDetail');
     $route->any('boxFhDel','Api\BoxController@boxFhDel');
     $route->any('boxFhBzDetail','Api\BoxController@boxFhBzDetail');
+    $route->any('boxFhBzList','Api\BoxController@boxFhBzList');
 });