|
@@ -103,7 +103,10 @@ class SalesOrderService extends Service
|
|
|
foreach ($data['product'] as $value){
|
|
foreach ($data['product'] as $value){
|
|
|
$insert[] = [
|
|
$insert[] = [
|
|
|
'sales_order_id' => $model->id,
|
|
'sales_order_id' => $model->id,
|
|
|
- 'product_id' => $value,
|
|
|
|
|
|
|
+ 'product_id' => $value['product_id'],
|
|
|
|
|
+ 'price' => $value['price'],
|
|
|
|
|
+ 'number' => $value['number'],
|
|
|
|
|
+ 'mark' => $value['mark'],
|
|
|
'crt_time' => $time,
|
|
'crt_time' => $time,
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
@@ -204,7 +207,10 @@ class SalesOrderService extends Service
|
|
|
foreach ($data['product'] as $value){
|
|
foreach ($data['product'] as $value){
|
|
|
$insert[] = [
|
|
$insert[] = [
|
|
|
'sales_order_id' => $model->id,
|
|
'sales_order_id' => $model->id,
|
|
|
- 'product_id' => $value,
|
|
|
|
|
|
|
+ 'product_id' => $value['product_id'],
|
|
|
|
|
+ 'price' => $value['price'],
|
|
|
|
|
+ 'number' => $value['number'],
|
|
|
|
|
+ 'mark' => $value['mark'],
|
|
|
'crt_time' => $time,
|
|
'crt_time' => $time,
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
@@ -298,11 +304,14 @@ class SalesOrderService extends Service
|
|
|
|
|
|
|
|
$sales_p_info = SalesOrderProductInfo::where('del_time',0)
|
|
$sales_p_info = SalesOrderProductInfo::where('del_time',0)
|
|
|
->where('sales_order_id',$sales['id'])
|
|
->where('sales_order_id',$sales['id'])
|
|
|
- ->select('id','sales_order_id','product_id')
|
|
|
|
|
|
|
+ ->select('id','sales_order_id','product_id','mark','price','number')
|
|
|
->get()->toArray();
|
|
->get()->toArray();
|
|
|
foreach ($sales_p_info as $value){
|
|
foreach ($sales_p_info as $value){
|
|
|
$sales['product'][] = [
|
|
$sales['product'][] = [
|
|
|
- $value['product_id']
|
|
|
|
|
|
|
+ 'product_id' => $value['product_id'],
|
|
|
|
|
+ 'mark' => $value['mark'],
|
|
|
|
|
+ 'price' => $value['price'],
|
|
|
|
|
+ 'number' => $value['number'],
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
|
|
|
|
cqpCow