diff --git a/app/admin/lists/beforehand_order/BeforehandOrderLists.php b/app/admin/lists/beforehand_order/BeforehandOrderLists.php index c49ee3872..af9dd6cee 100644 --- a/app/admin/lists/beforehand_order/BeforehandOrderLists.php +++ b/app/admin/lists/beforehand_order/BeforehandOrderLists.php @@ -13,6 +13,7 @@ use app\common\lists\ListsExcelInterface; use app\common\model\beforehand_order_cart_info\BeforehandOrderCartInfo; use app\common\model\store_order\StoreOrder; use app\common\model\warehouse_order\WarehouseOrder; +use app\common\model\warehouse_product\WarehouseProduct; /** * 预订单表列表 @@ -188,10 +189,14 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte } } if($item['outbound_id']>0){ - $warehouseOrder=WarehouseOrder::where('id',$item['outbound_id'])->field('code,total_price')->find(); - if($warehouseOrder){ - $order_ck=$warehouseOrder['code']; - $outbound_price=$warehouseOrder['total_price']; + $order_ck=WarehouseOrder::where('id',$item['outbound_id'])->value('code'); + if($order_ck){ + $total_price=0; + $arr= WarehouseProduct::where('oid',$item['outbound_id'])->field('nums,purchase')->select(); + foreach ($arr as $k=>$v){ + $total_price+=bcmul($v['nums'],$v['purchase'],2); + } + $outbound_price=$total_price; } } $nickname = $item->other_data?->nickname??''; @@ -257,9 +262,9 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte 'system_store' => '门店', 'admin_name' => '门店', 'warehousing' => '入库', - 'warehousing_price' => '入库金额', + 'warehousing_price' => '入库采购金额', 'outbound' => '出库', - 'outbound_price' => '出库金额', + 'outbound_price' => '出库门店供货金额', 'total_price' => '总价', 'admin_name' => '用户', 'mark' => '备注',