|
|
@@ -136,6 +136,7 @@ class Order extends Model
|
|
|
{
|
|
|
return
|
|
|
$this['code'] == $order['code'] &&
|
|
|
+ $this['batch_id'] == $order['batch_id'] &&
|
|
|
$this['warehouse_id'] == $order['warehouse_id'] &&
|
|
|
$this['owner_id'] == $order['owner_id'] &&
|
|
|
$this['shop_id'] == $order['shop_id'] &&
|
|
|
@@ -156,6 +157,7 @@ class Order extends Model
|
|
|
public function assignValueByOrder($order)
|
|
|
{
|
|
|
$this['code'] = $order['code'] ;
|
|
|
+ $this['batch_id'] = $order['batch_id'] ;
|
|
|
$this['warehouse_id'] = $order['warehouse_id'] ;
|
|
|
$this['owner_id'] = $order['owner_id'] ;
|
|
|
$this['shop_id'] = $order['shop_id'] ;
|