|
|
@@ -14,7 +14,8 @@ class Order extends Model
|
|
|
'id', 'batch_id', 'owner_id', 'status',
|
|
|
'created_at', 'code', 'shop_id', 'client_code',
|
|
|
'logistic_id', 'consignee_name', 'consignee_phone', 'province',
|
|
|
- 'city', 'district', 'address', 'wms_status','warehouse_id','wms_edittime'];
|
|
|
+ 'city', 'district', 'address','warehouse_id',
|
|
|
+ 'wms_edittime', 'wms_status','order_type'];
|
|
|
|
|
|
/*
|
|
|
* wms订单号 code=>DOC_ORDER_HEADER[orderno]
|
|
|
@@ -148,6 +149,7 @@ class Order extends Model
|
|
|
$this['client_code'] = $order['client_code'] &&
|
|
|
$this['wms_status'] == $order['wms_status'] &&
|
|
|
$this['wms_edittime'] == $order['wms_edittime'] &&
|
|
|
+ $this['order_type'] == $order['order_type'] &&
|
|
|
(string)$this['created_at'] == (string)$order['created_at'];
|
|
|
}
|
|
|
|
|
|
@@ -167,6 +169,7 @@ class Order extends Model
|
|
|
$this['client_code'] = $order['client_code'] ;
|
|
|
$this['wms_status'] = $order['wms_status'] ;
|
|
|
$this['wms_edittime'] = $order['wms_edittime'];
|
|
|
+ $this['order_type'] = $order['order_type'];
|
|
|
$this['created_at'] =$order['created_at'];
|
|
|
}
|
|
|
}
|