Merge branch 'develop'

app/common/model/StockOrders.php

@@ -50,11 +50,11 @@ class StockOrders extends Model
         'clearance_country_id', 'clearance_country_snapshot', 'ali_order_no', 
         'customer_source_id', 'customer_source_snapshot', 'customer_id', 'customer_snapshot', 
         'customer_country_id', 'customer_country_snapshot', 'declarant_name', 'eta_ship_date', 
-        'shipping_method_id', 'shipping_method_snapshot', 'cif_total_amount', 'domestic_port_id', 'domestic_port_snapshot', 
+        'shipping_method_id', 'shipping_method_snapshot', 'domestic_port_id', 'domestic_port_snapshot', 
         'trade_term_id', 'trade_term_snapshot', 'clearance_port_id', 'clearance_port_snapshot', 
         'latest_arrival_date', 'contract_exchange_rate', 'settlement_currency', 'status', 
         'remark', 'created_at', 'updated_at', 'deleted_at',
-        'object_id', 'contract', 'is_use', 'is_final', 'approval_status', 'file_url', 'pick_up_date', 'collect_all_date', 'profit_total'
+        'object_id', 'is_use', 'is_final', 'approval_status', 'file_url', 'pick_up_date', 'collect_all_date', 'profit_total'
     ];
 
     /**
@@ -94,6 +94,14 @@ class StockOrders extends Model
         return $this->hasMany(VehMoneyValue::class, 'object_id', 'id')->where('object_scene', 'stock_orders');
     }
 
+    /**
+     * 关联订单文件附件
+     */
+    public function files()
+    {
+        return $this->hasMany(StockOrdersFiles::class, 'order_id', 'id');
+    }
+
 
     public function salesperson()
     {