|
|
@@ -177,14 +177,14 @@ class PurchaseOrderService extends Service
|
|
|
|
|
|
$order = PurchaseOrder::where('order_number',$data['order_number'])
|
|
|
->where('del_time',0)
|
|
|
- ->select('id','order_number','depart_id','mark','state','crt_id','order_type','sales_order_id','supplier','purchase_id','total','other_fee','discount_fee','purchase_total','crt_time','storehouse_id')
|
|
|
+ ->select('id','order_number','depart_id','mark','state','crt_id','order_type','sales_order_id','supplier','purchase_id','total','other_fee','discount_fee','purchase_total','crt_time','storehouse_id','top_depart_id')
|
|
|
->first();
|
|
|
if(empty($order)) return [false, '采购订单不存在或已被删除'];
|
|
|
$order = $order->toArray();
|
|
|
$order['file'] = [];
|
|
|
$order['storehouse_title'] = Storehouse::where('id',$order['storehouse_id'])->value('title');
|
|
|
$supplier = Supplier::where('id',$order['supplier'])->first();
|
|
|
- $order['supplier_title'] = $supplier->title;
|
|
|
+ $order['supplier_title'] = $supplier->title ?? '';
|
|
|
$order['order_type_title'] = PurchaseOrder::$order_type[$order['order_type']] ?? '';
|
|
|
$order['order_type_title'] = PurchaseOrder::$order_type[$order['order_type']] ?? '';
|
|
|
$order['state_title'] = PurchaseOrder::$name[$order['state']] ?? '';
|
cqpCow