浏览代码

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

cqpCow 2 年之前
父节点
当前提交
1f65526b5c
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      app/Service/Box/BoxService.php

+ 2 - 1
app/Service/Box/BoxService.php

@@ -687,7 +687,7 @@ class BoxService extends Service
     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();
+        $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','post')->get()->toArray();
         foreach ($list as &$v){
             $v['product_no'] = $v['ext_1'];
             $v['technology_material'] = $v['ext_2'];
@@ -698,6 +698,7 @@ class BoxService extends Service
             $v['customer_name'] = $v['ext_7'];
             $v['product_title'] = $v['ext_8'];
             $v['product_size'] = $v['ext_9'];
+            $v['post'] = json_decode($v['post'],true);
         }
         return [200,$list];