feat(WarehouseOrderController): 更新仓库订单查询方法,加入软删除功能
This commit is contained in:
parent
04eabec632
commit
0c485b8433
@ -228,9 +228,9 @@ class WarehouseOrderController extends BaseAdminController
|
|||||||
$total_price=0;
|
$total_price=0;
|
||||||
foreach ($data as $key => &$value) {
|
foreach ($data as $key => &$value) {
|
||||||
if(in_array($order['store_id'],[17,18])){
|
if(in_array($order['store_id'],[17,18])){
|
||||||
$find = StoreBranchProduct::where('product_id', $value->product_id)->where('store_id',$order['store_id'])->find();
|
$find = StoreBranchProduct::where('product_id', $value->product_id)->where('store_id',$order['store_id'])->withTrashed()->find();
|
||||||
}else{
|
}else{
|
||||||
$find = StoreProduct::where('id', $value->product_id)->find();
|
$find = StoreProduct::where('id', $value->product_id)->withTrashed()->find();
|
||||||
}
|
}
|
||||||
$value->store_name = $find['store_name'] ?? '';
|
$value->store_name = $find['store_name'] ?? '';
|
||||||
$value->store_info = $find['store_info'] ?? '';
|
$value->store_info = $find['store_info'] ?? '';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user